Funkcionalnost experiment - doradjeno.

6 files changed, 21 insertions, 26 deletions

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 42c43138..050f9644 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -1,3 +1,4 @@
+{{forExperiment.name}}
 <div id="tabs">
     <div class="folder-tab p-1 rounded-top" *ngFor="let tab of tabs; let i = index" [style]="'z-index:' + calcZIndex(i) + ' ;'" [ngClass]="{'selected-tab' : selectedTab.index == i, 'hover-tab' : hoveringOverTab?.index == i}">
         <a class="m-1 stretched-link tab-link" (click)="selectTab(i)" (mouseenter)="hoverOverTab(i)" (mouseleave)="hoverOverTab(-1)">
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 36f70c97..404ba302 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -1,3 +1,4 @@
+{{forExperiment.name}}
 <div id="folder">
     <div id="tabs">
         <div id="new-file-tab" class="folder-tab p-1 rounded-top" [style]="'z-index:' + (selectedTab == TabType.NewFile ? 11 : 10) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.NewFile, 'hover-tab' : hoverTab == TabType.NewFile}">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index eae99725..a1cd6075 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -9,7 +9,6 @@ import { FormDatasetComponent } from '../form-dataset/form-dataset.component';
 import Experiment from 'src/app/_data/Experiment';
 import { ExperimentsService } from 'src/app/_services/experiments.service';
 import { PredictorsService } from 'src/app/_services/predictors.service';
-import { ExperimentComponent } from 'src/app/_pages/experiment/experiment.component';
 
 @Component({
   selector: 'app-folder',
@@ -20,7 +19,7 @@ export class FolderComponent implements OnInit {
 
   @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent;
 
-  @ViewChild(ExperimentComponent) formExperiment?: ExperimentComponent;
+ 
 
 
   @Input() folderName: string = 'Moji podaci';
@@ -72,12 +71,6 @@ export class FolderComponent implements OnInit {
       this.formDataset!.dataset = <Dataset>this.fileToDisplay;
   }
 
-  displayExp(){
-    if(this.type == FolderType.Dataset)
-      this.formExperiment!.experiment = <Experiment>this.fileToDisplay;
-  }
-
-
   hoverOverFile(i: number) {
     this.hoveringOverFileIndex = i;
     if (i != -1) {
@@ -90,7 +83,6 @@ export class FolderComponent implements OnInit {
       }
     }
     this.displayFile();
-    this.displayExp();
   }
 
   selectNewFile() {
@@ -103,7 +95,6 @@ export class FolderComponent implements OnInit {
     this.listView = false;
     this.selectedFileChanged.emit(this.newFile);
     this.displayFile();
-    this.displayExp();
   }
 
   selectFile(index: number) {
@@ -113,7 +104,6 @@ export class FolderComponent implements OnInit {
     this.listView = false;
     this.selectedFileChanged.emit(this.selectedFile);
     this.displayFile();
-    this.displayExp();
   }
 
   createNewFile() {
@@ -168,10 +158,6 @@ export class FolderComponent implements OnInit {
       this.formDataset!.uploadDataset();
   }
 
-  saveNewExperiment() {
-    if(this.forExperiment == this.forExperiment)
-      this.formExperiment!.addNewExperiment();
-  }
 
   /*calcZIndex(i: number) {
     let zIndex = (this.files.length - i - 1)
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();
diff --git a/frontend/src/app/_services/experiments.service.ts b/frontend/src/app/_services/experiments.service.ts
index bdaf62a7..ce112498 100644
--- a/frontend/src/app/_services/experiments.service.ts
+++ b/frontend/src/app/_services/experiments.service.ts
@@ -19,4 +19,8 @@ export class ExperimentsService {
   getMyExperiments(): Observable<Experiment[]> {
     return this.http.get<Experiment[]>(`${Configuration.settings.apiURL}/experiment/getmyexperiments`, { headers: this.authService.authHeader() });
   }
+
+  /*updateExperiment(){
+
+  }*/
 }