diff options
| author | DESKTOP-S0O2C44\ROG <ivan996sk@gmail.com> | 2022-04-06 23:26:45 +0200 |
|---|---|---|
| committer | DESKTOP-S0O2C44\ROG <ivan996sk@gmail.com> | 2022-04-06 23:26:45 +0200 |
| commit | 07eb321090326a13d997b0c6380d5cb02463f5a2 (patch) | |
| tree | de0cabcf71cc3bb6c37a9b5285f200ef825a7054 /frontend/src/app/_elements/datatable | |
| parent | 50ded629f0d85b8e998780aef8adf09f09d6d232 (diff) | |
| parent | 82f95737f31134ca9e2a811f428d19bc7fdd5b43 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
Diffstat (limited to 'frontend/src/app/_elements/datatable')
| -rw-r--r-- | frontend/src/app/_elements/datatable/datatable.component.html | 50 | ||||
| -rw-r--r-- | frontend/src/app/_elements/datatable/datatable.component.ts | 3 |
2 files changed, 31 insertions, 22 deletions
diff --git a/frontend/src/app/_elements/datatable/datatable.component.html b/frontend/src/app/_elements/datatable/datatable.component.html index bd9e7a13..52d50443 100644 --- a/frontend/src/app/_elements/datatable/datatable.component.html +++ b/frontend/src/app/_elements/datatable/datatable.component.html @@ -1,28 +1,34 @@ -<div *ngIf="data"> - <div class="table-responsive" style="max-height: 50vh; max-width: 100%; overflow: scroll;"> - <table *ngIf="hasHeader" class="table table-bordered table-light"> - <thead> - <tr> - <th *ngFor="let item of data[0]; let i = index">{{item}}</th> - </tr> - </thead> - <tbody> - <tr *ngFor="let row of data | slice:1"> - <td *ngFor="let col of row">{{col}}</td> - </tr> - </tbody> - </table> +<div *ngIf="data && hasInput"> + <div class="table-responsive" style="height: 34rem; overflow: auto; border-radius: 5px;" class="mh-5"> + <div *ngIf="!loaded" style="background-color: #003459; width: 100%; height: 100%;" + class="d-flex justify-content-center align-items-center"> + <app-loading></app-loading> + </div> + <div *ngIf="loaded"> + <table *ngIf="data.length > 0 && hasHeader && data[0].length > 0" class="table table-bordered table-light"> + <thead> + <tr> + <th *ngFor="let item of data[0]; let i = index">{{item}}</th> + </tr> + </thead> + <tbody> + <tr *ngFor="let row of data | slice:1"> + <td *ngFor="let col of row">{{col}}</td> + </tr> + </tbody> + </table> - <table *ngIf="data.length > 0 && !hasHeader" class="table table-bordered table-light"> - <tbody> - <tr *ngFor="let row of data"> - <td *ngFor="let col of row">{{col}}</td> - </tr> - </tbody> - </table> + <table *ngIf="data.length > 0 && !hasHeader && data[0].length > 0" class="table table-bordered table-light"> + <tbody> + <tr *ngFor="let row of data"> + <td *ngFor="let col of row">{{col}}</td> + </tr> + </tbody> + </table> + </div> </div> - <div id="info"> + <div id="info" *ngIf="data.length > 0 && data[0].length > 0"> <br> <span *ngIf="hasHeader">{{data.length - 1}} x {{data[0].length}}</span> <span *ngIf="!hasHeader">{{data.length}} x {{data[0].length}}</span> diff --git a/frontend/src/app/_elements/datatable/datatable.component.ts b/frontend/src/app/_elements/datatable/datatable.component.ts index d3740d83..19fb204e 100644 --- a/frontend/src/app/_elements/datatable/datatable.component.ts +++ b/frontend/src/app/_elements/datatable/datatable.component.ts @@ -11,6 +11,9 @@ export class DatatableComponent implements OnInit { @Input() data?: any[] = []; + hasInput = false; + loaded = false; + constructor() { } ngOnInit(): void { |