1 files changed, 8 insertions, 19 deletions
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index d2904c65..20a3afb0 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -75,10 +75,7 @@ export class ExperimentComponent implements AfterViewInit {
       Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže');
     } else {
       this.modelsService.trainModel(this.modelToTrain._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") });
-      this.step3 = true;
-      setTimeout(() => {
-        this.goToPage(3);
-      });
+      this.step4 = true;
     }
   }
 
@@ -87,10 +84,7 @@ export class ExperimentComponent implements AfterViewInit {
       Shared.openDialog('Greška', 'Morate odabrati konfiguraciju neuronske mreže');
     } else {
       this.modelsService.trainModel(this.modelToTrainCmp._id, this.experiment._id).subscribe(() => { console.log("pocelo treniranje") });
-      this.step3 = true;
-      setTimeout(() => {
-        this.goToPage(3);
-      });
+      this.step4 = true;
     }
   }
 
@@ -198,7 +192,6 @@ export class ExperimentComponent implements AfterViewInit {
             this.folderDataset.forExperiment = this.experiment;
             this.folderDataset.selectFile(this.dataset);
             this.goToPage(1);
-            //this.step3 = false;
           });
         });
       }
@@ -274,17 +267,13 @@ export class ExperimentComponent implements AfterViewInit {
     });
   }
 
-  setDataset(dataset: FolderFile | null | undefined) {
-    if (dataset == null || dataset == undefined) {
+  setDataset(dataset: FolderFile | null) {
+    if (dataset == null) {
       this.columnTable.loaded = false;
-      /*this.dataset = undefined;
-      this.experiment.datasetId = '';*/
-      this.step1 = false;
-      console.log("Desava se");
+      this.dataset = undefined;
+      this.experiment.datasetId = '';
       return;
     }
-    
-    this.experiment = new Experiment();
     const d = <Dataset>dataset;
     this.experiment.datasetId = d._id;
     this.dataset = d;
@@ -302,12 +291,12 @@ export class ExperimentComponent implements AfterViewInit {
   setModel(model: FolderFile) {
     const m = <Model>model;
     this.modelToTrain = m;
-    //this.step3 = true;
+    this.step3 = true;
   }
 
   setModelCmp(model: FolderFile) {
     const m = <Model>model;
     this.modelToTrainCmp = m;
-    //this.step3 = true;
+    this.step3 = true;
   }
 }