3 files changed, 18 insertions, 13 deletions
diff --git a/frontend/src/app/_elements/model-load/model-load.component.ts b/frontend/src/app/_elements/model-load/model-load.component.ts
index dbca3d17..4541c114 100644
--- a/frontend/src/app/_elements/model-load/model-load.component.ts
+++ b/frontend/src/app/_elements/model-load/model-load.component.ts
@@ -38,9 +38,16 @@ export class ModelLoadComponent implements OnInit {
   showMyModels: boolean = true;
 
   constructor(private modelsService: ModelsService) {
-    this.modelsService.getMyModels().subscribe((models) => {
-      this.myModels = models;
-    });
+    if (this.forExperiment == undefined) {
+      this.modelsService.getMyModels().subscribe((models) => {
+        this.myModels = models;
+      });
+    }
+    else {
+      this.modelsService.getMyModelsByType(this.forExperiment.type).subscribe((models) => {
+        this.myModels = models;
+      });
+    }
   }
 
   ngOnInit(): void {
diff --git a/frontend/src/app/_services/models.service.ts b/frontend/src/app/_services/models.service.ts
index 44383828..1130b12c 100644
--- a/frontend/src/app/_services/models.service.ts
+++ b/frontend/src/app/_services/models.service.ts
@@ -1,6 +1,6 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import Model from '../_data/Model';
+import Model, { ProblemType } from '../_data/Model';
 import { AuthService } from './auth.service';
 import { Observable } from 'rxjs';
 import Dataset from '../_data/Dataset';
@@ -31,20 +31,16 @@ export class ModelsService {
   addModel(model: Model): Observable<any> {
     return this.http.post(`${Configuration.settings.apiURL}/model/add`, model, { headers: this.authService.authHeader() });
   }
-  addDataset(dataset: Dataset): Observable<any> {
-    return this.http.post(`${Configuration.settings.apiURL}/dataset/add`, dataset, { headers: this.authService.authHeader() });
-  }
   trainModel(modelId: string, experimentId: string): Observable<any> {
     return this.http.post(`${Configuration.settings.apiURL}/model/trainmodel`, { ModelId: modelId, ExperimentId: experimentId }, { headers: this.authService.authHeader(), responseType: 'text' });
   }
 
-  getMyDatasets(): Observable<Dataset[]> {
-    return this.http.get<Dataset[]>(`${Configuration.settings.apiURL}/dataset/mydatasets`, { headers: this.authService.authHeader() });
-  }
-
   getMyModels(): Observable<Model[]> {
     return this.http.get<Model[]>(`${Configuration.settings.apiURL}/model/mymodels`, { headers: this.authService.authHeader() });
   }
+  getMyModelsByType(problemType: ProblemType): Observable<Model[]> {
+    return this.http.get<Model[]>(`${Configuration.settings.apiURL}/model/mymodelsbytype/` + problemType, { headers: this.authService.authHeader() });
+  }
 
   editModel(model: Model): Observable<Model> {
     return this.http.put<Model>(`${Configuration.settings.apiURL}/model/`, model, { headers: this.authService.authHeader() });
@@ -53,4 +49,5 @@ export class ModelsService {
   deleteModel(model: Model) {
     return this.http.delete(`${Configuration.settings.apiURL}/model/` + model.name, { headers: this.authService.authHeader(), responseType: "text" });
   }
+  
 }
diff --git a/frontend/src/app/training/training.component.ts b/frontend/src/app/training/training.component.ts
index f60734cc..2640b513 100644
--- a/frontend/src/app/training/training.component.ts
+++ b/frontend/src/app/training/training.component.ts
@@ -26,11 +26,12 @@ 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];
+        if (experimentId != undefined) 
+          this.selectedExperiment = this.myExperiments.filter(x => x._id == experimentId)[0];
       });
     });
   }