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

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

1 files changed, 41 insertions, 1 deletions

diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
index e9bc52de..bd6b0a2b 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import Model from 'src/app/_data/Model';
+import { ModelsService } from 'src/app/_services/models.service';
 
 @Component({
   selector: 'app-my-models',
@@ -6,10 +8,48 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./my-models.component.css']
 })
 export class MyModelsComponent implements OnInit {
+  myModels: Model[] = [];
+  //myModel: Model;
 
-  constructor() { }
+  constructor(private modelsS : ModelsService) {
+
+    
+
+     }
 
   ngOnInit(): void {
+    this.getAllMyModels();
+
+  }
+/*
+  editModel(): void{
+    this.modelsS.editModel().subscribe(m => {
+      this.myModel = m;
+
+    })
+  }
+*/
+
+deleteThisModel(model: Model): void{
+  console.log("OK");
+  this.modelsS.deleteModel(model).subscribe((response) => {
+    console.log("OBRISANOOO JEE", response);
+    //na kraju uspesnog
+    this.getAllMyModels();
+  }, (error) =>{
+      if (error.error == "Model with name = {name} deleted") {
+        alert("Greška pri brisanju modela!");
+      }
+    });
+
+}
+
+  getAllMyModels(): void{
+    this.modelsS.getMyModels().subscribe(m => {
+      
+      this.myModels = m;
+      console.log(this.myModels);
+    });
   }
 
 }