From 588b9528bc39acc04a94ad8d996333bb4e4764e7 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 6 Apr 2022 23:15:10 +0200
Subject: Dodata funkcionalnost cuvanja dataseta (prvo se cuva pa se bira).
 Izmenjeni datatable, dataset-load i add-new-dataset-component

---
 .../dataset-load/dataset-load.component.html       | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'frontend/src/app/_elements/dataset-load')

diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
index 674e5990..2052c9b5 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -3,8 +3,7 @@
   <!--Sklonjeno ucitavanje novog dataseta i sve opcije u vezi sa tim, premesteno u add-new-dataset-->
 
   <div class="col-12 d-flex my-5">
-    <h2 class="">Izvor podataka:</h2>
-    <div class="col-1">
+    <div class="col-3">
     </div>
     <button type="button" id="btnMyDataset" class="btn" (click)="viewMyDatasetsForm()"
         [ngClass]="{'btnType1': showMyDatasets, 'btnType2': !showMyDatasets}">
@@ -22,21 +21,21 @@
   </div>
   <div class="px-5">
       <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;">
-          <ul class="list-group">
-              <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term"
-                  [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
-                  <app-item-dataset name="usersDataset" [dataset]="dataset"
-                      (click)="selectThisDataset(dataset);"></app-item-dataset>
-              </li>
-          </ul>
+            <ul class="list-group">
+                <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term"
+                    [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
+                    <app-item-dataset name="usersDataset" [dataset]="dataset"
+                        (click)="selectThisDataset(dataset);"></app-item-dataset>
+                </li>
+            </ul>
+            <div class="px-5 mt-5">
+                <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
+            </div>
       </div>
   </div>
 
   <app-add-new-dataset [style]="(showMyDatasets)?'display:none;visibility:hidden;':''" id="dataset"
-      (loaded)="datasetLoaded = true; selectedDataset = addNewDatasetComponent?.dataset; datasetFile = addNewDatasetComponent?.csvRecords; datasetHasHeader = addNewDatasetComponent?.dataset!.hasHeader">
+      (newDatasetAdded)="showMyDatasets = true">
   </app-add-new-dataset>
-  <div class="px-5 mt-5">
-      <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
-  </div>
 
 </div>
\ No newline at end of file
-- 
cgit v1.2.3