2 files changed, 83 insertions, 13 deletions

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 623b9ac8..d996bf31 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,34 @@
-<ul class="list-group my-2">
-    <li class="list-group-item" *ngFor="let dataset of myDatasets">
-        <app-item-dataset [dataset]="dataset"></app-item-dataset>
-    </li>
-</ul>
\ No newline at end of file
+<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 dataset of myDatasets">
+                    <app-item-dataset [dataset]="dataset"></app-item-dataset>
+                    
+                    <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>
+                        </div>
+                    </div><!-- end panel-footer -->
+                </div>
+            </div>
+        <div class="text-center" *ngIf="this.myDatasets.length == 0" >
+        <h2>Nema rezultata</h2>
+        </div>
+        </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 13b0c47b..1551a3c8 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
@@ -1,5 +1,10 @@
 import { Component, OnInit } from '@angular/core';
+import {Router} from '@angular/router';
+import { DatasetsService } from 'src/app/_services/datasets.service';
 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';
 
 @Component({
   selector: 'app-my-datasets',
@@ -7,18 +12,54 @@ import Dataset from 'src/app/_data/Dataset';
   styleUrls: ['./my-datasets.component.css']
 })
 export class MyDatasetsComponent implements OnInit {
+  myDatasets: Dataset[] = [];
 
-  myDatasets?: Dataset[];
+  constructor(private datasetsS : DatasetsService) {
 
-  constructor() {
-    this.myDatasets = [
-      new Dataset('Titanik', 'Opis titanik', ['K1', 'K2', 'K3', 'Ime', 'Preziveli']),
-      new Dataset('Neki drugi set', 'opis', ['a', 'b', 'c']),
-      new Dataset('Treci set', 'opis', ['a', 'b', 'c'])
-    ];
+    
+
+     }
+
+     ngOnInit(): void {
+
+      this.datasetsS.getMyDatasets().subscribe((response) => {
+        this.myDatasets = response;
+      }, (error) => {
+        if (error.error == "Dataset with...") {
+          shared.openDialog("Greska", "Niste dobro uneli nesto");
+        }
+      });
+    }  
+    
+/*
+  editModel(): void{
+    this.modelsS.editModel().subscribe(m => {
+      this.myModel = m;
+
+    })
   }
+*/
+
+deleteThisDataset(dataset: Dataset): void{
+  console.log("OK");
+  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!");
+      }
+    });
+
+}
 
-  ngOnInit(): void {
+  getAllMyDatasets(): void{
+    this.datasetsS.getMyDatasets().subscribe(m => {
+      
+      this.myDatasets = m;
+      console.log(this.myDatasets);
+    });
   }
 
 }