diff options
Diffstat (limited to 'frontend/src')
3 files changed, 13 insertions, 8 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 diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html index f4574eab..09a11e37 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -56,7 +56,9 @@ <app-dataset-load *ngIf="!showMyDatasets" id="dataset" (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader"> </app-dataset-load> - <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable> + <div class="px-5 mt-5"> + <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable> + </div> </div> <!-- ULAZNE/IZLAZNE KOLONE --> diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts index 2552f612..995aaa87 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.ts +++ b/frontend/src/app/_pages/add-model/add-model.component.ts @@ -221,6 +221,8 @@ export class AddModelComponent implements OnInit { this.datasets.getDatasetFile(dataset.fileId).subscribe((file: string | undefined) => { if (file) { this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter); + this.datasetFile.length = this.datasetFile.length - 1; + console.log(this.datasetFile); } }); //this.datasetHasHeader = false; |