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

# Conflicts:
#	frontend/src/app/_pages/add-model/add-model.component.html
#	frontend/src/app/_pages/add-model/add-model.component.ts
#	frontend/src/app/app.module.ts

3 files changed, 35 insertions, 29 deletions

diff --git a/frontend/src/app/_pages/predict/predict.component.css b/frontend/src/app/_pages/predict/predict.component.css
index e69de29b..dab059a5 100644
--- a/frontend/src/app/_pages/predict/predict.component.css
+++ b/frontend/src/app/_pages/predict/predict.component.css
@@ -0,0 +1,3 @@
+#wrapper {
+    color: #003459;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/predict/predict.component.html b/frontend/src/app/_pages/predict/predict.component.html
index fe17c96d..13afa8e4 100644
--- a/frontend/src/app/_pages/predict/predict.component.html
+++ b/frontend/src/app/_pages/predict/predict.component.html
@@ -18,8 +18,25 @@
             <div>
                 <label for="output" class="col-sm-5 col-form-label">Opis prediktora: <b>{{predictor.description}}</b></label>
             </div>
+
+            
+        </div>
+    <br>
+        <label for="type" class="form-check-label" ><b>Informacije o prediktoru</b></label>
+        <div class="col-5 mt-2">
+            <label for="type" class="form-check-label"  >Prediktor {{predictor.isPublic?"je":"nije"}} javni.</label>
+        </div>
+        <div class="col-5 mt-2">
+            <label for="type" class="form-check-label" >Prediktor {{predictor.accessibleByLink?"je":"nije"}} dostupan za deljenje.</label>
+        </div>
+        <br>
+        <div class="col-2">
+            <label for="dateCreated" class="col-form-label">Datum:</label> 
+            <input type="text" class="form-control-plaintext" id="dateCreated" placeholder="--/--/--"
+                value="{{predictor.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
         </div>
 
+
         <br>
         <div >
             <!--input -->
@@ -28,44 +45,20 @@
                 <div *ngIf="predictor" class="form-group row mt-3 mb-2 d-flex justify-content-left">
                     <div *ngFor="let input of predictor.inputs; let i = index">
                         <label for="{{input}}" class="col-sm-2 col-form-label"><b>{{input}}</b></label>
-                        <input name="{{input}}"  type="text"  [(ngModel)]="inputs[i]" >
+                        <input name="{{input}}"  type="text"  [(ngModel)]="inputs[i].value" >
 
                     </div>
                     
                 </div>
             </div>
            
-            
+            <br>    
 
         </div>
         <div>
             <label for="output" class="col-sm-2 col-form-label">Izlaz: <b>{{predictor.output}}</b></label>
         </div>
-        <br>
-        <br>
-        <br>
-        <br>
-        <br>
-
-        <div class="col-5 mt-2">
-            <label for="type" class="form-check-label">Da li je prediktor javan?</label>
-            <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="predictor.isPublic"
-                type="checkbox" value="" >
-        </div>
-        <div class="col-5 mt-2">
-            <label for="type" class="form-check-label">Da li je dostupan za deljenje?</label>
-            <input class="mx-3 form-check-input" type="checkbox" [(ngModel)]="predictor.accessibleByLink"
-                type="checkbox" value="" >
-        </div>
-        <br>
-        <div class="col-2">
-            <label for="dateCreated" class="col-form-label">Datum:</label> 
-            <input type="text" class="form-control-plaintext" id="dateCreated" placeholder="--/--/--"
-                value="{{predictor.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
-        </div>
-
         
-        <br><br>
         <div class="form-group row mt-5 mb-3">
             <div class="col"></div>
             <button class="btn btn-lg col-4" style="background-color:#003459; color:white;"
diff --git a/frontend/src/app/_pages/predict/predict.component.ts b/frontend/src/app/_pages/predict/predict.component.ts
index 3f431fff..1c1c7425 100644
--- a/frontend/src/app/_pages/predict/predict.component.ts
+++ b/frontend/src/app/_pages/predict/predict.component.ts
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import Predictor from 'src/app/_data/Predictor';
 import { PredictorsService } from 'src/app/_services/predictors.service';
+import shared from 'src/app/Shared';
 
 @Component({
   selector: 'app-predict',
@@ -10,7 +11,8 @@ import { PredictorsService } from 'src/app/_services/predictors.service';
 })
 export class PredictComponent implements OnInit {
 
-  inputs : String[] = [];
+  inputs : Column[] = [];
+
 
   predictor:Predictor;
   constructor(private predictS : PredictorsService, private route: ActivatedRoute) {
@@ -22,6 +24,7 @@ export class PredictComponent implements OnInit {
       this.predictS.getPredictor(url["id"]).subscribe(p => {
       
         this.predictor = p;
+        this.predictor.inputs.forEach((p,index)=> this.inputs[index] = new Column(p, ""));
         console.log(this.predictor);
       })
     });
@@ -29,9 +32,16 @@ export class PredictComponent implements OnInit {
 
   usePredictor(): void{ 
     this.predictS.usePredictor(this.predictor, this.inputs).subscribe(p => {
-      
-      alert("Uspesno ste poslali preditor!");
+      shared.openDialog("Obaveštenje", "Prediktor je uspešno poslat na probu."); //pisalo je "na treniranje" ??
     })
     console.log(this.inputs);
   }
 }
+
+
+export class Column {
+  constructor(
+    public name : string, 
+    public value : (number | string)){
+  }
+}
\ No newline at end of file