From 39f9fcb303924c3f9dd8fce3f332d4bc4aa14a9d Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Tue, 12 Apr 2022 19:01:22 +0200
Subject: Reorganizovani su item-dataset, item-model, my-datasets, my-models.
 Dodat je yes-no-dialog.

123
---
 .../app/_pages/my-datasets/my-datasets.component.css    |  8 ++++++++
 .../app/_pages/my-datasets/my-datasets.component.html   | 13 +++++++++----
 .../src/app/_pages/my-datasets/my-datasets.component.ts |  8 +++++---
 .../src/app/_pages/my-models/my-models.component.css    | 12 ++++++++++++
 .../src/app/_pages/my-models/my-models.component.html   | 17 ++++++++++-------
 .../src/app/_pages/my-models/my-models.component.ts     |  5 +++--
 .../_pages/my-predictors/my-predictors.component.html   |  2 +-
 7 files changed, 48 insertions(+), 17 deletions(-)

(limited to 'frontend/src/app/_pages')

diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.css b/frontend/src/app/_pages/my-datasets/my-datasets.component.css
index e69de29b..57889937 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.css
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.css
@@ -0,0 +1,8 @@
+#header {
+    background-color: #003459;
+    padding-top: 20px;
+    padding-bottom: 15px;
+    text-align: center;
+    color: white;
+    border-radius: 5px;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.html b/frontend/src/app/_pages/my-datasets/my-datasets.component.html
index d996bf31..0c83dc85 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.html
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.html
@@ -1,5 +1,8 @@
+<div id="header">
+    <h1>Moji setovi podataka</h1>
+</div>
 <div id="wrapper">
-    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
+    <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;">
@@ -12,9 +15,10 @@
                     <div class="panel-footer row"><!-- panel-footer -->
                         <div class="col-xs-6 text-center">
                             <div>
-                            <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisDataset(dataset)">Obriši
-                                <span class="glyphicon glyphicon-chevron-right"></span>
-                            </button>
+                                <div>
+                                    <button (click)="deleteThisDataset(dataset)" mat-raised-button color="warn" style="min-width: 10rem;float: right" ><mat-icon>delete</mat-icon></button>
+                                </div>
+                            
                             </div>
                         </div>
                     </div><!-- end panel-footer -->
@@ -24,6 +28,7 @@
         <h2>Nema rezultata</h2>
         </div>
         </div>
+        
     
     </div>
     
diff --git a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
index 1551a3c8..19a6832b 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
@@ -5,6 +5,7 @@ import Dataset from 'src/app/_data/Dataset';
 import { JwtHelperService } from '@auth0/angular-jwt';
 import { CookieService } from 'ngx-cookie-service';
 import shared from 'src/app/Shared';
+import { share } from 'rxjs';
 
 @Component({
   selector: 'app-my-datasets',
@@ -41,17 +42,17 @@ export class MyDatasetsComponent implements OnInit {
 */
 
 deleteThisDataset(dataset: Dataset): void{
-  console.log("OK");
+  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete ovaj set podataka?',() => {  
   this.datasetsS.deleteDataset(dataset).subscribe((response) => {
     console.log("OBRISANO JE", response);
     //na kraju uspesnog
     this.getAllMyDatasets();
   }, (error) =>{
       if (error.error == "Dataset with name = {name} deleted") {
-        alert("Greška pri brisanju dataseta!");
+        shared.openDialog("Greška","Greška pri brisanju dataseta!");
       }
     });
-
+  });
 }
 
   getAllMyDatasets(): void{
@@ -61,5 +62,6 @@ deleteThisDataset(dataset: Dataset): void{
       console.log(this.myDatasets);
     });
   }
+  
 
 }
diff --git a/frontend/src/app/_pages/my-models/my-models.component.css b/frontend/src/app/_pages/my-models/my-models.component.css
index e69de29b..19d29595 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.css
+++ b/frontend/src/app/_pages/my-models/my-models.component.css
@@ -0,0 +1,12 @@
+button{
+    margin-left: 5%;
+    margin-right: 5%;
+}
+#header {
+    background-color: #003459;
+    padding-top: 20px;
+    padding-bottom: 15px;
+    text-align: center;
+    color: white;
+    border-radius: 5px;
+}
\ No newline at end of file
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 4aebc1f2..b0e9c4ef 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.html
+++ b/frontend/src/app/_pages/my-models/my-models.component.html
@@ -1,5 +1,8 @@
+<div id="header">
+    <h1>Moji modeli</h1>
+</div>
 <div id="wrapper">
-    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
+    <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;">
@@ -12,12 +15,12 @@
                 <div class="panel-footer row"><!-- panel-footer -->
                     <div class="col-xs-6 text-center">
                         <div>
-                          <button type="button" class="btn btn-default btn-lg" (click)="deleteThisModel(model)" mat-raised-button color="primary">Koristi
-                              <span class="glyphicon glyphicon-search"></span>
-                          </button>
-                          <button type="button" class="btn btn-default btn-lg" mat-raised-button color="primary" (click)="deleteThisModel(model)">Obriši
-                            <span class="glyphicon glyphicon-chevron-right"></span>
-                        </button>
+                            <button type="button" class="btn btn-default btn-lg"style="min-width: 7rem;float: left;" (click)="deleteThisModel(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 -->
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 6086b1b1..f3877e2d 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -32,7 +32,7 @@ export class MyModelsComponent implements OnInit {
 */
 
 deleteThisModel(model: Model): void{
-  console.log("OK");
+  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete model?',() => {
   this.modelsS.deleteModel(model).subscribe((response) => {
     console.log("OBRISANOOO JEE", response);
     //na kraju uspesnog
@@ -42,9 +42,10 @@ deleteThisModel(model: Model): void{
         shared.openDialog("Obaveštenje", "Greška prilikom brisanja modela.");
       }
     });
-
+  });
 }
 
+
   getAllMyModels(): void{
     this.modelsS.getMyModels().subscribe(m => {
       
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 3746d35e..d38f93e4 100644
--- a/frontend/src/app/_pages/my-predictors/my-predictors.component.html
+++ b/frontend/src/app/_pages/my-predictors/my-predictors.component.html
@@ -1,7 +1,7 @@
 <div id="header">
     <h1>Trenirani modeli</h1>
 </div>
-<div id="container" style="background-color:rgba(255, 255, 255, 0.747);">
+<div id="container" style="background-color:rgba(255, 255, 255, 0.8);">
 <div class="row" *ngFor="let predictor of predictors">
     <div class="left">
         <app-item-predictor [predictor]="predictor"></app-item-predictor>
-- 
cgit v1.2.3