4 files changed, 43 insertions, 17 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 01e8ade9..4e315510 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -33,25 +33,36 @@ export class AddModelComponent implements OnInit {
   }
 
   addModel() {
-    this.saveModel(false); //trajno cuvanje
+    this.saveModel(false).subscribe(); //trajno cuvanje
   }
+
   trainModel() {
-    this.saveModel(true).subscribe((modelId : any) => {
+    this.saveModel(true).subscribe((modelId: any) => {
       if (modelId)
         this.models.trainModel(modelId);
     }); //privremeno cuvanje modela => vraca id sacuvanog modela koji cemo da treniramo sad
   }
-  saveModel(temporary: boolean) : any {
-    if (this.datasetLoadComponent)
-      this.models.addDataset(this.datasetLoadComponent?.dataset).subscribe((response) => {//id dataseta je response
-        this.newModel.datasetId = response;
 
-        this.getCheckedInputCols();
-        this.getCheckedOutputCol();
-        if (this.validationInputsOutput()) 
-          return this.models.addModel(this.newModel); //id modela
-        return of(null);
+  saveModel(temporary: boolean): any {
+    console.log('ADD MODEL: STEP 1 - UPLOAD FILE');
+    if (this.datasetLoadComponent) {
+      this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((fileId) => {
+        console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + fileId);
+        if (this.datasetLoadComponent) {
+          this.datasetLoadComponent.dataset.fileId = fileId;
+          this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((datasetId) => {
+            console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ' + datasetId);
+            this.newModel.datasetId = datasetId;
+            this.getCheckedInputCols();
+            this.getCheckedOutputCol();
+            if (this.validationInputsOutput())
+              this.models.addModel(this.newModel).subscribe((response) => {
+                console.log('ADD MODEL: DONE! REPLY:\n' + response);
+              });
+          });
+        }
       });
+    }
   }
 
   getCheckedInputCols() {
@@ -73,17 +84,17 @@ export class AddModelComponent implements OnInit {
       let thatRb = <HTMLInputElement>radiobuttons[i];
       if (thatRb.checked) {
         this.newModel.columnToPredict = thatRb.value;
-        break; 
+        break;
       }
     }
     //console.log(this.checkedOutputCol);
   }
-  validationInputsOutput() : boolean {
+  validationInputsOutput(): boolean {
     if (this.newModel.inputColumns.length == 0) {
       alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.")
       return false;
-    } 
-    for (let i = 0; i < this.newModel.inputColumns.length; i++) {  
+    }
+    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.");
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 7245f602..274f0fd8 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -47,7 +47,9 @@
     <h2 class="my-4">Pogledajte javne izvore podataka!</h2>
     <app-carousel [items]="publicDatasets">
     </app-carousel>
+    <h3><a routerLink="browse-datasets">Pogledaj sve javne izvore podataka...</a></h3>
     <h2 class="my-4">Iskoristite već trenirane modele!</h2>
     <app-carousel [items]="publicPredictors">
     </app-carousel>
+    <h3><a routerLink="browse-predictors">Pogledaj sve javne trenirane modele...</a></h3>
 </div>
\ 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 4b3095be..623b9ac8 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.html
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.html
@@ -1 +1,5 @@
-<p>my-datasets works!</p>
+<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
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 af5eab97..13b0c47b 100644
--- a/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
+++ b/frontend/src/app/_pages/my-datasets/my-datasets.component.ts
@@ -1,4 +1,5 @@
 import { Component, OnInit } from '@angular/core';
+import Dataset from 'src/app/_data/Dataset';
 
 @Component({
   selector: 'app-my-datasets',
@@ -7,7 +8,15 @@ import { Component, OnInit } from '@angular/core';
 })
 export class MyDatasetsComponent implements OnInit {
 
-  constructor() { }
+  myDatasets?: Dataset[];
+
+  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 {
   }