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

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

3 files changed, 45 insertions, 4 deletions

diff --git a/frontend/src/app/_pages/my-predictors/my-predictors.component.css b/frontend/src/app/_pages/my-predictors/my-predictors.component.css
index e69de29b..ccb9fb7b 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.css
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.css
@@ -0,0 +1,13 @@
+#header {
+    background-color: #003459;
+    padding-top: 20px;
+    padding-bottom: 15px;
+    text-align: center;
+    color: white;
+    border-radius: 5px;
+}
+
+.row{
+    margin-top: 10px;
+    margin-bottom: 30px;
+}
\ No newline at end of file
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 32d085af..d739f561 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.html
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.html
@@ -1 +1,16 @@
-<p>my-predictors works!</p>
+<div id="header">
+    <h1>Trenirani modeli</h1>
+</div>
+<div id="container" style="background-color:rgba(255, 255, 255, 0.747);">
+<div class="row" *ngFor="let predictor of predictors">
+    <div class="left">
+        <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>
+    </div>
+    
+</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 b0d6e9dd..58daa44f 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import Predictor from 'src/app/_data/Predictor';
 
 @Component({
   selector: 'app-my-predictors',
@@ -6,10 +7,22 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./my-predictors.component.css']
 })
 export class MyPredictorsComponent implements OnInit {
-
-  constructor() { }
-
+  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')];
+  }
   ngOnInit(): void {
   }
 
+  delete(){
+    confirm("IZABRANI MODEL ĆE BITI IZBRISAN")
+    
+  }
+  
+
+
 }