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 53a6627f531d46b977774e6ad5ae70700f156dd0..7e174e0e76c2d64c0bbe991e2ec5d9d61bfb9d33 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 1287ec97b2d5454377a50001f31fbbcbf87851a8..465b1cd4a09ddffd291e4748ca9ce89de3c03b0d 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 96ae6280312c3e4f50a80ed3e9755da2f1a7b8e4..96d213f68c1203f2c7a19c5302d78dc5d34a9a0d 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 0b73a31131ba7684aa6f468011bf661b579b21c2..3b3dcd0f487c58dcc9a5ad4a9e87f8a1820cf504 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(