From 2f248e78407464db7e4f9d7f78a3a3a0e678f226 Mon Sep 17 00:00:00 2001
From: ddamiron <ddamiron@sii.fr>
Date: Mon, 22 Jul 2019 13:29:29 +0200
Subject: [PATCH] update css for: logs-home logs-session logs-slug
lorg-pre-report logs-report
---
.../logs-home/logs-home.component.html | 8 +-
.../logs-home/logs-home.component.scss | 11 +
.../logs-sessions.component.html | 112 +++++-----
.../logs-sessions/logs-sessions.component.ts | 8 +-
.../logs-slugs/logs-slugs.component.html | 66 +++---
.../logs-pre-report.component.html | 204 +++++++++---------
.../logs-report/logs-report.component.html | 11 +-
7 files changed, 214 insertions(+), 206 deletions(-)
diff --git a/src/app/components/logs-dashboard/logs-home/logs-home.component.html b/src/app/components/logs-dashboard/logs-home/logs-home.component.html
index 111a796..1deaf57 100644
--- a/src/app/components/logs-dashboard/logs-home/logs-home.component.html
+++ b/src/app/components/logs-dashboard/logs-home/logs-home.component.html
@@ -1,10 +1,10 @@
-<div class="section">
+<div class="section page-container">
<div class="columns is-centered is-marginless">
<div class="input-field">
<form>
<label> Slug/Uuid: </label>
<input type="text" size="40" name="slug" [(ngModel)]="slug">
-
+
<label> SessionId: </label>
<input type="text" size="40" name="sessionId" [(ngModel)]="sessionId">
@@ -32,6 +32,4 @@
<app-logs-slugs [hidden]="!isToggled" [childSlugsList]="allFields.slug_list" [childNbSlugs]="nbSlug"
[childNbUuids]="nbUuid"></app-logs-slugs>
</div>
- </div>
-
-
+ </div>
\ No newline at end of file
diff --git a/src/app/components/logs-dashboard/logs-home/logs-home.component.scss b/src/app/components/logs-dashboard/logs-home/logs-home.component.scss
index fb31c60..07e58bb 100644
--- a/src/app/components/logs-dashboard/logs-home/logs-home.component.scss
+++ b/src/app/components/logs-dashboard/logs-home/logs-home.component.scss
@@ -24,4 +24,15 @@ figure {
.hidden {
display: none;
+ }
+ .icon {
+ cursor: pointer;
+ &:hover {
+ .fa-plus {
+ color: lightblue;
+ }
+ .fa-trash {
+ color: #d5232a;
+ }
+ }
}
\ No newline at end of file
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 0fd69dd..e6cc70c 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
@@ -1,73 +1,73 @@
-<ng-container >
- <div>
- <div class="section">
- <div class="columns is-centered is-marginless">
- <div class="column has-text-left">
- <h2>{{ childNbSessions }} Sessions trouvées</h2>
- </div>
+<ng-container>
+ <div>
+ <div class="section">
+ <div class="columns is-centered is-marginless">
+ <div class="column has-text-left">
+ <h2>{{ childNbSessions }} Sessions trouvées</h2>
</div>
+ </div>
- <div class="table">
- <div class="header columns is-marginless">
- <div class="column is-4 has-text-centered">
- <span (click)="sortBy('name')" class="is-sortable">
- <span class="column-title" >SessionId</span>
- <p></p>
- </span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">All ?</span>
+ <div class="table entity-list-table">
+ <div class="header columns is-marginless">
+ <div class="column is-4 has-text-centered">
+ <span (click)="sortBy('name')" 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>
+ </div>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">Completion Date</span>
+ </div>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">Duration</span>
+ </div>
+ <div class="column is-1 has-text-left">
+ <span class="column-title">Errors?</span>
+ </div>
+ <div class="column is-1 has-text-left">
+ <span class="column-title"></span>
+ </div>
+ </div>
+ <div class="data-list">
+ <div class="data columns is-multiline is-vcentered is-marginless"
+ *ngFor="let session of allSessionsIdInfo; let i=index; let odd=odd; let even=even;" [ngClass]="{ odd: odd, even: even }">
+ <div class="column is-4 has-text-left">
+ {{ session._id }}
</div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Completion Date</span>
+ <div class="column is-1 has-text-left">
+ <!-- {{ format.mapServerType}} -->
</div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Duration</span>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">Completion Date</span>
</div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">Errors?</span>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">{{ session.totalHoursSpent }}:
+ {{ session.totalMinutesSpent }}:
+ {{ session.totalSecondsSpent }}</span>
</div>
- <div class="column is-1 has-text-centered">
- <span class="column-title"></span>
+ <div class="column is-1 has-text-centered actions">
+ 0
</div>
- </div>
- <div class="data-list">
- <div class="data columns is-multiline is-vcentered is-marginless"
- *ngFor="let session of allSessionsIdInfo; let i=index;">
- <div class="column is-4 has-text-centered">
- {{ session._id }}
- </div>
- <div class="column is-1 has-text-centered">
- <!-- {{ format.mapServerType}} -->
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Completion Date</span>
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">{{ session.totalHoursSpent }}:
- {{ session.totalMinutesSpent }}:
- {{ session.totalSecondsSpent }}</span>
- </div>
- <div class="column is-1 has-text-centered actions">
- 0
- </div>
- <div class="column is-1 actions">
- <a class="button button-gl " [routerLink]="['preReport','session', session._id]">
- <i class="fas fa-eye"></i> Voir
- </a>
- </div>
+ <div class="column is-1 actions">
+ <a class="button button-gl " [routerLink]="['preReport','session', session._id]">
+ <i class="fas fa-eye"></i> Voir
+ </a>
</div>
</div>
- <div class="columns is-marginless">
- <div class="column">
- <!-- <app-paginator *ngIf="paginator.length > 0" [length]="paginator.length" [pageSize]="paginator.limit"
+ </div>
+ <div class="columns is-marginless">
+ <div class="column">
+ <!-- <app-paginator *ngIf="paginator.length > 0" [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>
</div>
</div>
</div>
- </ng-container>
\ No newline at end of file
+ </div>
+</ng-container>
\ No newline at end of file
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 1d7e3fc..3ce7662 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
@@ -13,23 +13,21 @@ export class LogsSessionsComponent implements OnInit {
@Input() childSessionId: string;
// @Input() childSessionsList: [];
@Input() childNbSessions: number;
- allSessionsIdInfo: any;
- childSessionsList: any;
+ allSessionsIdInfo: any = [];
+ childSessionsList: any = [];
urlCode: string = 'sessionUrl';
constructor(
private dataLogsService: DataLogsService,
) { }
ngOnInit() {
- this.allSessionsIdInfo = [];
- this.childSessionsList = [];
this.getAllUniqueFields();
}
getProcessTimeAggr (sessionId) {
this.dataLogsService.getProcessTimeAggr(sessionId).subscribe((result) => {
console.log(result[0]);
- this.allSessionsIdInfo = [result[0]];
+ this.allSessionsIdInfo.push(result[0]);
},
);
}
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 b492167..d91c8c3 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
@@ -11,7 +11,7 @@
</div>
</div>
- <div class="table">
+ <div class="table entity-list-table">
<div class="header columns is-marginless">
<div class="column is-4 has-text-centered">
<span (click)="sortBy('name')" class="is-sortable">
@@ -19,57 +19,59 @@
<p></p>
</span>
</div>
- <div class="column is-1 has-text-centered">
+ <div class="column is-1 has-text-left">
<span class="column-title">Uuids</span>
</div>
- <div class="column is-2 has-text-centered">
+ <div class="column is-2 has-text-left">
<span class="column-title">Completion Date</span>
</div>
- <div class="column is-2 has-text-centered">
+ <div class="column is-2 has-text-left">
<span class="column-title">Last</span>
</div>
- <div class="column is-1 has-text-centered">
+ <div class="column is-1 has-text-left">
<span class="column-title">Errors?</span>
</div>
- <div class="column is-1 has-text-centered">
+ <div class="column is-1 has-text-left">
<span class="column-title"></span>
</div>
</div>
- <div class="data-list" *ngFor="let slug of childSlugsList; let i=index;">
- <div class="data columns is-multiline is-vcentered is-marginless"
- *ngIf="slug">
- <div class="column is-4 has-text-centered">
- {{ slug }}
- </div>
- <div class="column is-1 has-text-centered">
- <!-- {{ format.mapServerType}} -->
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Completion Date</span>
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title"></span>
- </div>
- <div class="column is-1 has-text-centered actions">
+ <div class="data-list">
+ <div *ngFor="let slug of childSlugsList; 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="column is-4 has-text-left">
+ {{ slug }}
+ </div>
+ <div class="column is-1 has-text-left">
+ <!-- {{ format.mapServerType}} -->
+ </div>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">Completion Date</span>
+ </div>
+ <div class="column is-2 has-text-left">
+ <span class="column-title"></span>
+ </div>
+ <div class="column is-1 has-text-left actions">
+ </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
+ </a>
+ </div>
</div>
- <div class="column is-1 has-text-centered actions">
- <a class="button button-gl is-centered" [routerLink]="['preReport','slug', slug]">
- <i class="fas fa-eye"></i> Voir
- </a>
- </div>
- </div>
- <div class="columns is-marginless">
- <div class="column">
- <!-- <app-paginator *ngIf="paginator.length > 0" [length]="paginator.length" [pageSize]="paginator.limit"
+ </div>
+ <div class="columns is-marginless">
+ <div class="column">
+ <!-- <app-paginator *ngIf="paginator.length > 0" [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>
</div>
</div>
</div>
</div>
+ </div>
</ng-container>
\ No newline at end of file
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 9c2f71d..7afe83a 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
@@ -1,158 +1,156 @@
-<ng-container
-*ngIf="nbObjects!==0"
->
+<ng-container *ngIf="nbObjects!==0">
+ <div class="section page-container">
- <app-back-button [route]="'/datalogs'" [title]="'Retourner à la liste des slugs et sessionIds'"></app-back-button>
+ <app-back-button [route]="'/datalogs'" [title]="'Retourner à la liste des slugs et sessionIds'"></app-back-button>
- <h1>{{ title }}</h1>
- <div [ngClass]="{'hidden': isSession}">
- <div class="section">
- <div class="columns is-centered is-marginless">
- <div class="column has-text-left">
- <h2>{{ nbObjects }} Sessions trouvées</h2>
- </div>
- </div>
-
- <div class="table">
- <div class="header columns is-marginless">
- <div class="column is-4 has-text-centered">
- <span (click)="sortBy('name')" class="is-sortable">
- <span class="column-title">SessionId</span>
- <p></p>
- </span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">All ?</span>
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Completion Date</span>
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Duration</span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">Errors?</span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title"></span>
+ <h1>{{ title }}</h1>
+ <div [ngClass]="{'hidden': isSession}">
+ <div class="section">
+ <div class="columns is-left is-marginless">
+ <div class="column has-text-left">
+ <h2>{{ nbObjects }} Sessions trouvées</h2>
</div>
</div>
- <div class="data-list">
- <div class="data columns is-multiline is-vcentered is-marginless"
- *ngFor="let session of responseArray.session_id_list; let i=index;">
- <div class="column is-4 has-text-centered">
- {{ session }}
+
+ <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="column-title">SessionId</span>
+ <p></p>
+ </span>
</div>
- <div class="column is-1 has-text-centered">
- <!-- {{ format.mapServerType}} -->
+ <div class="column is-1 has-text-left">
+ <span class="column-title">All ?</span>
</div>
- <div class="column is-2 has-text-centered">
+ <div class="column is-2 has-text-left">
<span class="column-title">Completion Date</span>
</div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">{{ session.totalHoursSpent }}:
- {{ session.totalMinutesSpent }}:
- {{ session.totalSecondsSpent }}</span>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">Duration</span>
</div>
- <div class="column is-1 has-text-centered actions">
- 0
+ <div class="column is-1 has-text-left">
+ <span class="column-title">Errors?</span>
+ </div>
+ <div class="column is-1 has-text-left">
+ <span class="column-title"></span>
</div>
- <div class="column is-1 actions">
+ </div>
+ <div class="data-list">
+ <div class="data columns is-multiline is-vcentered is-marginless"
+ *ngFor="let session of responseArray.session_id_list; let i=index;">
+ <div class="column is-4 has-text-left">
+ {{ session }}
+ </div>
+ <div class="column is-1 has-text-left">
+ <!-- {{ format.mapServerType}} -->
+ </div>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">Completion Date</span>
+ </div>
+ <div class="column is-2 has-text-left">
+ <span class="column-title">{{ session.totalHoursSpent }}:
+ {{ session.totalMinutesSpent }}:
+ {{ session.totalSecondsSpent }}</span>
+ </div>
+ <div class="column is-1 has-text-left actions">
+ 0
+ </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> Voir
</a>
+ </div>
</div>
</div>
- </div>
- <div class="columns is-marginless">
- <div class="column">
- <!-- <app-paginator *ngIf="paginator.length > 0" [length]="paginator.length" [pageSize]="paginator.limit"
+ <div class="columns is-marginless">
+ <div class="column">
+ <!-- <app-paginator *ngIf="paginator.length > 0" [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>
</div>
</div>
</div>
- </div>
- <div [ngClass]="{'hidden': !isSession}" >
- <div class="section">
- <div class="columns is-left is-marginless">
- <div class="column has-text-left">
- <div class="columns is-centered is-marginless">
- <div class="column has-text-left">
+ <div [ngClass]="{'hidden': !isSession}">
+ <div class="section">
+ <div class="columns is-left is-marginless">
+ <div class="column has-text-left">
+ <div class="columns is-centered is-marginless">
+ <div class="column has-text-left">
- <h2>{{ nbObjects -1 }} slugs trouvées</h2>
+ <h2>{{ nbObjects -1 }} slugs trouvées</h2>
- <!-- <h2>{{ childNbUuids }} uuid trouvées</h2> -->
+ <!-- <h2>{{ childNbUuids }} uuid trouvées</h2> -->
+ </div>
</div>
</div>
</div>
- </div>
- <div class="table">
- <div class="header columns is-marginless">
- <div class="column is-4 has-text-centered">
- <span (click)="sortBy('name')" class="is-sortable">
- <span class="column-title">Slugs</span>
- <p></p>
- </span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">Uuids</span>
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Completion Date</span>
- </div>
- <div class="column is-2 has-text-centered">
- <span class="column-title">Last</span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">Errors?</span>
- </div>
- <div class="column is-1 has-text-centered">
- <span class="column-title"></span>
- </div>
- </div>
- <div class="data-list" *ngFor="let slug of responseArray.slug_list; let i=index;">
- <div class="data columns is-multiline is-vcentered is-marginless"
- *ngIf="slug">
+ <div class="table entity-list-table">
+ <div class="header columns is-marginless">
<div class="column is-4 has-text-centered">
- {{ slug }}
+ <span (click)="sortBy('name')" class="is-sortable">
+ <span class="column-title">Slugs</span>
+ <p></p>
+ </span>
</div>
<div class="column is-1 has-text-centered">
- <!-- {{ format.mapServerType}} -->
+ <span class="column-title">Uuids</span>
</div>
<div class="column is-2 has-text-centered">
<span class="column-title">Completion Date</span>
</div>
<div class="column is-2 has-text-centered">
+ <span class="column-title">Last</span>
+ </div>
+ <div class="column is-1 has-text-centered">
+ <span class="column-title">Errors?</span>
+ </div>
+ <div class="column is-1 has-text-centered">
<span class="column-title"></span>
</div>
- <div class="column is-1 has-text-centered actions">
+ </div>
+ <div class="data-list" *ngFor="let slug of responseArray.slug_list; let i=index;">
+ <div class="data columns is-multiline is-vcentered is-marginless" *ngIf="slug">
+ <div class="column is-4 has-text-centered">
+ {{ slug }}
+ </div>
+ <div class="column is-1 has-text-centered">
+ <!-- {{ format.mapServerType}} -->
+ </div>
+ <div class="column is-2 has-text-centered">
+ <span class="column-title">Completion Date</span>
+ </div>
+ <div class="column is-2 has-text-centered">
+ <span class="column-title"></span>
+ </div>
+ <div class="column is-1 has-text-centered actions">
- </div>
- <div class="column is-1 actions">
+ </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> Voir
</a>
+ </div>
</div>
- </div>
- <div class="columns is-marginless">
- <div class="column">
- <!-- <app-paginator *ngIf="paginator.length > 0" [length]="paginator.length" [pageSize]="paginator.limit"
+ <div class="columns is-marginless">
+ <div class="column">
+ <!-- <app-paginator *ngIf="paginator.length > 0" [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>
</div>
</div>
</div>
</div>
</div>
-
</ng-container>
\ No newline at end of file
diff --git a/src/app/components/logs-dashboard/report/logs-report/logs-report.component.html b/src/app/components/logs-dashboard/report/logs-report/logs-report.component.html
index b08386b..c0a0136 100644
--- a/src/app/components/logs-dashboard/report/logs-report/logs-report.component.html
+++ b/src/app/components/logs-dashboard/report/logs-report/logs-report.component.html
@@ -1,10 +1,11 @@
-<ng-container >
+<ng-container>
+ <div class="section page-container">
- <app-back-button [routerLink]="previousUrl" [title]="'Retourner au pre-report'"></app-back-button>
+ <app-back-button [routerLink]="previousUrl" [title]="'Retourner au pre-report'"></app-back-button>
- <h1>{{ title }}</h1>
+ <h1>{{ title }}</h1>
- <app-logs-graph [childUuid]="uuid" [childSessionId]="sessionId" [childSlug]="slug"></app-logs-graph>
-
+ <app-logs-graph [childUuid]="uuid" [childSessionId]="sessionId" [childSlug]="slug"></app-logs-graph>
+ </div>
</ng-container>
\ No newline at end of file
--
GitLab