Skip to content
Snippets Groups Projects
Commit 8e2740c5 authored by ddamiron's avatar ddamiron
Browse files

update service for get log info and error in final report

parent 6fc6e72c
Branches
Tags
5 merge requests!10New updated datalog,!9add all datalog components and services into angular gui,!8update Datalog research input,!7Datalog research input,!14Version 1.3.0
...@@ -10,18 +10,28 @@ ...@@ -10,18 +10,28 @@
<div *ngFor="let oneStepData of allStepsData"> <div *ngFor="let oneStepData of allStepsData">
<div class="mini-info-card" *ngIf="oneStepData" (click)='getLogsSelector(oneStepData._id.step);'> <div class="mini-info-card" *ngIf="oneStepData" (click)='getLogsSelector(oneStepData._id.step);'>
<div class="table"> <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="columns is-marginless">
<div class="column is-5 has-text-left"> <div class="column is-5 has-text-left">
<span> <span>
<h3> <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> {{oneStepData.totalSecondsSpent}}s </p>
<p>Info(s): {{oneStepData.counts.INFO}}</p>
<p>Erreur(s): {{oneStepData.counts.ERROR}}</p>
</h3> </h3>
</span> </span>
</div> </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> <br>
<span> <span>
<div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}"> <div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}">
......
...@@ -60,7 +60,7 @@ export class LogsDataComponent implements OnChanges { ...@@ -60,7 +60,7 @@ export class LogsDataComponent implements OnChanges {
this.childUuid, this.childUuid,
this.childSessionId, this.childSessionId,
).subscribe((results) => { ).subscribe((results) => {
// console.log('results', results); console.log('getAllStepsDuration results', results);
this.allStepsData = results; this.allStepsData = results;
}, },
); );
...@@ -85,7 +85,7 @@ export class LogsDataComponent implements OnChanges { ...@@ -85,7 +85,7 @@ export class LogsDataComponent implements OnChanges {
this.dataLogsService.getLogsStepsLogs( this.dataLogsService.getLogsStepsLogs(
step, step,
this.childSessionId, this.childSessionId,
this.childSlug, this.childUuid,
'ERROR', 'ERROR',
).subscribe((results) => { ).subscribe((results) => {
// console.log('results', results); // console.log('results', results);
...@@ -101,7 +101,7 @@ export class LogsDataComponent implements OnChanges { ...@@ -101,7 +101,7 @@ export class LogsDataComponent implements OnChanges {
this.dataLogsService.getLogsStepsLogs( this.dataLogsService.getLogsStepsLogs(
step, step,
this.childSessionId, this.childSessionId,
this.childSlug, this.childUuid,
'INFO', 'INFO',
).subscribe((results) => { ).subscribe((results) => {
// console.log('results', results); // console.log('results', results);
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
{{ session.data[0].count.ERROR }} {{ session.data[0].count.ERROR }}
</div> </div>
<div class="column is-1 actions"> <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> <i class="fas fa-eye"></i>
</a> </a>
</div> </div>
......
...@@ -159,8 +159,8 @@ export class DataLogsService { ...@@ -159,8 +159,8 @@ export class DataLogsService {
); );
} }
getLogsStepsLogs(step, sessionId, slug, loglevel): Observable<any[]> { getLogsStepsLogs(step, sessionId, uuid, loglevel): Observable<any[]> {
const query = { step, slug, loglevel, session_id : sessionId }; const query = { step, uuid, loglevel, session_id : sessionId };
const stringQuery = JSON.stringify(query); const stringQuery = JSON.stringify(query);
const aggregationEndPoint = '?filter='; const aggregationEndPoint = '?filter=';
return this._httpClient.get<any[]>(this.resourceServiceUrl + aggregationEndPoint + stringQuery).pipe( return this._httpClient.get<any[]>(this.resourceServiceUrl + aggregationEndPoint + stringQuery).pipe(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment