2 files changed, 19 insertions, 6 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 1c9198a3..156e51bc 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -6,7 +6,9 @@ import { ModelsService } from 'src/app/_services/models.service';
 import shared from 'src/app/Shared';
 import Dataset from 'src/app/_data/Dataset';
 import { DatatableComponent } from 'src/app/_elements/datatable/datatable.component';
-
+import { DatasetsService } from 'src/app/_services/datasets.service';
+import { NgxCsvParser } from 'ngx-csv-parser';
+import { CsvParseService } from 'src/app/_services/csv-parse.service';
 
 @Component({
   selector: 'app-add-model',
@@ -38,12 +40,14 @@ export class AddModelComponent implements OnInit {
   myDatasets?: Dataset[];
   existingDatasetSelected: boolean = false;
   selectedDataset?: Dataset;
+  otherDataset?: Dataset;
+  otherDatasetFile?: any[];
   datasetFile?: any[];
   datasetHasHeader?: boolean = true;
 
   tempTestSetDistribution: number = 90;
 
-  constructor(private models: ModelsService) {
+  constructor(private models: ModelsService, private datasets: DatasetsService, private csv: CsvParseService) {
     this.newModel = new Model();
 
     this.models.getMyDatasets().subscribe((datasets) => {
@@ -213,14 +217,23 @@ export class AddModelComponent implements OnInit {
 
 
     //this.datasetFile = csvRecords;
+    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.datasetHasHeader = false;
 
     this.resetCbsAndRbs();
   }
 
   resetSelectedDataset(): boolean {
-    this.existingDatasetSelected = false;
-    this.selectedDataset = undefined;
+    const temp = this.selectedDataset;
+    this.selectedDataset = this.otherDataset;
+    this.otherDataset = temp;
+    const tempFile = this.datasetFile;
+    this.datasetFile = this.otherDatasetFile;
+    this.otherDatasetFile = tempFile;
     return true;
   }
   resetCbsAndRbs(): boolean {
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index 689a302b..7e895a2d 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -2,7 +2,7 @@
     <img src="../../../assets/svg/logo.svg" class="bi me-2" width="256" height="256" role="img">
     <div *ngIf="shared.loggedIn" class="d-flex flex-column align-items-center">
         <h2 class="my-4">Započnite sa treniranjem!</h2>
-        <div id="cards" class="row align-items-center justify-content-center">
+        <div id="cards" class="row align-items-stretch justify-content-center">
             <div class="card shadow col-3 m-1" style="width: 18rem;">
                 <div class="card-body">
                     <mat-icon width="48px" height="48px"
@@ -46,7 +46,7 @@
     </div>
     <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>