From 869a4d17dd6bb312c661636f69efba89e45579ba Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Sun, 27 Mar 2022 16:24:46 +0200
Subject: Add-model - resen problem praznih redova na kraju csv fajla. Prilikom
 izbora dataseta, skroluje se do sledece forme.

---
 .../src/app/_pages/add-model/add-model.component.html |  7 +++----
 .../src/app/_pages/add-model/add-model.component.ts   | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 7 deletions(-)

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

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 09a11e37..b17093c3 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -47,14 +47,14 @@
                         <li class="list-group-item p-3" *ngFor="let dataset of myDatasets"
                             [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
                             <app-item-dataset name="usersDataset" [dataset]="dataset"
-                                (click)="selectThisDataset(dataset)"></app-item-dataset>
+                                (click)="scrollToNextForm(); selectThisDataset(dataset);"></app-item-dataset>
                         </li>
                     </ul>
                 </div>
             </div>
 
             <app-dataset-load *ngIf="!showMyDatasets" id="dataset"
-                (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader">
+                (loaded)="scrollToNextForm(); datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader">
             </app-dataset-load>
             <div class="px-5 mt-5">
                 <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
@@ -62,6 +62,7 @@
         </div>
 
         <!-- ULAZNE/IZLAZNE KOLONE -->
+        <span id="selectInAndOuts"></span>
         <div *ngIf="selectedDataset">
             <div class="row">
                 <div class="col d-flex justify-content-center">
@@ -151,8 +152,6 @@
             </div>
         </div>
 
-
-
         <h2 class="mt-5 mb-4">Parametri treniranja:</h2>
 
         <div>
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 995aaa87..d6e9dbc5 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -93,7 +93,7 @@ export class AddModelComponent implements OnInit {
     if (this.validationInputsOutput()) {
       console.log('ADD MODEL: STEP 1 - UPLOAD FILE');
       if (this.datasetLoadComponent) {
-
+        console.log("this.datasetLoadComponent.files:", this.datasetLoadComponent.files);
         this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((file) => {
           console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id);
           if (this.datasetLoadComponent) {
@@ -216,12 +216,16 @@ export class AddModelComponent implements OnInit {
       if (datasets[i]._id == dataset._id)
     }*/
 
-
     //this.datasetFile = csvRecords;
     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;
+        for (let i = this.datasetFile.length - 1; i >= 0; i--) {  //moguce da je vise redova na kraju fajla prazno i sl.
+          if (this.datasetFile[i].length != this.datasetFile[0].length)
+            this.datasetFile[i].pop();
+          else 
+            break; //nema potrebe dalje
+        }
         console.log(this.datasetFile);
       }
     });
@@ -230,6 +234,15 @@ export class AddModelComponent implements OnInit {
     this.resetCbsAndRbs();
   }
 
+  scrollToNextForm() {
+    console.log("USAO U SCROLL");
+    (<HTMLSelectElement>document.getElementById("selectInAndOuts")).scrollIntoView({
+      behavior: "smooth",
+      block: "start",
+      inline: "nearest"
+    });
+  }
+
   resetSelectedDataset(): boolean {
     const temp = this.selectedDataset;
     this.selectedDataset = this.otherDataset;
-- 
cgit v1.2.3