Merge branch 'Guest-Koristik-Ispravka-FrontEnd' into 'redesign'

Merge

See merge request igrannonica/neuronstellar!28

2 files changed, 102 insertions, 0 deletions

diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html
new file mode 100644
index 00000000..9b281239
--- /dev/null
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -0,0 +1,43 @@
+<div id="header">
+    <h1>Moji modeli</h1>
+</div>
+<div id="wrapper">
+    <div id="container" class="container p-5" style="background-color: rgba(255, 255, 255, 0.8); min-height: 100%;">
+        <div class="row mt-3 mb-2 d-flex justify-content-center">
+        
+        <div class="col-sm-6" style="margin-bottom: 10px;">
+        </div>
+        
+            <div class="row">
+                <div class="col-sm-4" style="margin-bottom: 10px;" *ngFor="let model of myModels">
+                <app-item-model [model]="model"></app-item-model>
+                
+                <div class="panel-footer row"><!-- panel-footer -->
+                    <div class="col-xs-6 text-center">
+                        <div>
+                            <button type="button" class="btn btn-default btn-lg"style="min-width: 7rem;float: left;" (click)="useThisModel(model)" mat-raised-button color="primary">Koristi
+                                <span class="glyphicon glyphicon-search"></span>
+                            </button>
+                            <button (click)="deleteThisModel(model)" mat-raised-button color="warn" style="min-width: 7rem;float: right" ><mat-icon>delete</mat-icon></button>
+                            
+                        
+                        </div>
+                    </div>
+                </div><!-- end panel-footer -->
+
+                
+                
+                </div>
+            </div>
+        <div class="text-center" *ngIf="this.myModels.length == 0" >
+        <h2>Nema rezultata</h2>
+        </div>
+        </div>
+    
+    </div>
+    
+    
+    
+    
+    
+    </div>
diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
new file mode 100644
index 00000000..d379fa69
--- /dev/null
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -0,0 +1,59 @@
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
+import shared from 'src/app/Shared';
+import Model from 'src/app/_data/Model';
+import { ModelsService } from 'src/app/_services/models.service';
+
+@Component({
+  selector: 'app-my-models',
+  templateUrl: './my-models.component.html',
+  styleUrls: ['./my-models.component.css']
+})
+export class MyModelsComponent implements OnInit {
+  myModels: Model[] = [];
+  //myModel: Model;
+
+  constructor(private modelsS : ModelsService, private router : Router) {
+
+    
+
+     }
+
+  ngOnInit(): void {
+    this.getAllMyModels();
+
+  }
+/*
+  editModel(): void{
+    this.modelsS.editModel().subscribe(m => {
+      this.myModel = m;
+
+    })
+  }
+*/
+
+deleteThisModel(model: Model): void{
+  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete model?',() => {
+  this.modelsS.deleteModel(model).subscribe((response) => {
+    this.getAllMyModels();
+  }, (error) =>{
+      if (error.error == "Model with name = {name} deleted") {
+        shared.openDialog("Obaveštenje", "Greška prilikom brisanja modela.");
+      }
+    });
+  });
+}
+
+
+useThisModel(model: Model): void{
+
+  this.router.navigate(['/training'])
+  
+}
+  getAllMyModels(): void{
+    this.modelsS.getMyModels().subscribe(m => {
+      this.myModels = m;
+    });
+  }
+
+}