From addaf9bb83ba7399906ecd5213ef0eb8d1746962 Mon Sep 17 00:00:00 2001
From: ddamiron <ddamiron@sii.fr>
Date: Thu, 18 Jul 2019 17:21:34 +0200
Subject: [PATCH] toggle graph session and log
---
.../logs-data/logs-data.component.html | 53 ++++-----
.../logs-data/logs-data.component.scss | 4 +
.../logs-data/logs-data.component.ts | 6 +-
.../logs-sessions.component.html | 9 +-
.../logs-sessions/logs-sessions.component.ts | 2 +
.../logs-slugs/logs-slugs.component.html | 107 +++++++++---------
.../logs-slugs/logs-slugs.component.ts | 1 +
7 files changed, 98 insertions(+), 84 deletions(-)
diff --git a/src/app/components/logs-dashboard/logs-data/logs-data.component.html b/src/app/components/logs-dashboard/logs-data/logs-data.component.html
index 68e59eb..81f0555 100644
--- a/src/app/components/logs-dashboard/logs-data/logs-data.component.html
+++ b/src/app/components/logs-dashboard/logs-data/logs-data.component.html
@@ -1,28 +1,29 @@
<div class="section">
- <div class="columns is-centered is-marginless">
- <div class="input-field">
- <form>
- <label> Uuid: </label>
- <input type="text" size="40" name="uuid" [(ngModel)]="uuid">
- <!-- <br> -->
- <label> SessionId: </label>
- <input type="text" size="40" name="sessionId" [(ngModel)]="sessionId">
- <label> Slug: </label>
- <input type="text" size="20" name="slug" [(ngModel)]="slug">
- </form>
- <br>
+ <div class="columns is-centered is-marginless">
+ <div class="input-field">
+ <form>
+ <label> Slug/Uuid: </label>
+ <input type="text" size="40" name="uuid" [(ngModel)]="uuid">
+ <!-- <br> -->
+ <label> SessionId: </label>
+ <input type="text" size="40" name="sessionId" [(ngModel)]="sessionId">
+ <!-- <label> Slug: </label>
+ <input type="text" size="20" name="slug" [(ngModel)]="slug"> -->
+ <a class="button button-gl is-centered" (click)="onSubmit()">
+ <i class="fas fa-search"></i>
+ </a>
+ </form>
+ <br>
- <a class="button button-gl is-centered" (click)="tabsToggler(true)">
- Slugs
- </a>
- <a class="button button-gl is-centered" (click)="tabsToggler(false)">
- Sessions
- </a>
- <a class="button button-gl is-centered" (click)="onSubmit()">
- Report
- </a>
- </div>
+ <a class="button button-gl is-centered" (click)="tabsToggler(true)">
+ Slugs
+ </a>
+ <a class="button button-gl is-centered" (click)="tabsToggler(false)">
+ Sessions
+ </a>
+
+ </div>
</div>
<!-- <div class="columns is-centered is-marginless">
<div class="column has-text-centered">
@@ -50,8 +51,8 @@
[childNbUuids]="nbUuid"></app-logs-slugs>
</div>
</div>
- <div class="columns is-centered is-marginless">
- <div class="column has-text-centered">
+ <div class="columns is-centered is-marginless" [ngClass]="{'hidden': !isDashboardDisplayed}">
+ <div class="column has-text-centered" >
<div *ngFor="let a of [data]">
<hr>
<span>
@@ -87,10 +88,6 @@
</div>
- <div class="table">
- </div>
-
-
</div>
<app-logs-graph [childUuid]="uuid" [childSessionId]="sessionId" [childSlug]="slug"></app-logs-graph>
\ No newline at end of file
diff --git a/src/app/components/logs-dashboard/logs-data/logs-data.component.scss b/src/app/components/logs-dashboard/logs-data/logs-data.component.scss
index a49495f..fb31c60 100644
--- a/src/app/components/logs-dashboard/logs-data/logs-data.component.scss
+++ b/src/app/components/logs-dashboard/logs-data/logs-data.component.scss
@@ -20,4 +20,8 @@ figure {
.input-field{
width: 200%;
margin-top: 20px;
+ }
+
+ .hidden {
+ display: none;
}
\ No newline at end of file
diff --git a/src/app/components/logs-dashboard/logs-data/logs-data.component.ts b/src/app/components/logs-dashboard/logs-data/logs-data.component.ts
index 62ce54e..440cc9d 100644
--- a/src/app/components/logs-dashboard/logs-data/logs-data.component.ts
+++ b/src/app/components/logs-dashboard/logs-data/logs-data.component.ts
@@ -11,6 +11,7 @@ import { FormsModule } from '@angular/forms';
styleUrls: ['./logs-data.component.scss'],
})
export class LogsDataComponent implements OnInit {
+ isDashboardDisplayed: boolean = false;
uuid: string;
allFields: any;
sessionId: string;
@@ -42,6 +43,8 @@ export class LogsDataComponent implements OnInit {
}
onSubmit() {
+ this.isDashboardDisplayed = true;
+ this.isToggled = false;
this.dataLogsService.uuidToSessionId(this.uuid)
.subscribe((result) => {
this.data.uuid = result[0]._id.uuid;
@@ -70,6 +73,7 @@ export class LogsDataComponent implements OnInit {
}
tabsToggler(boolean) {
this.isToggled = boolean;
-
+ this.isDashboardDisplayed = false;
}
+
}
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 3ed196e..04f36d8 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
@@ -27,7 +27,7 @@
<div class="column is-1 has-text-centered">
<span class="column-title">Errors?</span>
</div>
- <div class="column is-offset-1 is-1 has-text-centered">
+ <div class="column is-1 has-text-centered">
<span class="column-title"></span>
</div>
</div>
@@ -49,9 +49,12 @@
{{ session.totalSecondsSpent }}</span>
</div>
<div class="column is-1 has-text-centered actions">
+ 0
</div>
- <div class="column is-offset-1 is-1 has-text-centered actions">
- <app-crud-buttons ></app-crud-buttons>
+ <div class="column is-1 actions">
+ <a class="button button-gl " (click)="onSubmit()">
+ <i class="fas fa-eye"></i> Voir
+ </a>
</div>
</div>
</div>
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 6011f51..1fc59e5 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
@@ -43,4 +43,6 @@ export class LogsSessionsComponent implements OnInit {
},
);
}
+ seeDashboard() {}
+
}
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 9826bfe..e3ecc3f 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
@@ -1,76 +1,79 @@
-<ng-container >
- <div>
- <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>{{ childNbSlugs -1 }} slugs trouvées</h2>
+<ng-container>
+ <div>
+ <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>{{ childNbUuids }} uuid trouvées</h2>
-
- </div>
- </div>
+ <h2>{{ childNbSlugs -1 }} slugs trouvées</h2>
+
+ <h2>{{ childNbUuids }} uuid trouvées</h2>
+
+ </div>
</div>
</div>
+ </div>
- <div class="table">
- <div class="header columns is-marginless">
+ <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">
+ <div class="data columns is-multiline is-vcentered is-marginless"
+ *ngFor="let slug of childSlugsList; let i=index;">
<div class="column is-4 has-text-centered">
- <span (click)="sortBy('name')" class="is-sortable">
- <span class="column-title" >Slugs</span>
- <p></p>
- </span>
+ {{ slug }}
</div>
<div class="column is-1 has-text-centered">
- <span class="column-title">Uuids</span>
+ <!-- {{ format.mapServerType}} -->
</div>
<div class="column is-2 has-text-centered">
- <span class="column-title">Completion Date</span>
+ <span class="column-title">Completion Date</span>
</div>
<div class="column is-2 has-text-centered">
- <span class="column-title">Duration</span>
+ <span class="column-title"></span>
</div>
- <div class="column is-1 has-text-centered">
- <span class="column-title">Errors?</span>
+ <div class="column is-1 has-text-centered actions">
+
</div>
- <div class="column is-offset-1 is-1 has-text-centered">
- <span class="column-title"></span>
+ <div class="column is-1 has-text-centered actions">
+ <a class="button button-gl is-centered" (click)="onSubmit()">
+ <i class="fas fa-eye"></i> Voir
+ </a>
</div>
- </div>
- <div class="data-list">
- <div class="data columns is-multiline is-vcentered is-marginless"
- *ngFor="let slug of childSlugsList; let i=index;">
- <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-offset-1 is-1 has-text-centered actions">
- <app-crud-buttons ></app-crud-buttons>
- </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>
- </ng-container>
\ No newline at end of file
+</ng-container>
\ No newline at end of file
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 b9a089c..d851fd7 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
@@ -47,4 +47,5 @@ export class LogsSlugsComponent implements OnInit {
},
);
}
+ seeDashboard() {}
}
--
GitLab