From ef1e5b2a2cdd5680be8d9d1cea92c97c05da826d Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 18 May 2022 23:42:15 +0200
Subject: Pristup eksperiment strani izabranim prediktorom. Preostalo testirati
 sa back-om.

---
 frontend/src/app/_elements/folder/folder.component.html    |  2 +-
 frontend/src/app/_elements/folder/folder.component.ts      | 10 ++++------
 frontend/src/app/_pages/experiment/experiment.component.ts |  8 +++++---
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index da04b219..f7320264 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -87,7 +87,7 @@
                         </div>
                     </div>
                     <div *ngIf="type == FolderType.Experiment" class="list-view">
-                        <div *ngFor="let predictor of predictorsForExp[file._id];" class="list-item">
+                        <div *ngFor="let predictor of predictorsForExp[file._id];" class="list-item" (click)="goToExperimentPageWithPredictor(file, predictor)">
 
                             <div class="mx-3">
                                 <div class="f-row">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 262b3b7d..159bf959 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -106,7 +106,7 @@ export class FolderComponent implements AfterViewInit {
     this.selectedFile = file;
     this.fileToDisplay = file;
     if (this.type == FolderType.Experiment && file) {
-      this.router.navigate(['/experiment/', file._id]);
+      this.router.navigate(['/experiment/' + file._id]);
     }
     this.newFileSelected = false;
     this.listView = false;
@@ -117,12 +117,10 @@ export class FolderComponent implements AfterViewInit {
     if (this.type == FolderType.Dataset)
       this.formDataset.loadExisting();
   }
-  /*
-  goToExperimentPage(file: FolderFile) {
-    console.log(<Experiment>file);
-    //this.router.navigate(['/experiment/', this.experiment._id]);
+  
+  goToExperimentPageWithPredictor(file: FolderFile, predictor: Predictor) {
+    this.router.navigate(['/experiment/' + file._id + "/" + predictor._id]);
   }
-  */
 
   createNewFile() {
     if (this.type == FolderType.Dataset) {
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 2d4c138d..22894131 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -58,13 +58,15 @@ export class ExperimentComponent implements AfterViewInit, OnInit {
             this.folderDataset.forExperiment = this.experiment;
             this.folderDataset.selectFile(this.dataset); //sad 3. i 4. korak da se ucitaju
 
-            this.predictorsService.getPredictor(predictorId!).subscribe((response) => {
+            //this.predictorsService.getPredictor(predictorId!).subscribe((response) => {
               let predictor = response;
-              this.modelsService.getModelById(predictor.modelId).subscribe((response) => {
+              //this.modelsService.getModelById(predictor.modelId).subscribe((response) => {
+                this.modelsService.getModelById("62853d70696d62ceeb8db7cd").subscribe((response) => {
                 //imamo model
                 this.folderModel.formModel.newModel = response;
+                //this.metricView.update(predictor.metrics);
               });
-            });
+            //});
           });
         });
       }
-- 
cgit v1.2.3