1 files changed, 55 insertions, 55 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 192fc6ff..ba8f7d01 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -108,55 +108,55 @@ export class AddModelComponent implements OnInit {
   }
 
   saveModelWithNewDataset(callback: ((arg0: any) => void)) {
-
-    this.getCheckedInputCols();
-    this.getCheckedOutputCol();
-    this.getMetrics();
-
-    if (this.validationInputsOutput()) {
-      console.log('ADD MODEL: STEP 1 - UPLOAD FILE');
-      if (this.selectedDataset) {
-        //console.log("this.datasetLoadComponent.files:", this.datasetLoadComponent.files);
-        /*this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((file) => {   ZAKOMENTARISANO ZBOG KOMPAJLERSKE GRESKE TOKOM REORGANIZACIJE
-          console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id);
-          if (this.selectedDataset) {
-            this.selectedDataset!.fileId = file._id;
-            this.selectedDataset!.username = shared.username;
-
-            this.datasets.addDataset(this.selectedDataset!).subscribe((dataset) => {
-              console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id);
-              this.newModel.datasetId = dataset._id;
-
-              //da se doda taj dataset u listu postojecih, da bude izabran 
-              this.refreshMyDatasetList();  MORA OVO
-              this.showMyDatasets = true;
-              this.selectThisDataset(dataset);
-
-              this.newModel.randomTestSetDistribution = 1 - Math.round(this.tempTestSetDistribution / 100 * 10) / 10;
-              this.tempTestSetDistribution = 90;
-              this.newModel.username = shared.username;
-
-              this.newModel.nullValuesReplacers = this.getNullValuesReplacersArray();
-
-              this.models.addModel(this.newModel).subscribe((response) => {
-                callback(response);
-              }, (error) => {
-                shared.openDialog("Neuspeo pokušaj!", "Model sa unetim nazivom već postoji u Vašoj kolekciji. Promenite naziv modela i nastavite sa kreiranim datasetom.");
-              }); //kraj addModel subscribe
+    /*
+        this.getCheckedInputCols();
+        this.getCheckedOutputCol();
+        this.getMetrics();
+    
+        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.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;
+    
+                  //da se doda taj dataset u listu postojecih, da bude izabran 
+                  this.refreshMyDatasetList();
+                  this.showMyDatasets = true;
+                  this.selectThisDataset(dataset);
+    
+                  this.newModel.randomTestSetDistribution = 1 - Math.round(this.tempTestSetDistribution / 100 * 10) / 10;
+                  this.tempTestSetDistribution = 90;
+                  this.newModel.username = shared.username;
+    
+                  this.newModel.nullValuesReplacers = this.getNullValuesReplacersArray();
+    
+                  this.models.addModel(this.newModel).subscribe((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
+                }, (error) => {
+                  alert("Dataset sa unetim nazivom već postoji u Vašoj kolekciji.\nIzmenite naziv ili iskoristite postojeći dataset.");
+                }); //kraj addDataset subscribe
+              } //kraj treceg ifa
             }, (error) => {
-              shared.openDialog("Neuspeo pokušaj!", "Dataset sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
-            }); //kraj addDataset subscribe
-          } //kraj treceg ifa
-        }, (error) => {
-          
-        }); //kraj uploadData subscribe*/
-
-      } //kraj drugog ifa
-    } //kraj prvog ifa
+              //alert("greska uploadData");
+            }); //kraj uploadData subscribe
+    
+          } //kraj drugog ifa
+        } //kraj prvog ifa*/
   }
 
   saveModelWithExistingDataset(callback: ((arg0: any) => void)): any {
-    if (this.selectedDataset) { //dataset je izabran
+    /*if (this.selectedDataset) { //dataset je izabran
       this.getCheckedInputCols();
       this.getCheckedOutputCol();
       this.getMetrics();
@@ -177,12 +177,12 @@ export class AddModelComponent implements OnInit {
       }
     }
     else {
-      shared.openDialog("Obaveštenje", "Molimo Vas da izaberete neki dataset iz kolekcije.");
-    }
+      alert("Molimo Vas da izaberete neki dataset iz kolekcije.");
+    }*/
   }
 
   getCheckedInputCols() {
-    this.newModel.inputColumns = [];
+    /*this.newModel.inputColumns = [];
     let checkboxes: any;
 
     checkboxes = document.getElementsByName("cbsNew");
@@ -191,11 +191,11 @@ export class AddModelComponent implements OnInit {
       let thatCb = <HTMLInputElement>checkboxes[i];
       if (thatCb.checked == true) // && thatCb.disabled == false ne treba nam ovo vise
         this.newModel.inputColumns.push(thatCb.value);
-    }
+    }*/
     //console.log(this.checkedInputCols);
   }
   getCheckedOutputCol() {
-    this.newModel.columnToPredict = '';
+    /*this.newModel.columnToPredict = '';
     let radiobuttons: any;
 
     radiobuttons = document.getElementsByName("rbsNew");
@@ -206,12 +206,12 @@ export class AddModelComponent implements OnInit {
         this.newModel.columnToPredict = thatRb.value;
         break;
       }
-    }
+    }*/
     //console.log(this.checkedOutputCol);
   }
-  validationInputsOutput(): boolean {
-    if (this.newModel.inputColumns.length == 0 && this.newModel.columnToPredict == '') {
-      shared.openDialog("Neuspeo pokušaj!", "Molimo Vas da izaberete ulazne i izlazne kolone za mrežu.");
+  validationInputsOutput() {
+    /*if (this.newModel.inputColumns.length == 0 && this.newModel.columnToPredict == '') {
+      alert("Molimo Vas da izaberete ulazne i izlazne kolone za mrežu.");
       return false;
     }
     else if (this.newModel.inputColumns.length == 0) {
@@ -229,7 +229,7 @@ export class AddModelComponent implements OnInit {
         return false;
       }
     }
-    return true;
+    return true;*/
   }
 
   /*selectThisDataset(dataset: Dataset) {