Funkcionalnost experiment - doradjeno.

2 files changed, 14 insertions, 11 deletions

diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 86faeb2a..ee14c782 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -27,17 +27,17 @@
     <div #stepsContainer class="steps-container">
         <div #steps id="step_1" class="step-content">
             <div class="step-content-inside">
-                <app-folder [type]="FolderType.Dataset" [tabsToShow]="[TabType.MyDatasets, TabType.PublicDatasets, TabType.File]" (okPressed)="goToPage(1)"></app-folder>
+                <app-folder #folderDataset [type]="FolderType.Dataset" [forExperiment]="experiment" [tabsToShow]="[TabType.MyDatasets, TabType.PublicDatasets, TabType.File]" (okPressed)="goToPage(1)"></app-folder>
             </div>
         </div>
         <div #steps id="step_2" class="step-content">
             <div class="step-content-inside">
-                <app-column-table (okPressed)="goToPage(2)"></app-column-table>
+                <app-column-table (okPressed)="goToPage(2)" [forExperiment]="experiment"></app-column-table>
             </div>
         </div>
         <div #steps id="step_3" class="step-content">
             <div class="step-content-inside">
-                <app-folder [type]="FolderType.Model" (okPressed)="goToPage(3)"></app-folder>
+                <app-folder #folderModel [type]="FolderType.Model" [forExperiment]="experiment" (okPressed)="goToPage(3)"></app-folder>
             </div>
         </div>
         <div #steps id="step_4" class="step-content">
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 2f1b4fd8..8485ded6 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -3,8 +3,10 @@ import { StepperSelectionEvent } from '@angular/cdk/stepper';
 import { MatStepper } from '@angular/material/stepper';
 import Shared from 'src/app/Shared';
 import { FolderType } from 'src/app/_data/FolderFile';
-import { TabType } from 'src/app/_elements/folder/folder.component';
+import { FolderComponent, TabType } from 'src/app/_elements/folder/folder.component';
 import Experiment from 'src/app/_data/Experiment';
+import { ExperimentsService } from 'src/app/_services/experiments.service';
+import { ModelsService } from 'src/app/_services/models.service';
 
 @Component({
   selector: 'app-experiment',
@@ -19,22 +21,23 @@ export class ExperimentComponent implements AfterViewInit {
 
   event: number = 0;
   @Input() experiment: Experiment; 
+  @ViewChild("folderDataset") folderDataset?: FolderComponent;
+  @ViewChild("folderModel") folderModel?: FolderComponent;
 
-
-  constructor() {
-    this.experiment = new Experiment();
+  constructor(private experimentsService: ExperimentsService, private modelsService: ModelsService) {
+    this.experiment = new Experiment("exp1");
   }
 
-  updateExperiment(){
+  /*updateExperiment(){
 
-  }
+  }*/
 
   addNewExperiment(){
-
+    this.experimentsService.addExperiment(this.experiment).subscribe(()=>{console.log("new Experiment")});
   }
 
   trainModel(){
-
+    this.modelsService.trainModel((<Model>this.folderModel.selectedFile)._id, this.experiment._id).subscribe(()=>{console.log("pocelo treniranje")})
   }
 
   stepHeight = this.calcStepHeight();