From e9112baa067850cbbd460060347cb1987e389902 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Sat, 26 Mar 2022 14:43:04 +0100
Subject: Dodat atribut hasHeader u klasi Dataset (front i back) i iskoriscen u
 tabelarnom prikazu (datatable component).

---
 frontend/src/app/_pages/add-model/add-model.component.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'frontend/src/app/_pages/add-model/add-model.component.ts')

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 fcc8ea70..2552f612 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -209,6 +209,7 @@ export class AddModelComponent implements OnInit {
   selectThisDataset(dataset: Dataset) {
     this.selectedDataset = dataset;
     this.existingDatasetSelected = true;
+    this.datasetHasHeader = this.selectedDataset.hasHeader;
 
     /*let datasets = document.getElementsByClassName("usersDataset") as HTMLCollection;
     for (let i = 0; i < datasets.length; i++) {
@@ -222,7 +223,7 @@ export class AddModelComponent implements OnInit {
         this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter);
       }
     });
-    this.datasetHasHeader = false;
+    //this.datasetHasHeader = false;
 
     this.resetCbsAndRbs();
   }
-- 
cgit v1.2.3


From f22b01150a7ffc9c7d246e5c555b36511d80b492 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Sat, 26 Mar 2022 19:37:27 +0100
Subject: Datatable.component: promenjen prikaz csv fajla (scrollbar table)

---
 .../src/app/_elements/datatable/datatable.component.html  | 15 ++++++++-------
 .../src/app/_pages/add-model/add-model.component.html     |  4 +++-
 frontend/src/app/_pages/add-model/add-model.component.ts  |  2 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'frontend/src/app/_pages/add-model/add-model.component.ts')

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;
-- 
cgit v1.2.3