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

toggle graph session and log

parent cbeccbc9
Branches
Tags
6 merge requests!10New updated datalog,!9add all datalog components and services into angular gui,!8update Datalog research input,!4Add logs pannels to updated admin gui,!7Datalog research input,!14Version 1.3.0
<div class="section"> <div class="section">
<div class="columns is-centered is-marginless"> <div class="columns is-centered is-marginless">
<div class="input-field"> <div class="input-field">
<form> <form>
<label> Uuid: </label> <label> Slug/Uuid: </label>
<input type="text" size="40" name="uuid" [(ngModel)]="uuid"> <input type="text" size="40" name="uuid" [(ngModel)]="uuid">
<!-- <br> --> <!-- <br> --> &nbsp;
<label> SessionId: </label> <label> SessionId: </label>
<input type="text" size="40" name="sessionId" [(ngModel)]="sessionId"> <input type="text" size="40" name="sessionId" [(ngModel)]="sessionId">
<label> Slug: </label> <!-- <label> Slug: </label>
<input type="text" size="20" name="slug" [(ngModel)]="slug"> <input type="text" size="20" name="slug" [(ngModel)]="slug"> -->
</form> <a class="button button-gl is-centered" (click)="onSubmit()">
<br> <i class="fas fa-search"></i>
</a>
</form>
<br>
<a class="button button-gl is-centered" (click)="tabsToggler(true)"> <a class="button button-gl is-centered" (click)="tabsToggler(true)">
Slugs Slugs
</a> </a>
<a class="button button-gl is-centered" (click)="tabsToggler(false)"> <a class="button button-gl is-centered" (click)="tabsToggler(false)">
Sessions Sessions
</a> </a>
<a class="button button-gl is-centered" (click)="onSubmit()">
Report </div>
</a>
</div>
</div> </div>
<!-- <div class="columns is-centered is-marginless"> <!-- <div class="columns is-centered is-marginless">
<div class="column has-text-centered"> <div class="column has-text-centered">
...@@ -50,8 +51,8 @@ ...@@ -50,8 +51,8 @@
[childNbUuids]="nbUuid"></app-logs-slugs> [childNbUuids]="nbUuid"></app-logs-slugs>
</div> </div>
</div> </div>
<div class="columns is-centered is-marginless"> <div class="columns is-centered is-marginless" [ngClass]="{'hidden': !isDashboardDisplayed}">
<div class="column has-text-centered"> <div class="column has-text-centered" >
<div *ngFor="let a of [data]"> <div *ngFor="let a of [data]">
<hr> <hr>
<span> <span>
...@@ -87,10 +88,6 @@ ...@@ -87,10 +88,6 @@
</div> </div>
<div class="table">
</div>
</div> </div>
<app-logs-graph [childUuid]="uuid" [childSessionId]="sessionId" [childSlug]="slug"></app-logs-graph> <app-logs-graph [childUuid]="uuid" [childSessionId]="sessionId" [childSlug]="slug"></app-logs-graph>
\ No newline at end of file
...@@ -20,4 +20,8 @@ figure { ...@@ -20,4 +20,8 @@ figure {
.input-field{ .input-field{
width: 200%; width: 200%;
margin-top: 20px; margin-top: 20px;
}
.hidden {
display: none;
} }
\ No newline at end of file
...@@ -11,6 +11,7 @@ import { FormsModule } from '@angular/forms'; ...@@ -11,6 +11,7 @@ import { FormsModule } from '@angular/forms';
styleUrls: ['./logs-data.component.scss'], styleUrls: ['./logs-data.component.scss'],
}) })
export class LogsDataComponent implements OnInit { export class LogsDataComponent implements OnInit {
isDashboardDisplayed: boolean = false;
uuid: string; uuid: string;
allFields: any; allFields: any;
sessionId: string; sessionId: string;
...@@ -42,6 +43,8 @@ export class LogsDataComponent implements OnInit { ...@@ -42,6 +43,8 @@ export class LogsDataComponent implements OnInit {
} }
onSubmit() { onSubmit() {
this.isDashboardDisplayed = true;
this.isToggled = false;
this.dataLogsService.uuidToSessionId(this.uuid) this.dataLogsService.uuidToSessionId(this.uuid)
.subscribe((result) => { .subscribe((result) => {
this.data.uuid = result[0]._id.uuid; this.data.uuid = result[0]._id.uuid;
...@@ -70,6 +73,7 @@ export class LogsDataComponent implements OnInit { ...@@ -70,6 +73,7 @@ export class LogsDataComponent implements OnInit {
} }
tabsToggler(boolean) { tabsToggler(boolean) {
this.isToggled = boolean; this.isToggled = boolean;
this.isDashboardDisplayed = false;
} }
} }
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<div class="column is-1 has-text-centered"> <div class="column is-1 has-text-centered">
<span class="column-title">Errors?</span> <span class="column-title">Errors?</span>
</div> </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> <span class="column-title"></span>
</div> </div>
</div> </div>
...@@ -49,9 +49,12 @@ ...@@ -49,9 +49,12 @@
{{ session.totalSecondsSpent }}</span> {{ session.totalSecondsSpent }}</span>
</div> </div>
<div class="column is-1 has-text-centered actions"> <div class="column is-1 has-text-centered actions">
0
</div> </div>
<div class="column is-offset-1 is-1 has-text-centered actions"> <div class="column is-1 actions">
<app-crud-buttons ></app-crud-buttons> <a class="button button-gl " (click)="onSubmit()">
<i class="fas fa-eye"></i> Voir
</a>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -43,4 +43,6 @@ export class LogsSessionsComponent implements OnInit { ...@@ -43,4 +43,6 @@ export class LogsSessionsComponent implements OnInit {
}, },
); );
} }
seeDashboard() {}
} }
<ng-container > <ng-container>
<div> <div>
<div class="section"> <div class="section">
<div class="columns is-left is-marginless"> <div class="columns is-left is-marginless">
<div class="column has-text-left"> <div class="column has-text-left">
<div class="columns is-centered is-marginless"> <div class="columns is-centered is-marginless">
<div class="column has-text-left"> <div class="column has-text-left">
<h2>{{ childNbSlugs -1 }} slugs trouvées</h2>
<h2>{{ childNbUuids }} uuid trouvées</h2> <h2>{{ childNbSlugs -1 }} slugs trouvées</h2>
</div> <h2>{{ childNbUuids }} uuid trouvées</h2>
</div>
</div>
</div> </div>
</div> </div>
</div>
<div class="table"> <div class="table">
<div class="header columns is-marginless"> <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"> <div class="column is-4 has-text-centered">
<span (click)="sortBy('name')" class="is-sortable"> {{ slug }}
<span class="column-title" >Slugs</span>
<p></p>
</span>
</div> </div>
<div class="column is-1 has-text-centered"> <div class="column is-1 has-text-centered">
<span class="column-title">Uuids</span> <!-- {{ format.mapServerType}} -->
</div> </div>
<div class="column is-2 has-text-centered"> <div class="column is-2 has-text-centered">
<span class="column-title">Completion Date</span> <span class="column-title">Completion Date</span>
</div> </div>
<div class="column is-2 has-text-centered"> <div class="column is-2 has-text-centered">
<span class="column-title">Duration</span> <span class="column-title"></span>
</div> </div>
<div class="column is-1 has-text-centered"> <div class="column is-1 has-text-centered actions">
<span class="column-title">Errors?</span>
</div> </div>
<div class="column is-offset-1 is-1 has-text-centered"> <div class="column is-1 has-text-centered actions">
<span class="column-title"></span> <a class="button button-gl is-centered" (click)="onSubmit()">
<i class="fas fa-eye"></i> Voir
</a>
</div> </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> <div class="columns is-marginless">
<div class="columns is-marginless"> <div class="column">
<div class="column"> <!-- <app-paginator *ngIf="paginator.length > 0" [length]="paginator.length" [pageSize]="paginator.limit"
<!-- <app-paginator *ngIf="paginator.length > 0" [length]="paginator.length" [pageSize]="paginator.limit"
[pageSizeOptions]="paginator.pageSizeOptions" [pageIndex]="paginator.pageIndex" [pagesToShow]="5" [pageSizeOptions]="paginator.pageSizeOptions" [pageIndex]="paginator.pageIndex" [pagesToShow]="5"
[showFirstLastButtons]="true" (page)="changePagination($event)" [showFirstLastButtons]="true" (page)="changePagination($event)"
(pageSizeChanged)="changePageSize($event)"> (pageSizeChanged)="changePageSize($event)">
</app-paginator> --> </app-paginator> -->
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</ng-container> </ng-container>
\ No newline at end of file \ No newline at end of file
...@@ -47,4 +47,5 @@ export class LogsSlugsComponent implements OnInit { ...@@ -47,4 +47,5 @@ export class LogsSlugsComponent implements OnInit {
}, },
); );
} }
seeDashboard() {}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment