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

add uuid field in slug list

parent 27c63004
No related branches found
No related tags found
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
src/app/components/logs-dashboard/logs-sessions/logs-sessions.component.html
+ 2
− 2
View file @ c71a43b9
......@@ -3,7 +3,7 @@
<div class="section">
<div class="columns is-centered is-marginless">
<div class="column has-text-left">
<h2>{{ childNbSessions }} sessions trouvées</h2>
<h2>{{ childNbSessions }} session(s) trouvée(s)</h2>
</div>
</div>
......@@ -94,7 +94,7 @@
</div>
<div class="column is-1 actions">
<a class="button button-gl " [routerLink]="['preReport','session', session._id]">
<i class="fas fa-eye"></i> Voir
<i class="fas fa-eye"></i>
</a>
</div>
</div>
......
src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.html
+ 5
− 5
View file @ c71a43b9
......@@ -5,7 +5,7 @@
<div class="column has-text-left">
<div class="columns is-centered is-marginless">
<div class="column has-text-left">
<h2>{{ childNbSlugs -1 }} slugs trouvées</h2>
<h2>{{ childNbSlugs -1 }} slug(s) trouvé(s)</h2>
</div>
</div>
</div>
......@@ -72,11 +72,11 @@
</div>
</div>
<div class="data-list">
<div *ngFor="let slug of childSlugsList; let i=index; let odd=odd; let even=even;"
<div *ngFor="let slug of allSessionsIdInfo; let i=index; let odd=odd; let even=even;"
>
<div class="data columns is-multiline is-vcentered is-marginless" *ngIf="slug" [ngClass]="{ odd: odd, 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-4 has-text-left">
{{ slug }}
{{ slug._id.slug}} <br> uuid: {{ slug.uuid_list[0]}}
</div>
<div class="column is-1 has-text-left">
<!-- {{ format.mapServerType}} -->
......@@ -92,7 +92,7 @@
</div>
<div class="column is-1 has-text-left actions">
<a class="button button-gl is-left" [routerLink]="['preReport','slug', slug]">
<i class="fas fa-eye"></i> Voir
<i class="fas fa-eye"></i>
</a>
</div>
</div>
......
src/app/components/logs-dashboard/logs-slugs/logs-slugs.component.ts
+ 9
− 7
View file @ c71a43b9
......@@ -17,7 +17,7 @@ export class LogsSlugsComponent implements OnInit {
@Input() childNbUuids: any;
urlCode: string = 'slugUrl';
allSessionsIdInfo: [];
allSessionsIdInfo:any = [];
childSessionsList: any;
constructor(
......@@ -26,15 +26,14 @@ export class LogsSlugsComponent implements OnInit {
ngOnInit() {
this.childSlugsList = [];
this.allSessionsIdInfo = [];
this.childSessionsList = [];
this.getAllUniqueFields();
}
getProcessTimeAggr (sessionId) {
this.dataLogsService.getProcessTimeAggr(sessionId).subscribe((result) => {
console.log(result[0]);
this.allSessionsIdInfo = result[0];
getUuidFromSlug (slug) {
this.dataLogsService.getUuidFromSlug(slug).subscribe((result) => {
console.log('slug to uuid', result[0]);
this.allSessionsIdInfo.push(result[0]);
},
);
}
......@@ -42,11 +41,14 @@ export class LogsSlugsComponent implements OnInit {
this.dataLogsService.getAllUniqueFields().subscribe((result) => {
this.childSlugsList = result[0]['slug_list'];
for (let i = 0; i < this.childNbSlugs; i += 1) {
this.getProcessTimeAggr(this.childSlugsList[i]);
this.getUuidFromSlug(this.childSlugsList[i]);
}
// console.log('allSessionsIdInfo: ', this.allSessionsIdInfo);
},
);
}
getAllInfoForAllSlugs() {
}
seeDashboard() {}
}
src/app/components/logs-dashboard/report/logs-pre-report/logs-pre-report.component.html
+ 82
− 12
View file @ c71a43b9
......@@ -7,29 +7,69 @@
<div class="section">
<div class="columns is-left is-marginless">
<div class="column has-text-left">
<h2>{{ nbObjects }} Sessions trouvées</h2>
<h2>{{ nbObjects }} session(s) trouvée(s)</h2>
</div>
</div>
<div class="table entity-list-table">
<div class="header columns is-marginless">
<div class="column is-4 has-text-left">
<span (click)="sortBy('name')" class="is-sortable">
<span class="is-sortable">
<span class="column-title">SessionId</span>
<p></p>
</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title">All ?</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">All?</span>
</span>
</div>
<div class="column is-2 has-text-left">
<span class="column-title">Completion Date</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Completion Date</span>
</span>
</div>
<div class="column is-2 has-text-left">
<span class="column-title">Duration</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Duration</span>
</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title">Errors?</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Errors?</span>
</span>
</div>
<div class="column is-1 has-text-left">
<span class="column-title"></span>
......@@ -57,7 +97,7 @@
</div>
<div class="column is-1 actions">
<a class="button button-gl " [routerLink]="['/','datalogs','report', id, session, 'slug']">
<i class="fas fa-eye"></i> Voir
<i class="fas fa-eye"></i>
</a>
</div>
</div>
......@@ -82,7 +122,7 @@
<div class="columns is-centered is-marginless">
<div class="column has-text-left">
<h2>{{ nbObjects -1 }} slugs trouvées</h2>
<h2>{{ nbObjects -1 }} slug(s) trouvé(s)</h2>
<!-- <h2>{{ childNbUuids }} uuid trouvées</h2> -->
......@@ -103,13 +143,43 @@
<span class="column-title">Uuids</span>
</div>
<div class="column is-2 has-text-centered">
<span class="column-title">Completion Date</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Completion Date</span>
</span>
</div>
<div class="column is-2 has-text-centered">
<span class="column-title">Last</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Duration</span>
</span>
</div>
<div class="column is-1 has-text-centered">
<span class="column-title">Errors?</span>
<span class="is-sortable">
<span class="sort-icons">
<span class="icon">
<i class="fas fa-sort-up"></i>
</span>
<span class="icon">
<i class="fas fa-sort-down"></i>
</span>
</span>
<span class="column-title">Errors?</span>
</span>
</div>
<div class="column is-1 has-text-centered">
<span class="column-title"></span>
......@@ -134,7 +204,7 @@
</div>
<div class="column is-1 actions">
<a class="button button-gl " [routerLink]="['../../../../datalogs/report', slug, id, 'session']">
<i class="fas fa-eye"></i> Voir
<i class="fas fa-eye"></i>
</a>
</div>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment