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

10 files changed, 82 insertions, 59 deletions

diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts
index 2121dc3b..945a58b5 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -143,14 +143,14 @@ export class AddModelComponent implements OnInit {
               this.models.addModel(this.newModel).subscribe((response) => {
                 callback(response);
               }, (error) => {
-                alert("Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.");
+                shared.openDialog("Neuspeo pokušaj!", "Model sa unetim nazivom već postoji u Vašoj kolekciji. Promenite naziv modela i nastavite sa kreiranim datasetom.");
               }); //kraj addModel subscribe
             }, (error) => {
-              alert("Dataset sa unetim nazivom već postoji u Vašoj kolekciji.\nIzmenite naziv ili iskoristite postojeći dataset.");
+              shared.openDialog("Neuspeo pokušaj!", "Dataset sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
             }); //kraj addDataset subscribe
           } //kraj treceg ifa
         }, (error) => {
-          //alert("greska uploadData");
+          
         }); //kraj uploadData subscribe
 
       } //kraj drugog ifa
@@ -174,12 +174,12 @@ export class AddModelComponent implements OnInit {
         this.models.addModel(this.newModel).subscribe((response) => {
           callback(response);
         }, (error) => {
-          alert("Model sa unetim nazivom već postoji u Vašoj kolekciji.\nPromenite naziv modela i nastavite sa kreiranim datasetom.");
+          shared.openDialog("Neuspeo pokušaj!", "Model sa unetim nazivom već postoji u Vašoj kolekciji. Promenite naziv modela i nastavite sa kreiranim datasetom.");
         });
       }
     }
     else {
-      alert("Molimo Vas da izaberete neki dataset iz kolekcije.");
+      shared.openDialog("Obaveštenje", "Molimo Vas da izaberete neki dataset iz kolekcije.");
     }
   }
 
@@ -213,21 +213,21 @@ export class AddModelComponent implements OnInit {
   }
   validationInputsOutput(): boolean {
     if (this.newModel.inputColumns.length == 0 && this.newModel.columnToPredict == '') {
-      alert("Molimo Vas da izaberete ulazne i izlazne kolone za mrežu.");
+      shared.openDialog("Neuspeo pokušaj!", "Molimo Vas da izaberete ulazne i izlazne kolone za mrežu.");
       return false;
     }
     else if (this.newModel.inputColumns.length == 0) {
-      alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.");
+      shared.openDialog("Neuspeo pokušaj!", "Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.");
       return false;
     }
     else if (this.newModel.columnToPredict == '') {
-      alert("Molimo Vas da izaberete izlaznu kolonu za mrežu.");
+      shared.openDialog("Neuspeo pokušaj!", "Molimo Vas da izaberete izlaznu kolonu za mrežu.");
       return false;
     }
     for (let i = 0; i < this.newModel.inputColumns.length; i++) {
       if (this.newModel.inputColumns[i] == this.newModel.columnToPredict) {
         let colName = this.newModel.columnToPredict;
-        alert("Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor.");
+        shared.openDialog("Neuspeo pokušaj!", "Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor.");
         return false;
       }
     }
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
index a4ab6e2c..7b3e1bdb 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.html
@@ -14,7 +14,7 @@
                     <div class="card-body">
                       <h3 class="card-title"><b>{{predictor.name}}</b></h3>
                       <p class="card-text">{{predictor.description}}</p>
-                      <a  class="btn btn-primary" (click)="openPredictor(predictor._id)">Otvori</a>
+                      <a  class="btn btn-primary" (click)="openPredictor(predictor._id)">Iskoristi</a>
                     </div>
                     <div class="card-footer text-muted">
                         Kreirao: {{predictor.username}} <br>
diff --git a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
index 4f96fc36..891b3cab 100644
--- a/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
+++ b/frontend/src/app/_pages/browse-predictors/browse-predictors.component.ts
@@ -20,7 +20,7 @@ export class BrowsePredictorsComponent implements OnInit {
   ngOnInit(): void {
   }
   openPredictor(id:string):void{
-    this.router.navigateByUrl('/predict?id='+id);
+    this.router.navigate(['predict/'+id]);
   };
 
 }
diff --git a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
index b75decf2..fc146046 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
@@ -4,6 +4,7 @@ import Dataset from 'src/app/_data/Dataset';
 import {Router} from '@angular/router'
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
+import shared from 'src/app/Shared';
 
 @Component({
   selector: 'app-filter-datasets',
@@ -12,6 +13,7 @@ import { CookieService } from 'ngx-cookie-service';
 })
 export class FilterDatasetsComponent implements OnInit {
 
+  shared = shared;
   publicDatasets?: Dataset[];
   term: string = "";
   constructor(private datasets: DatasetsService,private router:Router, private cookie: CookieService) {
@@ -37,11 +39,9 @@ export class FilterDatasetsComponent implements OnInit {
     if(name!=null && name!="")
     this.datasets.addDataset(newDataset).subscribe((response:string)=>{
       console.log(response);
-      alert("Uspenso ste dodali dataset sa imenom "+newDataset.name);
+      shared.openDialog("Obaveštenje", "Uspešno ste dodali dataset sa nazivom " + newDataset.name);
     },(error)=>{
-      alert("Vec imate dataset sa istim imenom molim vas unesite drugo ime");
-      
-
+      shared.openDialog("Obaveštenje", "U svojoj kolekciji već imate dataset sa ovim imenom. Molimo Vas da unesete drugo ime.");
     });
   
   };
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 bd6b0a2b..6086b1b1 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,5 @@
 import { Component, OnInit } from '@angular/core';
+import shared from 'src/app/Shared';
 import Model from 'src/app/_data/Model';
 import { ModelsService } from 'src/app/_services/models.service';
 
@@ -38,7 +39,7 @@ deleteThisModel(model: Model): void{
     this.getAllMyModels();
   }, (error) =>{
       if (error.error == "Model with name = {name} deleted") {
-        alert("Greška pri brisanju modela!");
+        shared.openDialog("Obaveštenje", "Greška prilikom brisanja modela.");
       }
     });
 
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/_pages/predict/predict.component.html b/frontend/src/app/_pages/predict/predict.component.html
index bf4d9a1e..13afa8e4 100644
--- a/frontend/src/app/_pages/predict/predict.component.html
+++ b/frontend/src/app/_pages/predict/predict.component.html
@@ -18,7 +18,24 @@
             <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 >
@@ -28,7 +45,7 @@
                 <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>
                     
@@ -41,28 +58,7 @@
         <div>
             <label for="output" class="col-sm-2 col-form-label">Izlaz: <b>{{predictor.output}}</b></label>
         </div>
-        <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 71cf93ce..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("Prediktor je uspesno poslat na treniranje!");
+      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
diff --git a/frontend/src/app/_pages/profile/profile.component.ts b/frontend/src/app/_pages/profile/profile.component.ts
index 7a7796da..d055fad3 100644
--- a/frontend/src/app/_pages/profile/profile.component.ts
+++ b/frontend/src/app/_pages/profile/profile.component.ts
@@ -6,6 +6,7 @@ import { Router } from '@angular/router';
 import { PICTURES } from 'src/app/_data/ProfilePictures';
 import { Picture } from 'src/app/_data/ProfilePictures';
 import shared from '../../Shared';
+import { share } from 'rxjs';
 
 
 @Component({
@@ -15,8 +16,6 @@ import shared from '../../Shared';
 })
 export class ProfileComponent implements OnInit {
 
-
-
   user: User = new User();
   pictures: Picture[] = PICTURES;
 
@@ -90,18 +89,18 @@ export class ProfileComponent implements OnInit {
       if (this.user.username != editedUser.username) { //promenio username, ide logout
         this.user = editedUser;
         this.resetInfo();
-        alert("Nakon promene korisničkog imena, moraćete ponovo da se ulogujete.");
+        shared.openDialog("Obaveštenje", "Nakon promene korisničkog imena, moraćete ponovo da se ulogujete.");
         this.authService.logOut();
         this.router.navigate(['']);
         return;
       }
-      alert("Podaci su uspešno promenjeni.");
+      shared.openDialog("Obaveštenje", "Podaci su uspešno promenjeni.");
       this.user = editedUser;
       console.log(this.user);
       this.resetInfo();
     }, (error: any) =>{
       if (error.error == "Username already exists!") {
-        alert("Ukucano korisničko ime je već zauzeto!\nIzaberite neko drugo.");
+        shared.openDialog("Obaveštenje", "Ukucano korisničko ime je već zauzeto! Izaberite neko drugo.");
         //(<HTMLSelectElement>document.getElementById("inputUsername")).focus();
         //poruka obavestenja ispod inputa
         this.resetInfo();
@@ -131,7 +130,7 @@ export class ProfileComponent implements OnInit {
     this.userInfoService.changeUserPassword(passwordArray).subscribe((response: any) => {
       //console.log("PROMENIO LOZINKU");
       this.resetNewPassInputs();
-      alert("Nakon promene lozinke, moraćete ponovo da se ulogujete.");
+      shared.openDialog("Obaveštenje", "Nakon promene lozinke, moraćete ponovo da se ulogujete.");
       this.authService.logOut();
       this.router.navigate(['']);
     }, (error: any) => {
@@ -142,7 +141,7 @@ export class ProfileComponent implements OnInit {
         return;
       }
       else if (error.error == 'Identical password!') {
-        alert("Stara i nova lozinka su identične.");
+        shared.openDialog("Obaveštenje", "Stara i nova lozinka su identične."); 
         this.resetNewPassInputs();
         //(<HTMLSelectElement>document.getElementById("inputNewPassword")).focus();
         return;