aboutsummaryrefslogtreecommitdiff
path: root/frontend/src/app/_elements/datatable
diff options
context:
space:
mode:
authorDanijel Andjelkovic <adanijel99@gmail.com>2022-03-27 05:13:29 +0200
committerDanijel Andjelkovic <adanijel99@gmail.com>2022-03-27 05:13:29 +0200
commitcab50e2c5272c1599e3b3e30522985b912a19ab7 (patch)
treed28ffc8f1e385a1427f004691b74960c6444ecf1 /frontend/src/app/_elements/datatable
parent982a04c28dcb401fa722cb48976379a1cf6298d8 (diff)
parenta315d3c0bc44c091d7c85697c9c8135b314ebc06 (diff)
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts: # frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/src/app/_elements/datatable')
-rw-r--r--frontend/src/app/_elements/datatable/datatable.component.html15
1 files changed, 8 insertions, 7 deletions
diff --git a/frontend/src/app/_elements/datatable/datatable.component.html b/frontend/src/app/_elements/datatable/datatable.component.html
index 2c469ecc..bd9e7a13 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.html
+++ b/frontend/src/app/_elements/datatable/datatable.component.html
@@ -1,21 +1,21 @@
<div *ngIf="data">
- <div class="table-responsive">
- <table *ngIf="hasHeader" class="table table-bordered table-light mt-4">
+ <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:11">
+ <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 mt-4">
+ <table *ngIf="data.length > 0 && !hasHeader" class="table table-bordered table-light">
<tbody>
- <tr *ngFor="let row of data | slice:0:10">
+ <tr *ngFor="let row of data">
<td *ngFor="let col of row">{{col}}</td>
</tr>
</tbody>
@@ -23,7 +23,8 @@
</div>
<div id="info">
- . . . <br>
- {{data.length}} x {{data[0].length}}
+ <br>
+ <span *ngIf="hasHeader">{{data.length - 1}} x {{data[0].length}}</span>
+ <span *ngIf="!hasHeader">{{data.length}} x {{data[0].length}}</span>
</div>
</div> \ No newline at end of file