diff --git a/src/app/components/logs-dashboard/report/logs-error/logs-error.component.html b/src/app/components/logs-dashboard/report/logs-error/logs-error.component.html
index 4020bca9f57afb44c617dcdbd2a1ced900afe24f..b8ea9567aaa5dc7ba1bfc7bdecbcd5617fdbcd6b 100644
--- a/src/app/components/logs-dashboard/report/logs-error/logs-error.component.html
+++ b/src/app/components/logs-dashboard/report/logs-error/logs-error.component.html
@@ -1,67 +1,73 @@
<div class="columns is-centered is-marginless">
- <div class="column is-5 has-text-left">
- <br>
+ <div class="column is-5 has-text-left is-marginless">
+ <div class="table entity-list-table is-marginless">
+ <div class="header columns is-marginless is-multiline is-vcentered">
+ <div class="column is-6 has-text-left">
+ <p> All Steps:</p>
+ </div>
+ </div>
+ <div class="data-list">
<div *ngFor="let oneStepData of allStepsData; let i=index; let odd=odd; let even=even;">
<div *ngIf="oneStepData" (click)='getLogsSelector(oneStepData._id.step, oneStepData.counts);'>
- <div class="table entity-list-table">
- <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
- <div class="column is-6 has-text-left">
- <p>Step: {{oneStepData._id.step}}</p><br>
- <p>Durée: {{oneStepData.totalHoursSpent}}h : {{oneStepData.totalMinutesSpent}}m :
- {{oneStepData.totalSecondsSpent}}s</p><br>
- <p>Info(s): {{oneStepData.counts.INFO}}</p>
- </div>
- <div class="column is-6 has-text-right">
- <br><br>
- <div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}">
- <svg xmlns="https://www.w3.org/2000/svg" id="chevron" viewBox="0 0 15 9">
- <path
- d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
- class="brandcolor" />
- <path
- d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
- class="brandcolor" />
- </svg>
- </div>
- <p><br> Erreur(s): {{oneStepData.counts.ERROR}}</p>
+ <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
+ <div class="column is-6 has-text-left">
+ <p>Step: {{oneStepData._id.step}}</p><br>
+ <p>Durée: {{oneStepData.totalHoursSpent}}h : {{oneStepData.totalMinutesSpent}}m :
+ {{oneStepData.totalSecondsSpent}}s</p><br>
+ <p>Info(s): {{oneStepData.counts.INFO}}</p>
+ </div>
+ <div class="column is-6 has-text-right">
+ <br><br>
+ <div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}">
+ <svg xmlns="https://www.w3.org/2000/svg" id="chevron" viewBox="0 0 15 9">
+ <path
+ d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
+ class="brandcolor" />
+ <path
+ d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
+ class="brandcolor" />
+ </svg>
</div>
+ <p><br> Erreur(s): {{oneStepData.counts.ERROR}}</p>
</div>
</div>
</div>
</div>
</div>
-
- <div class="column is-7 has-text-left">
- <div class="mini-log-card" *ngIf="allLogs?.lenght==0">
- <p>No DATA</p>
</div>
- <!-- <div class="mini-error-card" *ngIf="!allErrorLogs?.lenght>0">
- <p>No DATA</p>
- </div> -->
- <app-paginator [length]="paginator.length" [pageSize]="paginator.limit"
- [pageSizeOptions]="paginator.pageSizeOptions" [pageIndex]="paginator.pageIndex" [pagesToShow]="5"
- [showFirstLastButtons]="true" (page)="changePagination($event)" (pageSizeChanged)="changePageSize($event)">
- </app-paginator>
+ </div>
- <div class="color-green" *ngFor="let oneErrorLog of allErrorLogs">
- <div class="table entity-list-table">
- <div class="columns is-marginless">
- <div class="column is-12 has-text-left">
- <p>step: {{oneErrorLog.step}}</p>
- <br>
- <p>status: {{oneErrorLog.status}}</p>
- <br>
- <p>info: {{oneErrorLog.info}}</p>
- <br>
- <p>progress-ratio: {{oneErrorLog.progress_ratio}}</p>
+ <div class="column is-7 has-text-left">
+ <div class="is-centered is-marginless" *ngIf="!allErrorLogs[0]">
+ <p>No Errors</p>
+ </div>
+ <div class="table entity-list-table is-marginless" *ngIf="allErrorLogs[0]">
+ <div class="header columns is-marginless is-multiline is-centered is-vcentered">
+
+ <app-paginator [length]="paginator.length" [pageSize]="paginator.limit"
+ [pageSizeOptions]="paginator.pageSizeOptions" [pageIndex]="paginator.pageIndex" [pagesToShow]="5"
+ [showFirstLastButtons]="true" (page)="changePagination($event)" (pageSizeChanged)="changePageSize($event)">
+ </app-paginator>
+ </div>
+ <div class="data-list" *ngFor="let oneErrorLog of allErrorLogs; let i=index; let odd=odd; let even=even;">
+
+ <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
+ <div class="columns is-marginless">
+ <div class="column is-12 has-text-left">
+ <p>step: {{oneErrorLog.step}}</p>
+ <br>
+ <p>status: {{oneErrorLog.status}}</p>
+ <br>
+ <p>info: {{oneErrorLog.info}}</p>
+ <br>
+ <p>progress-ratio: {{oneErrorLog.progress_ratio}}</p>
+ </div>
+ </div>
</div>
</div>
</div>
+ <div>
+ </div>
</div>
-
- <div>
-
- </div>
- </div>
</div>
\ No newline at end of file
diff --git a/src/app/components/logs-dashboard/report/logs-info/logs-info.component.html b/src/app/components/logs-dashboard/report/logs-info/logs-info.component.html
index 5429d514728b46ef0e3804b1c100408fa01cb376..f345eca01751fbb5b668b9d4fa543082705fc072 100644
--- a/src/app/components/logs-dashboard/report/logs-info/logs-info.component.html
+++ b/src/app/components/logs-dashboard/report/logs-info/logs-info.component.html
@@ -1,30 +1,36 @@
<div class="columns is-centered is-marginless">
- <div class="column is-5 has-text-left">
- <br>
- <div *ngFor="let oneStepData of allStepsData; let i=index; let odd=odd; let even=even;">
- <div *ngIf="oneStepData" (click)='getLogsSelector(oneStepData._id.step, oneStepData.counts);'>
- <div class="table entity-list-table">
- <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
- <div class="column is-6 has-text-left">
- <p>Step: {{oneStepData._id.step}}</p><br>
- <p>Durée: {{oneStepData.totalHoursSpent}}h : {{oneStepData.totalMinutesSpent}}m :
- {{oneStepData.totalSecondsSpent}}s</p><br>
- <p>Info(s): {{oneStepData.counts.INFO}}</p>
- </div>
- <div class="column is-6 has-text-right">
- <br><br>
- <div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}">
- <svg xmlns="https://www.w3.org/2000/svg" id="chevron" viewBox="0 0 15 9">
- <path
- d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
- class="brandcolor" />
- <path
- d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
- class="brandcolor" />
- </svg>
+ <div class="column is-5 has-text-left is-marginless">
+ <div class="table entity-list-table is-marginless">
+ <div class="header columns is-marginless is-multiline is-vcentered">
+ <div class="column is-6 has-text-left">
+ <p> All Steps:</p>
+ </div>
+ </div>
+ <div class="data-list">
+ <div *ngFor="let oneStepData of allStepsData; let i=index; let odd=odd; let even=even;">
+ <div *ngIf="oneStepData" (click)='getLogsSelector(oneStepData._id.step, oneStepData.counts);'>
+ <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
+ <div class="column is-6 has-text-left">
+ <p>Step: {{oneStepData._id.step}}</p><br>
+ <p>Durée: {{oneStepData.totalHoursSpent}}h : {{oneStepData.totalMinutesSpent}}m :
+ {{oneStepData.totalSecondsSpent}}s</p><br>
+ <p>Info(s): {{oneStepData.counts.INFO}}</p>
+ </div>
+ <div class="column is-6 has-text-right">
+ <br><br>
+ <div class="arrows" [ngClass]="{'is-displayed': displayedStep === oneStepData._id.step}">
+ <svg xmlns="https://www.w3.org/2000/svg" id="chevron" viewBox="0 0 15 9">
+ <path
+ d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
+ class="brandcolor" />
+ <path
+ d="M7.5 7.5c-.1 0-.3-.1-.4-.1l-6-6C1 1.1 1 .8 1.1.6s.5-.2.7 0l5.6 5.6L13 .6c.2-.2.5-.2.7 0s.2.5 0 .7l-6 6c.1.1-.1.2-.2.2z"
+ class="brandcolor" />
+ </svg>
+ </div>
+ <p><br> Erreur(s): {{oneStepData.counts.ERROR}}</p>
</div>
- <p><br> Erreur(s): {{oneStepData.counts.ERROR}}</p>
</div>
</div>
</div>
@@ -33,25 +39,30 @@
</div>
<div class="column is-7 has-text-left">
- <div class="mini-log-card" *ngIf="allLogs?.lenght==0">
- <p>No DATA</p>
- </div>
- <app-paginator [length]="paginator.length" [pageSize]="paginator.limit"
- [pageSizeOptions]="paginator.pageSizeOptions" [pageIndex]="paginator.pageIndex" [pagesToShow]="5"
- [showFirstLastButtons]="true" (page)="changePagination($event)" (pageSizeChanged)="changePageSize($event)">
- </app-paginator>
- <div class="table entity-list-table is-marginless"
- *ngFor="let oneLog of allLogs; let i=index; let odd=odd; let even=even;">
- <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
- <div class="columns is-marginless">
- <div class="column is-12 has-text-left">
- <p>step: {{oneLog.step}}</p>
- <br>
- <p>status: {{oneLog.status}}</p>
- <br>
- <p>info: {{oneLog.info}}</p>
- <br>
- <p>progress-ratio: {{oneLog.progress_ratio}}</p>
+ <div class="is-centered is-marginless" *ngIf="!allLogs">
+ <p>No Logs!</p>
+ </div>
+ <div class="table entity-list-table is-marginless" *ngIf="allLogs">
+ <div class="header columns is-marginless is-multiline is-centered is-vcentered">
+
+ <app-paginator [length]="paginator.length" [pageSize]="paginator.limit"
+ [pageSizeOptions]="paginator.pageSizeOptions" [pageIndex]="paginator.pageIndex" [pagesToShow]="5"
+ [showFirstLastButtons]="true" (page)="changePagination($event)" (pageSizeChanged)="changePageSize($event)">
+ </app-paginator>
+ </div>
+ <div class="data-list" *ngFor="let oneLog of allLogs; let i=index; let odd=odd; let even=even;">
+
+ <div class="data columns is-multiline is-vcentered is-marginless" [ngClass]="{ odd: odd, even: even }">
+ <div class="columns is-marginless">
+ <div class="column is-12 has-text-left">
+ <p>step: {{oneLog.step}}</p>
+ <br>
+ <p>status: {{oneLog.status}}</p>
+ <br>
+ <p>info: {{oneLog.info}}</p>
+ <br>
+ <p>progress-ratio: {{oneLog.progress_ratio}}</p>
+ </div>
</div>
</div>
</div>
diff --git a/src/app/components/logs-dashboard/report/logs-info/logs-info.component.scss b/src/app/components/logs-dashboard/report/logs-info/logs-info.component.scss
index b9c700c0128ec6c446f1adcbf26345997b7c3044..40d1d2ec639521340d1344c98ab82f16b3feadff 100644
--- a/src/app/components/logs-dashboard/report/logs-info/logs-info.component.scss
+++ b/src/app/components/logs-dashboard/report/logs-info/logs-info.component.scss
@@ -56,4 +56,7 @@ figure {
background-color: yellowgreen;
}
-
+ .steps-header{
+ padding: 0;
+ margin:0;
+ }
\ No newline at end of file
diff --git a/src/app/services/data-logs.service.ts b/src/app/services/data-logs.service.ts
index 928f5db6e596f9325bb5cc6f912a9ca2332047b7..81550bed3a7dfab4b7efb6413efc81753d04d788 100644
--- a/src/app/services/data-logs.service.ts
+++ b/src/app/services/data-logs.service.ts
@@ -21,7 +21,6 @@ export class DataLogsService {
private _errorLogSubject: Subject<any>;
private _sessionLogSubject: Subject<any>;
private _slugLogSubject: Subject<any>;
- private _prereportSubject: Subject<any>;
constructor(
private _httpClient: HttpClient) {
@@ -30,7 +29,6 @@ export class DataLogsService {
this._errorLogSubject = new Subject<any>();
this._sessionLogSubject = new Subject<any>();
this._slugLogSubject = new Subject<any>();
- this._prereportSubject = new Subject<any>();
this.limit = 6;
this.pageNumber = 1;
this.length = 1;
@@ -203,24 +201,21 @@ export class DataLogsService {
}),
);
- } else {
- const query = { session_id: typeInfo };
- const stringQuery = JSON.stringify(query);
- const aggregationEndPoint = '/_aggrs/sessionIdToSlug?avars=';
- return this._httpClient.get<any[]>(this.resourceServiceUrl + aggregationEndPoint + stringQuery).pipe(
- map((response) => {
- return response;
- }),
- );
}
-
+ const query = { session_id: typeInfo };
+ const stringQuery = JSON.stringify(query);
+ const aggregationEndPoint = '/_aggrs/sessionIdToSlug?avars=';
+ return this._httpClient.get<any[]>(this.resourceServiceUrl + aggregationEndPoint + stringQuery).pipe(
+ map((response) => {
+ return response;
+ }),
+ );
}
/* PAGINATION */
paginationChanged(limit: number, pageNumber: number, logType:string) {
this.limit = limit;
this.pageNumber = pageNumber;
- console.log('paginationChanged', 'limit: ', this.limit, 'pageNumber: ', this.pageNumber, 'length', this.length);
if (logType === 'INFO') {
this._infoLogSubject.next();
}if (logType === 'ERROR') {
@@ -229,8 +224,6 @@ export class DataLogsService {
this._slugLogSubject.next();
}if (logType === 'SESSION') {
this._sessionLogSubject.next();
- }if (logType === 'PREREPORT') {
- this._prereportSubject.next();
}
}
@@ -253,8 +246,5 @@ export class DataLogsService {
get slugLogChange$(): Observable<string> {
return this._slugLogSubject.asObservable();
}
- get prereportChange$(): Observable<string> {
- return this._prereportSubject.asObservable();
- }
}