1 files changed, 43 insertions, 19 deletions

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..77a506d5 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -1,6 +1,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import Model, { ReplaceWith } from 'src/app/_data/Model';
-import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer, NullValueOptions } from 'src/app/_data/Model';
+import { ProblemType, Encoding, ActivationFunction, LossFunction, Optimizer, NullValueOptions } from 'src/app/_data/Model';
 import { DatasetLoadComponent } from 'src/app/_elements/dataset-load/dataset-load.component';
 import { ModelsService } from 'src/app/_services/models.service';
 import shared from 'src/app/Shared';
@@ -23,7 +23,7 @@ export class AddModelComponent implements OnInit {
 
   newModel: Model;
 
-  ANNType = ANNType;
+  ProblemType = ProblemType;
   Encoding = Encoding;
   ActivationFunction = ActivationFunction;
   LossFunction = LossFunction;
@@ -47,10 +47,13 @@ export class AddModelComponent implements OnInit {
 
   tempTestSetDistribution: number = 90;
 
+  //accepted: Boolean;
+  term: string = "";
+
   constructor(private models: ModelsService, private datasets: DatasetsService, private csv: CsvParseService) {
     this.newModel = new Model();
 
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }
@@ -73,19 +76,28 @@ export class AddModelComponent implements OnInit {
 
   addModel() {
     if (!this.showMyDatasets)
-      this.saveModelWithNewDataset();
+      this.saveModelWithNewDataset(_ => { console.log('MODEL ADDED (with new dataset).') });
     else
-      this.saveModelWithExistingDataset();
+      this.saveModelWithExistingDataset(_ => { console.log('MODEL ADDED (with existing dataset).') });
   }
 
   trainModel() {
-    this.saveModelWithNewDataset().subscribe((modelId: any) => {
-      if (modelId)
-        this.models.trainModel(modelId);
-    }); //privremeno cuvanje modela => vraca id sacuvanog modela koji cemo da treniramo sad
+    let saveFunc;
+
+    if (!this.showMyDatasets)
+      saveFunc = (x: (arg0: any) => void) => { this.saveModelWithNewDataset(x) };
+    else
+      saveFunc = (x: (arg0: any) => void) => { this.saveModelWithExistingDataset(x) };
+
+    saveFunc(((model: any) => {
+      console.log('Saved, training model...', model);
+      this.models.trainModel(model).subscribe(response => {
+        console.log('Train model complete!', response);
+      });
+    })); //privremeno cuvanje modela => vraca id sacuvanog modela koji cemo da treniramo sad
   }
 
-  saveModelWithNewDataset(): any {
+  saveModelWithNewDataset(callback: ((arg0: any) => void)) {
 
     this.getCheckedInputCols();
     this.getCheckedOutputCol();
@@ -93,14 +105,14 @@ 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) {
             this.datasetLoadComponent.dataset.fileId = file._id;
             this.datasetLoadComponent.dataset.username = shared.username;
 
-            this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
+            this.datasets.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
               console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id);
               this.newModel.datasetId = dataset._id;
 
@@ -114,7 +126,7 @@ export class AddModelComponent implements OnInit {
               this.newModel.username = shared.username;
 
               this.models.addModel(this.newModel).subscribe((response) => {
-                console.log('ADD MODEL: DONE! REPLY:\n', response);
+                callback(response);
               }, (error) => {
                 alert("Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.");
               }); //kraj addModel subscribe
@@ -130,8 +142,7 @@ export class AddModelComponent implements OnInit {
     } //kraj prvog ifa
   }
 
-  saveModelWithExistingDataset(): any {
-
+  saveModelWithExistingDataset(callback: ((arg0: any) => void)): any {
     if (this.selectedDataset) { //dataset je izabran
       this.getCheckedInputCols();
       this.getCheckedOutputCol();
@@ -144,7 +155,7 @@ export class AddModelComponent implements OnInit {
         this.newModel.username = shared.username;
 
         this.models.addModel(this.newModel).subscribe((response) => {
-          console.log('ADD MODEL: DONE! REPLY:\n', response);
+          callback(response);
         }, (error) => {
           alert("Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.");
         });
@@ -216,12 +227,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 +245,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;
@@ -263,7 +287,7 @@ export class AddModelComponent implements OnInit {
   }
 
   refreshMyDatasetList() {
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }