Skip to content
Snippets Groups Projects
Commit 5eb323a8 authored by ddamiron's avatar ddamiron
Browse files

add search pipe

parent 80caad0d
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
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 51 deletions
src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html
+ 7
− 7
View file @ 5eb323a8
......@@ -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]">
......
src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.ts
+ 10
− 7
View file @ 5eb323a8
......@@ -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);
// }
}
}
......
src/app/components/logs-dashboard/logs-slugs/filter.pipe.ts
+ 5
− 7
View file @ 5eb323a8
......@@ -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
}
src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html
+ 6
− 11
View file @ 5eb323a8
......@@ -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]">
......
src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.ts
+ 10
− 7
View file @ 5eb323a8
......@@ -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
......
src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html
+ 8
− 8
View file @ 5eb323a8
......@@ -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"
......
src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.ts
+ 4
− 4
View file @ 5eb323a8
......@@ -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]);
},
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment