1 files changed, 23 insertions, 1 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 06b4d893..eae99725 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -3,12 +3,13 @@ import Dataset from 'src/app/_data/Dataset';
 import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
 import Model from 'src/app/_data/Model';
 import { DatasetsService } from 'src/app/_services/datasets.service';
-import shared from 'src/app/Shared';
+import Shared from 'src/app/Shared';
 import { ModelsService } from 'src/app/_services/models.service';
 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',
@@ -19,6 +20,9 @@ export class FolderComponent implements OnInit {
 
   @ViewChild(FormDatasetComponent) formDataset?: FormDatasetComponent;
 
+  @ViewChild(ExperimentComponent) formExperiment?: ExperimentComponent;
+
+
   @Input() folderName: string = 'Moji podaci';
 
   @Input() files!: FolderFile[]
@@ -68,6 +72,12 @@ 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) {
@@ -80,6 +90,7 @@ export class FolderComponent implements OnInit {
       }
     }
     this.displayFile();
+    this.displayExp();
   }
 
   selectNewFile() {
@@ -92,6 +103,7 @@ export class FolderComponent implements OnInit {
     this.listView = false;
     this.selectedFileChanged.emit(this.newFile);
     this.displayFile();
+    this.displayExp();
   }
 
   selectFile(index: number) {
@@ -101,6 +113,7 @@ export class FolderComponent implements OnInit {
     this.listView = false;
     this.selectedFileChanged.emit(this.selectedFile);
     this.displayFile();
+    this.displayExp();
   }
 
   createNewFile() {
@@ -120,6 +133,10 @@ export class FolderComponent implements OnInit {
       this.folders[TabType.MyDatasets] = datasets;
     });
 
+    this.experimentsService.getMyExperiments().subscribe((experiments) => {
+      this.folders[TabType.MyExperiments] = experiments;
+    });
+
     this.datasetsService.getPublicDatasets().subscribe((datasets) => {
       this.folders[TabType.PublicDatasets] = datasets;
     });
@@ -151,6 +168,11 @@ 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)
     if (this.selectedFileIndex == i)