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 9dbde23b50ba32d765a7277395c9d935937dbd8f..d7311f86f511a097775d34e695a1034d0dad9303 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 @@ -15,13 +15,13 @@ <P>{{ childNbSessions }} session(s) in the database</P> </div> <div class="column is-6 has-text-left"> - <p>Values below are for the latest slug in the session</p> + <p>For each session, values below are for the latest slug.</p> </div> </div> <div class="table entity-list-table"> <div class="header columns is-marginless"> - <div class="column is-3 has-text-centered"> + <div class="column is-4 has-text-centered"> <span (click)="sortBy('name')" class="is-sortable"> <span class="column-title">SessionId</span> <p></p> @@ -40,7 +40,7 @@ <span class="column-title">Nb of Slugs</span> </span> </div> - <div class="column is-4 has-text-left"> + <div class="column is-2 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> <span class="icon"> @@ -66,6 +66,19 @@ <span class="column-title">Duration</span> </span> </div> + <div class="column is-1 has-text-left"> + <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">Infos</span> + </span> + </div> <div class="column is-1 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> @@ -87,13 +100,13 @@ <div class="data columns is-multiline is-vcentered is-marginless" *ngFor="let session of allSessionsInfoList; let i=index; let odd=odd; let even=even;" [ngClass]="{ odd: odd, even: even }"> - <div class="column is-3 has-text-left"> + <div class="column is-4 has-text-left"> {{ session._id.session_id }} </div> <div class="column is-1 has-text-left"> {{ session.all.length }} </div> - <div class="column is-4 has-text-left"> + <div class="column is-2 has-text-left"> {{ session.latest.completionDate.$date | date: 'EE dd/MM/yyyy hh:mm:ss'}} </div> <div class="column is-1 has-text-left"> @@ -102,7 +115,10 @@ {{ session.latest.duration.minutes }}: {{ session.latest.duration.seconds }}</span> </div> - <div class="column is-1 has-text-centered actions"> + <div class="column is-1 has-text-left actions"> + {{ session.latest.count.INFO ? session.latest.count.INFO : 0 }} + </div> + <div class="column is-1 has-text-left actions"> {{ session.latest.count.ERROR ? 'Yes ('+session.latest.count.ERROR+')':'No'}} </div> <div class="column is-1 actions"> 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 8e2b164dda46c578f542ea0ce48fbb1483c3a9ac..64a801dd5fe5f926d642488221b0e2bdb44dd1ca 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 @@ -23,7 +23,7 @@ <P>{{ childNbSlugs }} slug(s) in database</P> </div> <div class="column is-6 has-text-left"> - <p>Values below are for the latest Session</p> + <p>For each slug, values below are for the latest session.</p> </div> </div> <div class="table entity-list-table"> @@ -47,7 +47,7 @@ <div class="column is-1 has-text-left"> <span class="column-title">Sessions</span> </div> - <div class="column is-3 has-text-left"> + <div class="column is-2 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> <span class="icon"> @@ -72,6 +72,19 @@ </span> <span class="column-title">Duration</span> </span> </div> + <div class="column is-1 has-text-left"> + <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">Infos</span> + </span> + </div> <div class="column is-1 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> @@ -105,12 +118,15 @@ <div class="column is-1 has-text-left"> {{slug.all.length}} </div> - <div class="column is-3 has-text-left"> + <div class="column is-2 has-text-left"> {{slug.latest.completionDate.$date | date: 'EE dd/MM/yyyy hh:mm:ss'}} </div> <div class="column is-1 has-text-left"> {{slug.latest.duration.hours}}:{{slug.latest.duration.minutes}}:{{slug.latest.duration.seconds}} </div> + <div class="column is-1 has-text-left actions"> + {{ slug.latest.count.INFO ? slug.latest.count.INFO : 0}} + </div> <div class="column is-1 has-text-left actions"> {{ slug.latest.count.ERROR ? 'Yes ('+slug.latest.count.ERROR+')':'No'}} </div> 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 57ce1c0cdbc67da0fca7185dc3a7c79ac75e14ee..f38022746a768151c79904bfd309e4b62160b4c0 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 @@ -44,7 +44,7 @@ <span class="column-title">Completion Date</span> </span> </div> - <div class="column is-2 has-text-left"> + <div class="column is-1 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> <span class="icon"> @@ -57,6 +57,19 @@ <span class="column-title">Duration</span> </span> </div> + <div class="column is-1 has-text-left"> + <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">Infos</span> + </span> + </div> <div class="column is-1 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> @@ -88,9 +101,12 @@ <div class="column is-2 has-text-left"> {{ session._id.completionDate.$date | date: 'EE dd/MM/yyyy hh:mm:ss' }} </div> - <div class="column is-2 has-text-left"> + <div class="column is-1 has-text-left"> {{session._id.duration.hours}}:{{session._id.duration.minutes}}:{{session._id.duration.seconds}} </div> + <div class="column is-1 has-text-left actions"> + {{ session._id.count.INFO ? session._id.count.INFO: 0}} + </div> <div class="column is-1 has-text-left actions"> {{ session._id.count.ERROR ? 'Yes ('+session._id.count.ERROR+')':'No'}} </div> @@ -164,7 +180,7 @@ <span class="column-title">Completion Date</span> </span> </div> - <div class="column is-2 has-text-left"> + <div class="column is-1 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> <span class="icon"> @@ -176,6 +192,19 @@ </span> <span class="column-title">Duration (min)</span> </span> </div> + <div class="column is-1 has-text-left"> + <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">Infos</span> + </span> + </div> <div class="column is-1 has-text-left"> <span class="is-sortable"> <span class="sort-icons"> @@ -213,9 +242,12 @@ <div class="column is-2 has-text-left"> {{slug._id.completionDate.$date | date: 'EE dd/MM/yyyy hh:mm:ss'}} </div> - <div class="column is-2 has-text-left"> + <div class="column is-1 has-text-left"> {{slug._id.duration.hours}}:{{slug._id.duration.minutes}}:{{slug._id.duration.seconds}} </div> + <div class="column is-1 has-text-left actions"> + {{ slug._id.count.INFO ? slug._id.count.INFO: 0}} + </div> <div class="column is-1 has-text-left actions"> {{ slug._id.count.ERROR ? 'Yes (' + slug._id.count.ERROR + ')':'No'}} </div>