Izmenio ucitavanje dataseta na add-model stranici tako da se checkoboxovi i radio dugmad za odabir ulaznih i izlazne kolone ne ponavljaju.

2 files changed, 12 insertions, 43 deletions

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 76fc40e2..b159c748 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -5,57 +5,28 @@
     </div>
     <div class="col-3">
       <label for="name" class="col-form-label">Naziv dataseta:</label>
-      <input type="text" class="form-control mb-3" name="name" placeholder="Naziv..."
-          [(ngModel)]="dataset.name">
-        <label for="desc" class="col-sm-2 col-form-label">Opis:</label>
-        <div>
-            <textarea class="form-control" name="desc" rows="3" [(ngModel)]="dataset.description"></textarea>
-        </div>
+      <input type="text" class="form-control mb-3" name="name" placeholder="Naziv..." [(ngModel)]="dataset.name">
+      <label for="desc" class="col-sm-2 col-form-label">Opis:</label>
+      <div>
+        <textarea class="form-control" name="desc" rows="3" [(ngModel)]="dataset.description"></textarea>
+      </div>
     </div>
     <div class="col-1">
     </div>
     <div class="col-4 mt-4">
-      <input list=delimiterOptions
-      placeholder="Izaberite ili ukucajte delimiter za .csv fajl" class="form-control mt-2" [(ngModel)]="delimiter"
-      (input)="update()">
+      <input list=delimiterOptions placeholder="Izaberite ili ukucajte delimiter za .csv fajl" class="form-control mt-2"
+        [(ngModel)]="delimiter" (input)="update()">
       <datalist id=delimiterOptions>
         <option *ngFor="let option of delimiterOptions">{{option}}</option>
       </datalist>
 
       <label for="type" class="form-check-label my-5">Da li .csv ima header?
-        <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="hasHeader" type="checkbox" value="" id="checkboxHeader" checked>
+        <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="hasHeader" type="checkbox"
+          value="" id="checkboxHeader" checked>
       </label>
       <br>
-      <input id="fileInput" class="form-control" type="file" class="upload" (change)="changeListener($event)" accept=".csv">
+      <input id="fileInput" class="form-control" type="file" class="upload" (change)="changeListener($event)"
+        accept=".csv">
     </div>
   </div>
-
-  <div class="table-responsive" *ngIf="hasInput">
-    <table *ngIf="csvRecords.length > 0 && hasHeader" class="table table-bordered table-light mt-4">
-      <thead>
-        <tr>
-          <th *ngFor="let item of csvRecords[0]; let i = index">{{item}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr *ngFor="let row of csvRecords | slice:1:11">
-          <td *ngFor="let col of row">{{col}}</td>
-        </tr>
-      </tbody>
-    </table>
-
-    <table *ngIf="csvRecords.length > 0 && !hasHeader" class="table table-bordered table-light mt-4">
-      <tbody>
-        <tr *ngFor="let row of csvRecords | slice:0:10">
-          <td *ngFor="let col of row">{{col}}</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-
-  <div *ngIf="csvRecords.length > 0 && hasInput" id="info">
-    . . . <br>
-    {{rowsNumber}} x {{colsNumber}}
-  </div>
-
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
index bccf13b7..7f432b9a 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -15,7 +15,6 @@ export class DatasetLoadComponent {
   delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano ","
 
   hasHeader: boolean = true;
-
   hasInput: boolean = false;
 
   csvRecords: any[] = [];
@@ -39,10 +38,9 @@ export class DatasetLoadComponent {
       this.hasInput = false;
       return;
     }
-    else 
+    else
       this.hasInput = true;
 
-    console.log(this.files);
     this.update();
   }