From 8e2740c59de13d6771b03e6477b8032f5e7eb805 Mon Sep 17 00:00:00 2001 From: ddamiron <ddamiron@sii.fr> Date: Thu, 25 Jul 2019 17:33:47 +0200 Subject: [PATCH] update service for get log info and error in final report --- .../report/logs-data/logs-data.component.html | 18 ++++++++++++++---- .../report/logs-data/logs-data.component.ts | 6 +++--- .../logs-pre-report.component.html | 2 +- src/app/services/data-logs.service.ts | 4 ++-- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/app/components/logs-dashboard/report/logs-data/logs-data.component.html b/src/app/components/logs-dashboard/report/logs-data/logs-data.component.html index 53a6627..7e174e0 100644 --- a/src/app/components/logs-dashboard/report/logs-data/logs-data.component.html +++ b/src/app/components/logs-dashboard/report/logs-data/logs-data.component.html @@ -10,18 +10,28 @@ <div *ngFor="let oneStepData of allStepsData"> <div class="mini-info-card" *ngIf="oneStepData" (click)='getLogsSelector(oneStepData._id.step);'> <div class="table"> + <div class="columns is-marginless"> + <div class="column is-3 has-text-left"> + </div> + <div class="column is-5 has-text-center"> + <h3>Step: {{oneStepData._id.step}}</h3> + </div> + <div class="column is-2 has-text-left"> + </div> + </div> <div class="columns is-marginless"> <div class="column is-5 has-text-left"> <span> <h3> - <p>step: {{oneStepData._id.step}}</p> - <p>total-time: {{oneStepData.totalHoursSpent}}h : {{oneStepData.totalMinutesSpent}}m : + <p>total-time: {{oneStepData.totalHoursSpent}}h : {{oneStepData.totalMinutesSpent}}m : {{oneStepData.totalSecondsSpent}}s </p> + <p>Info(s): {{oneStepData.counts.INFO}}</p> + <p>Erreur(s): {{oneStepData.counts.ERROR}}</p> </h3> </span> </div> - <div class="column is-5 has-text-left"></div> - <div class="column is-2 has-text-right"> + + <div class="column is-6 has-text-right"> <br> <span> <div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}"> diff --git a/src/app/components/logs-dashboard/report/logs-data/logs-data.component.ts b/src/app/components/logs-dashboard/report/logs-data/logs-data.component.ts index 1287ec9..465b1cd 100644 --- a/src/app/components/logs-dashboard/report/logs-data/logs-data.component.ts +++ b/src/app/components/logs-dashboard/report/logs-data/logs-data.component.ts @@ -60,7 +60,7 @@ export class LogsDataComponent implements OnChanges { this.childUuid, this.childSessionId, ).subscribe((results) => { - // console.log('results', results); + console.log('getAllStepsDuration results', results); this.allStepsData = results; }, ); @@ -85,7 +85,7 @@ export class LogsDataComponent implements OnChanges { this.dataLogsService.getLogsStepsLogs( step, this.childSessionId, - this.childSlug, + this.childUuid, 'ERROR', ).subscribe((results) => { // console.log('results', results); @@ -101,7 +101,7 @@ export class LogsDataComponent implements OnChanges { this.dataLogsService.getLogsStepsLogs( step, this.childSessionId, - this.childSlug, + this.childUuid, 'INFO', ).subscribe((results) => { // console.log('results', results); diff --git a/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html b/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html index 96ae628..96d213f 100644 --- a/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html +++ b/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html @@ -94,7 +94,7 @@ {{ session.data[0].count.ERROR }} </div> <div class="column is-1 actions"> - <a class="button button-gl " [routerLink]="['/','datalogs','report', id, session, 'slug']"> + <a class="button button-gl " [routerLink]="['/','datalogs','report', id, session._id.session_id , 'slug']"> <i class="fas fa-eye"></i> </a> </div> diff --git a/src/app/services/data-logs.service.ts b/src/app/services/data-logs.service.ts index 0b73a31..3b3dcd0 100644 --- a/src/app/services/data-logs.service.ts +++ b/src/app/services/data-logs.service.ts @@ -159,8 +159,8 @@ export class DataLogsService { ); } - getLogsStepsLogs(step, sessionId, slug, loglevel): Observable<any[]> { - const query = { step, slug, loglevel, session_id : sessionId }; + getLogsStepsLogs(step, sessionId, uuid, loglevel): Observable<any[]> { + const query = { step, uuid, loglevel, session_id : sessionId }; const stringQuery = JSON.stringify(query); const aggregationEndPoint = '?filter='; return this._httpClient.get<any[]>(this.resourceServiceUrl + aggregationEndPoint + stringQuery).pipe( -- GitLab