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

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

8 files changed, 127 insertions, 13 deletions

diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index 7e944a19..09a11e37 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -54,9 +54,11 @@
             </div>
 
             <app-dataset-load *ngIf="!showMyDatasets" id="dataset"
-                (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.hasHeader">
+                (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader">
             </app-dataset-load>
-            <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
+            <div class="px-5 mt-5">
+                <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
+            </div>
         </div>
 
         <!-- ULAZNE/IZLAZNE KOLONE -->
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 fcc8ea70..995aaa87 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -209,6 +209,7 @@ export class AddModelComponent implements OnInit {
   selectThisDataset(dataset: Dataset) {
     this.selectedDataset = dataset;
     this.existingDatasetSelected = true;
+    this.datasetHasHeader = this.selectedDataset.hasHeader;
 
     /*let datasets = document.getElementsByClassName("usersDataset") as HTMLCollection;
     for (let i = 0; i < datasets.length; i++) {
@@ -220,9 +221,11 @@ export class AddModelComponent implements OnInit {
     this.datasets.getDatasetFile(dataset.fileId).subscribe((file: string | undefined) => {
       if (file) {
         this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter);
+        this.datasetFile.length = this.datasetFile.length - 1;
+        console.log(this.datasetFile);
       }
     });
-    this.datasetHasHeader = false;
+    //this.datasetHasHeader = false;
 
     this.resetCbsAndRbs();
   }
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 bc13a51c..f6b78ded 100644
--- a/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
+++ b/frontend/src/app/_pages/filter-datasets/filter-datasets.component.ts
@@ -27,11 +27,12 @@ export class FilterDatasetsComponent implements OnInit {
     //this.router.navigateByUrl('/predict?id='+id);
     const helper = new JwtHelperService();
     const decodedToken = helper.decodeToken(this.cookie.get("token"));
-    dataset._id = "";
-    dataset.isPublic = false;
-    dataset.lastUpdated = new Date();
-    dataset.username = decodedToken.name;
-    this.datasets.addDataset(dataset).subscribe((response:string)=>{
+    const newDataset={...dataset};
+    newDataset._id = "";
+    newDataset.isPublic = false;
+    newDataset.lastUpdated = new Date();
+    newDataset.username = decodedToken.name;
+    this.datasets.addDataset(newDataset).subscribe((response:string)=>{
       console.log(response);
     });
   };
diff --git a/frontend/src/app/_pages/my-models/my-models.component.html b/frontend/src/app/_pages/my-models/my-models.component.html
index e69de29b..870e0ddb 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -0,0 +1,27 @@
+<div id="wrapper">
+    <div id="container" class="container p-5" style="background-color: white; 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 style="width: 25%; margin: auto;">
+                    <button (click)="deleteThisModel(model)" style="margin-top: 3px; width: 100%;">Obriši</button>
+                </div>
+                </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
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);
+    });
   }
 
 }
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")
+    
+  }
+  
+
+
 }