Menjanje izbora dataseta fix

2 files changed, 21 insertions, 11 deletions

diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 6bd921fd..4c882f42 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -67,9 +67,8 @@
                     <button mat-raised-button *ngIf="comparing" (click)="toggleCompare()"><mat-icon>not_interested</mat-icon> Prekini upoređivanje</button>
                 </div>
                 <div class="side-by-side">
-                    <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModel();" (selectedFileChanged)="setModel($event);"></app-folder>
-                    <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)="goToPage(3); trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;"
-                        *ngIf="comparing"></app-folder>
+                    <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.NewFile" [tabsToShow]="[TabType.MyModels]" (okPressed)="trainModel();" (selectedFileChanged)="setModel($event);"></app-folder>
+                    <app-folder #folderModelCompare [type]="FolderType.Model" [forExperiment]="experiment" [startingTab]="TabType.MyModels" [tabsToShow]="[TabType.MyModels]" (okPressed)="trainModelCmp();" (selectedFileChanged)="setModelCmp($event);" style="width: 50%;" *ngIf="comparing"></app-folder>
                 </div>
             </div>
         </div>
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 20a3afb0..d2904c65 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -75,7 +75,10 @@ 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.step4 = true;
+      this.step3 = true;
+      setTimeout(() => {
+        this.goToPage(3);
+      });
     }
   }
 
@@ -84,7 +87,10 @@ 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.step4 = true;
+      this.step3 = true;
+      setTimeout(() => {
+        this.goToPage(3);
+      });
     }
   }
 
@@ -192,6 +198,7 @@ export class ExperimentComponent implements AfterViewInit {
             this.folderDataset.forExperiment = this.experiment;
             this.folderDataset.selectFile(this.dataset);
             this.goToPage(1);
+            //this.step3 = false;
           });
         });
       }
@@ -267,13 +274,17 @@ export class ExperimentComponent implements AfterViewInit {
     });
   }
 
-  setDataset(dataset: FolderFile | null) {
-    if (dataset == null) {
+  setDataset(dataset: FolderFile | null | undefined) {
+    if (dataset == null || dataset == undefined) {
       this.columnTable.loaded = false;
-      this.dataset = undefined;
-      this.experiment.datasetId = '';
+      /*this.dataset = undefined;
+      this.experiment.datasetId = '';*/
+      this.step1 = false;
+      console.log("Desava se");
       return;
     }
+    
+    this.experiment = new Experiment();
     const d = <Dataset>dataset;
     this.experiment.datasetId = d._id;
     this.dataset = d;
@@ -291,12 +302,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;
   }
 }