Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 10 insertions, 4 deletions

diff --git a/frontend/src/app/training/training.component.ts b/frontend/src/app/training/training.component.ts
index f60734cc..c82a6b79 100644
--- a/frontend/src/app/training/training.component.ts
+++ b/frontend/src/app/training/training.component.ts
@@ -1,8 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import Shared from '../Shared';
 import Experiment from '../_data/Experiment';
-import Model from '../_data/Model';
+import Model, { ProblemType } from '../_data/Model';
+import { ModelLoadComponent } from '../_elements/model-load/model-load.component';
 import { ExperimentsService } from '../_services/experiments.service';
 import { ModelsService } from '../_services/models.service';
 
@@ -13,6 +14,8 @@ import { ModelsService } from '../_services/models.service';
 })
 export class TrainingComponent implements OnInit{
 
+  @ViewChild(ModelLoadComponent) modelLoadComponent?: ModelLoadComponent;
+
   myExperiments?: Experiment[];
   selectedExperiment?: Experiment;
   selectedModel?: Model;
@@ -26,17 +29,20 @@ export class TrainingComponent implements OnInit{
 
   ngOnInit(): void { 
     this.route.queryParams.subscribe(params => {
-      let expId =this.route.snapshot.paramMap.get("id");
+      let experimentId =this.route.snapshot.paramMap.get("id");
 
       this.experimentsService.getMyExperiments().subscribe((experiments) => {
         this.myExperiments = experiments;
-        this.selectedExperiment = this.myExperiments.filter(x => x._id == expId)[0];
+
+        this.selectedExperiment = this.myExperiments.filter(x => x._id == experimentId)[0];
+        console.log("selektovan exp u training comp: ", this.selectedExperiment);
       });
     });
   }
 
   selectThisExperiment(experiment: Experiment) {
     this.selectedExperiment = experiment;
+    this.modelLoadComponent!.newModel.type = this.selectedExperiment.type;
   }
 
   selectModel(model: Model) {