diff --git a/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html b/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html index b80a22d9e56dcb3a2d78bf478a1f0afb180f38c2..1545a1f6e4fe57b2c90077aaf8ed6b71e5ac1be4 100644 --- a/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html +++ b/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html @@ -34,7 +34,7 @@ <i class="fas fa-sort-down"></i> </span> </span> - <span class="column-title">Completion Date</span> + <span class="column-title">Latest Completion Date</span> </span> </div> <div class="column is-2 has-text-left"> @@ -75,19 +75,19 @@ {{ session._id.session_id }} </div> <div class="column is-1 has-text-left"> - {{ session.data.length }} + {{ session.all.length }} </div> <div class="column is-2 has-text-left"> - {{ session.data[0].completionDate.$date }} + {{ session.latest.completionDate.$date }} </div> <div class="column is-2 has-text-left"> <span class="column-title"> - {{ session.data[0].duration.hours }}: - {{ session.data[0].duration.minutes }}: - {{ session.data[0].duration.seconds }}</span> + {{ session.latest.duration.hours }}: + {{ session.latest.duration.minutes }}: + {{ session.latest.duration.seconds }}</span> </div> <div class="column is-1 has-text-centered actions"> - {{ session.data[0].count.ERROR }} + {{ session.latest.count.ERROR }} </div> <div class="column is-1 actions"> <a class="button button-gl " [routerLink]="['preReport','session', session._id.session_id]"> diff --git a/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.ts b/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.ts index 41a1410b1b56129605ea73347e8369d77201a79f..86f5e6e70832b15162297ba83006e11f905f1261 100644 --- a/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.ts +++ b/src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.ts @@ -66,13 +66,16 @@ export class LogsSessionsComponent implements OnChanges { } formatDate() { for (let i = 0; i < this.nbSessions; i += 1) { - for (let j = 0; j < this.allSessionsInfoList[i].data.length; j += 1) { - // const date1 = new Date(this.allSlugsInfoList[i].data[j].completionDate.$date); - // const date2 = new Date(this.allSlugsInfoList[i].data[j].startDate.$date); - // this.allSlugsInfoList[i].data[j].duration = - // Math.round((this.allSlugsInfoList[i].data[j].completionDate.$date - this.allSlugsInfoList[i].data[j].startDate.$date) / 60000); - this.allSessionsInfoList[i].data[j].completionDate.$date = new Date(this.allSessionsInfoList[i].data[j].completionDate.$date); - } + this.allSessionsInfoList[i].latest.completionDate.$date = new Date(this.allSessionsInfoList[i].latest.completionDate.$date); + + // for (let j = 0; j < this.allSessionsInfoList[i].data.length; j += 1) { + // // const date1 = new Date(this.allSlugsInfoList[i].data[j].completionDate.$date); + // // const date2 = new Date(this.allSlugsInfoList[i].data[j].startDate.$date); + // // this.allSlugsInfoList[i].data[j].duration = + // // Math.round((this.allSlugsInfoList[i].data[j].completionDate.$date - + // // this.allSlugsInfoList[i].data[j].startDate.$date) / 60000); + // this.allSessionsInfoList[i].data[j].completionDate.$date = new Date(this.allSessionsInfoList[i].data[j].completionDate.$date); + // } } } diff --git a/src/app/components/logs-dashboard/logs-slugs/filter.pipe.ts b/src/app/components/logs-dashboard/logs-slugs/filter.pipe.ts index 2a1fa73c86cd0a410b13dde7cc6d93ec0c633f38..ac204fd5f6d5b52422f5ec33413b9ba279873dca 100644 --- a/src/app/components/logs-dashboard/logs-slugs/filter.pipe.ts +++ b/src/app/components/logs-dashboard/logs-slugs/filter.pipe.ts @@ -3,12 +3,10 @@ import { Pipe, PipeTransform } from '@angular/core'; name: 'filter', }) export class FilterPipe implements PipeTransform { - transform(items: any[], searchText: string): any[] { + transform(items: any[], value: string, label:string): any[] { if (!items) return []; - if (!searchText) return items; - const lowerSearchText = searchText.toLowerCase(); - return items.filter(it => { - return it.toLowerCase().includes(lowerSearchText); - }); + if (!value) return items; + if (value === '' || value === null) return []; + return items.filter(e => e['_id'][label].toLowerCase().indexOf(value) > -1); } -} \ No newline at end of file +} diff --git a/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html b/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html index cea57ef4a0006f26bf289165a6b45eabbf3be74f..762252d921346ac4285bf16b35f00d1f2e1c65d8 100644 --- a/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html +++ b/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html @@ -5,11 +5,6 @@ <label class="label"> Search by slug: </label> <input class="input" type="text" name="searchSlug" [(ngModel)]="searchSlug"> </div> - <ul > - <li *ngFor="let slug of allSlugsInfoList | filter : searchSlug;"> - <p>{{slug._id.slug}}</p> - </li> - </ul> </div> </form> </div> @@ -47,7 +42,7 @@ <i class="fas fa-sort-down"></i> </span> </span> - <span class="column-title">Completion Date</span> + <span class="column-title">Latest Completion Date</span> </span> </div> <div class="column is-2 has-text-left"> @@ -80,7 +75,7 @@ </div> </div> <div class="data-list"> - <div *ngFor="let slug of allSlugsInfoList; let i=index; let odd=odd; let even=even;"> + <div *ngFor="let slug of allSlugsInfoList | filter : searchSlug: 'slug'; let i=index; let odd=odd; let even=even;"> <div class="data columns is-multiline is-vcentered is-marginless" *ngIf="slug._id.slug" [ngClass]="{ odd: odd, even: even }"> <div class="column is-3 has-text-left"> @@ -90,16 +85,16 @@ </div> </div> <div class="column is-2 has-text-left"> - {{slug.data.length}} + {{slug.all.length}} </div> <div class="column is-2 has-text-left"> - {{slug.data[0].completionDate.$date}} + {{slug.latest.completionDate.$date}} </div> <div class="column is-2 has-text-left"> - {{slug.data[0].duration.hours}}:{{slug.data[0].duration.minutes}}:{{slug.data[0].duration.seconds}} + {{slug.latest.duration.hours}}:{{slug.latest.duration.minutes}}:{{slug.latest.duration.seconds}} </div> <div class="column is-1 has-text-left actions"> - {{slug.data[0].count.ERROR}} + {{slug.latest.count.ERROR}} </div> <div class="column is-1 has-text-left actions"> <a class="button button-gl is-left" [routerLink]="['preReport', 'slug', slug._id.slug]"> diff --git a/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.ts b/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.ts index f7e1d8671163b12007efd16b2bb07b39ad23ce71..6be6b3a1b9dd63d72d7e39da1c58be5fc8841973 100644 --- a/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.ts +++ b/src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.ts @@ -67,13 +67,16 @@ export class LogsSlugsComponent implements OnChanges { } formatDate() { for (let i = 0; i < this.slugInOnePage; i += 1) { - for (let j = 0; j < this.allSlugsInfoList[i].data.length; j += 1) { - // const date1 = new Date(this.allSlugsInfoList[i].data[j].completionDate.$date); - // const date2 = new Date(this.allSlugsInfoList[i].data[j].startDate.$date); - // this.allSlugsInfoList[i].data[j].duration = - // Math.round((this.allSlugsInfoList[i].data[j].completionDate.$date - this.allSlugsInfoList[i].data[j].startDate.$date) / 60000); - this.allSlugsInfoList[i].data[j].completionDate.$date = new Date(this.allSlugsInfoList[i].data[j].completionDate.$date); - } + this.allSlugsInfoList[i].latest.completionDate.$date = new Date(this.allSlugsInfoList[i].latest.completionDate.$date); + + // for (let j = 0; j < this.allSlugsInfoList[i].data.length; j += 1) { + // // const date1 = new Date(this.allSlugsInfoList[i].data[j].completionDate.$date); + // // const date2 = new Date(this.allSlugsInfoList[i].data[j].startDate.$date); + // // this.allSlugsInfoList[i].data[j].duration = + // // Math.round((this.allSlugsInfoList[i].data[j].completionDate.$date - + // // this.allSlugsInfoList[i].data[j].startDate.$date) / 60000); + // this.allSlugsInfoList[i].data[j].completionDate.$date = new Date(this.allSlugsInfoList[i].data[j].completionDate.$date); + // } } } // When pagination is changed by user, we update datasetList with new pagination options 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 abe58df8e50ba566daf129373ce33397ad642b93..b3ae850ed71ccbffe504c88e86560a9e90841044 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 @@ -81,16 +81,16 @@ {{ session._id.session_id }} </div> <div class="column is-1 has-text-left"> - {{ session.data.length }} + {{ session.all.length }} </div> <div class="column is-2 has-text-left"> - {{ session.data[0].completionDate.$date }} + {{ session.latest.completionDate.$date }} </div> <div class="column is-2 has-text-left"> - {{session.data[0].duration.hours}}:{{session.data[0].duration.minutes}}:{{session.data[0].duration.seconds}} + {{session.latest.duration.hours}}:{{session.latest.duration.minutes}}:{{session.latest.duration.seconds}} </div> <div class="column is-1 has-text-left actions"> - {{ session.data[0].count.ERROR }} + {{ session.latest.count.ERROR }} </div> <div class="column is-1 actions"> <a class="button button-gl " @@ -198,16 +198,16 @@ </div> </div> <div class="column is-2 has-text-left"> - {{slug.data.length}} + {{slug.all.length}} </div> <div class="column is-2 has-text-left"> - {{slug.data[0].completionDate.$date}} + {{slug.latest.completionDate.$date}} </div> <div class="column is-2 has-text-left"> - {{slug.data[0].duration.hours}}:{{slug.data[0].duration.minutes}}:{{slug.data[0].duration.seconds}} + {{slug.latest.duration.hours}}:{{slug.latest.duration.minutes}}:{{slug.latest.duration.seconds}} </div> <div class="column is-1 has-text-left actions"> - {{slug.data[0].count.ERROR}} + {{slug.latest.count.ERROR}} </div> <div class="column is-1 has-text-left actions"> <a class="button button-gl is-left" diff --git a/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.ts b/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.ts index b43ec9b25c4173793c9c3c598ea87e39c0c13dcc..c5bc6dff1b8ce0e68aef790d40740a5bca06c7a3 100644 --- a/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.ts +++ b/src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.ts @@ -68,8 +68,8 @@ export class LogsPreReportComponent implements OnInit { } getAllInfoForOneSlug(slug) { this._dataLogsService.getAllInfoForOneSlug(slug).subscribe((result) => { - for (let j = 0; j < result[0].data.length; j += 1) { - result[0].data[j].completionDate.$date = new Date(result[0].data[j].completionDate.$date); + for (let j = 0; j < result[0].all.length; j += 1) { + result[0].all[j].completionDate.$date = new Date(result[0].all[j].completionDate.$date); } this.allSlugsInfoList.push(result[0]); }, @@ -84,8 +84,8 @@ export class LogsPreReportComponent implements OnInit { } getAllInfoForOneSession(sessionId) { this._dataLogsService.getAllInfoForOneSession(sessionId).subscribe((result) => { - for (let j = 0; j < result[0].data.length; j += 1) { - result[0].data[j].completionDate.$date = new Date(result[0].data[j].completionDate.$date); + for (let j = 0; j < result[0].all.length; j += 1) { + result[0].all[j].completionDate.$date = new Date(result[0].all[j].completionDate.$date); } this.allSessionsInfoList.push(result[0]); },