From fef66d17b52568bb64a8857c3dd8feacfde57297 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Tue, 5 Apr 2022 17:33:43 +0200
Subject: Kompletna reorganizacija komponenti za izbor dataseta pri dodavanju
 modela. Dodata komponenta add-new-dataset, dataset-load.component izmenjena,
 preostala add-model da se uskladi.

---
 .../app/_pages/add-model/add-model.component.html  | 39 ++--------------------
 1 file changed, 3 insertions(+), 36 deletions(-)

(limited to 'frontend/src/app/_pages/add-model/add-model.component.html')

diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index 97b35b7a..9d727236 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -26,48 +26,15 @@
 
         <div class="py-3 pr-5 justify-content-center">
 
-            <div class="col-12 d-flex my-5">
-                <h2 class="">Izvor podataka:</h2>
-                <div class="col-1">
-                </div>
-                <button type="button" id="btnMyDataset" class="btn" (click)="viewMyDatasetsForm()"
-                    [ngClass]="{'btnType1': showMyDatasets, 'btnType2': !showMyDatasets}">
-                    Izaberite dataset iz kolekcije
-                </button>
-                <h3 class="mt-3 mx-3">ili</h3>
-                <button type="button" id="btnNewDataset" class="btn" (click)="viewNewDatasetForm()"
-                    [ngClass]="{'btnType1': !showMyDatasets, 'btnType2': showMyDatasets}">
-                    Dodajte novi dataset
-                </button>
-            </div>
-            <div class="px-5 my-2">
-                <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga"
-                    [(ngModel)]="term">
-            </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>
-                </div>
-            </div>
+            <!--Od naslova Izvor podataka pa sve do prikaza tabele (i to) premesteno u dataset-load.component-->
+            <app-dataset-load (selectedDatasetChangeEvent)="datasetHasChanged($event)"></app-dataset-load>
 
-            <app-dataset-load [style]="(showMyDatasets)?'display:none;visibility:hidden;':''" id="dataset"
-                (loaded)="scrollToNextForm(); datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader">
-            </app-dataset-load>
-            <div class="px-5 mt-5">
-                <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
-            </div>
         </div>
 
         <!-- ULAZNE/IZLAZNE KOLONE -->
         <span id="selectInAndOuts"></span>
         <div
-            *ngIf="selectedDataset && ((showMyDatasets && selectedDatasetLoaded) || (!showMyDatasets && datasetLoaded))">
+            *ngIf="selectedDataset && ((showMyDatasets) || (!showMyDatasets))">
             <!--postignuto da se kod newdataseta ucita tabela pa ulazi/izlazi. ostalo srediti to kod mydatasets(dopuna 2. uslova)-->
             <div class="row">
                 <div class="col d-flex justify-content-center">
-- 
cgit v1.2.3