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

4 files changed, 37 insertions, 13 deletions

diff --git a/frontend/src/app/_elements/item-predictor/item-predictor.component.ts b/frontend/src/app/_elements/item-predictor/item-predictor.component.ts
index 41d2ab9c..246032e0 100644
--- a/frontend/src/app/_elements/item-predictor/item-predictor.component.ts
+++ b/frontend/src/app/_elements/item-predictor/item-predictor.component.ts
@@ -17,8 +17,7 @@ export class ItemPredictorComponent implements OnInit {
   }
 
   openPredictor() {
-    this.router.navigate(['predict/'+ '6245a5958a9c76c1bf7ff9b6']);
-    //this.router.navigate(['predict'+this.predictor._id]);
+    this.router.navigate(['predict/'+ this.predictor._id]);
     }
 
 }
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.html b/frontend/src/app/_pages/my-predictors/my-predictors.component.html
index d739f561..3746d35e 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.html
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.html
@@ -7,7 +7,7 @@
         <app-item-predictor [predictor]="predictor"></app-item-predictor>
     </div>
     <div>
-        <button (click)="delete()" mat-raised-button color="warn" style="min-width: 15rem;float: right" ><mat-icon>delete</mat-icon></button>
+        <button (click)="delete(predictor)" mat-raised-button color="warn" style="min-width: 15rem;float: right" ><mat-icon>delete</mat-icon></button>
     </div>
     
 </div>
diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
index 58daa44f..13cfdab2 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
@@ -1,5 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import Predictor from 'src/app/_data/Predictor';
+import { PredictorsService } from 'src/app/_services/predictors.service';
 
 @Component({
   selector: 'app-my-predictors',
@@ -7,22 +8,38 @@ import Predictor from 'src/app/_data/Predictor';
   styleUrls: ['./my-predictors.component.css']
 })
 export class MyPredictorsComponent implements OnInit {
-  predictors: Predictor[];
-  constructor() { 
-  this.predictors = [
-    new Predictor('Titanik', 'Opis titanik', ['K1', 'K2', 'K3', 'Ime', 'Preziveli'],'Preziveli'),
-    new Predictor('Neki drugi set', 'opis', ['a', 'b', 'c'],'c'),
-    new Predictor('Preživeli', 'Za uneto ime osobe, predvidja da li je ta osoba preživela ili ne.', ['Ime'], 'OsobaJePreživela'),
-    new Predictor('Drugi model', 'Lorem ipsum dolor sir amet', ['kruska'], 'jagoda')];
+  predictors: Predictor[] = [];
+  constructor(private predictorsS : PredictorsService) {
   }
   ngOnInit(): void {
+    this.getAllMyPredictors();
+
   }
 
-  delete(){
-    confirm("IZABRANI MODEL ĆE BITI IZBRISAN")
+  delete(predictor: Predictor){
+    if(window.confirm("IZABRANI MODEL ĆE BITI IZBRISAN"))
+      {
+      this.predictorsS.deletePredictor(predictor).subscribe((response) => {
+        console.log("OBRISANOOO JEE", response);
+        //na kraju uspesnog
+        this.getAllMyPredictors();
+      }, (error) =>{
+          if (error.error == "Predictor with name = {name} deleted") {
+            alert("Greška pri brisanju modela!");
+          }
+        });
+    }
+    
     
   }
-  
+
+  getAllMyPredictors(): void{
+    this.predictorsS.getMyPredictors().subscribe(m => {
+      
+      this.predictors = m;
+      console.log(this.predictors);
+    });
+  }
 
 
 }
diff --git a/frontend/src/app/_services/predictors.service.ts b/frontend/src/app/_services/predictors.service.ts
index 54ae5694..f2751d8f 100644
--- a/frontend/src/app/_services/predictors.service.ts
+++ b/frontend/src/app/_services/predictors.service.ts
@@ -24,4 +24,12 @@ export class PredictorsService {
   usePredictor(predictor: Predictor, inputs : String[]) {
     return this.http.post(`${API_SETTINGS.apiURL}/predictor/usepredictor/` + predictor._id, inputs, { headers: this.authService.authHeader() });
   }
+
+  deletePredictor(predictor: Predictor) {
+    return this.http.delete(`${API_SETTINGS.apiURL}/predictor/` + predictor.name, { headers: this.authService.authHeader(), responseType: "text" });
+  }
+
+  getMyPredictors(): Observable<Predictor[]> {
+    return this.http.get<Predictor[]>(`${API_SETTINGS.apiURL}/predictor/mypredictors`, { headers: this.authService.authHeader() });
+  }
 }