From 69f60f492f2d729e74e888f6f43d44e71c814ff4 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Tue, 15 Mar 2022 22:45:57 +0100
Subject: Preuredjivanje funkcionalnosti add-model komponente i dataset-load
 komponente.

---
 .../dataset-load/dataset-load.component.html       | 42 ++++++--------------
 .../dataset-load/dataset-load.component.ts         | 45 +++-------------------
 2 files changed, 18 insertions(+), 69 deletions(-)

(limited to 'frontend/src/app/_elements')

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 16830e11..2a611a96 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -1,5 +1,16 @@
 <div>
 
+  <div class="mb-4">
+    <label for="name" class="col-form-label">Naziv dataseta:</label>
+    <input type="text" class="form-control" name="name" placeholder="Naziv..."
+        [(ngModel)]="dataset.name">
+  </div>
+  <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 class="d-flex justify-content-center">
     <input style="display: inline-block; width:350px;" list=delimiterOptions
     placeholder="Izaberite ili ukucajte delimiter za .csv fajl" class="form-control" [(ngModel)]="delimiter"
@@ -41,35 +52,6 @@
     {{rowsNumber}} x {{colsNumber}}
   </div>
 
-  <div *ngIf="csvRecords.length > 0" class="mt-2">
-    <div class="row">
-      <div class="col d-flex justify-content-center">
-        <h3>Izaberite ulazne kolone:</h3> 
-        <div id="divInputs" class="form-check">
-          <br>
-          <div *ngFor="let item of csvRecords[0]; let i = index">  
-            <input *ngIf="i == 0" class="form-check-input" type="checkbox" value="{{item}}" id="cb_{{item}}" name="cbs" checked>
-            <input *ngIf="i != 0" class="form-check-input" type="checkbox" value="{{item}}" id="cb_{{item}}" name="cbs">&nbsp;
-            <label class="form-check-label" for="cb_{{item}}">
-              {{item}}
-            </label>
-          </div>
-        </div>
-      </div>
-      <div class="col d-flex justify-content-left">
-        <h3>Izaberite izlaznu kolonu:</h3>
-        <div id="divOutputs" class="form-check">
-          <br>
-          <div *ngFor="let item of csvRecords[0]; let i = index">
-            <input *ngIf="i == 0" class="form-check-input" type="radio" value="{{item}}" id="rb_{{item}}" name="rbs" checked>
-            <input *ngIf="i != 0" class="form-check-input" type="radio" value="{{item}}" id="rb_{{item}}" name="rbs">&nbsp;
-            <label class="form-check-label" for="rb_{{item}}">
-              {{item}}
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-  </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 c772dc35..d9d045ce 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -1,5 +1,6 @@
 import { Component, ViewChild } from '@angular/core';
 import { NgxCsvParser, NgxCSVParserError } from 'ngx-csv-parser';
+import Dataset from 'src/app/_data/Dataset';
 
 @Component({
   selector: 'app-dataset-load',
@@ -23,7 +24,10 @@ export class DatasetLoadComponent {
   checkedInputCols: Array<string> = [];
   checkedOutputCol: string = '';
 
+  dataset: Dataset;
+
   constructor(private ngxCsvParser: NgxCsvParser) {
+    this.dataset = new Dataset();
   }
 
   @ViewChild('fileImportInput', { static: false }) fileImportInput: any;
@@ -49,49 +53,12 @@ export class DatasetLoadComponent {
         else 
           this.rowsNumber = this.csvRecords.length;
         this.colsNumber = this.csvRecords[0].length;
+
+        this.dataset.header = this.csvRecords[0];
       }
     }, (error: NgxCSVParserError) => {
       console.log('Error', error);
     });
   }
 
-  getCheckedInputCols() : Array<string> {
-    this.checkedInputCols = new Array<string>();
-    let checkboxes = document.getElementsByName("cbs");
-
-    for (let i = 0; i < checkboxes.length; i++) {
-      let thatCb = <HTMLInputElement>checkboxes[i];
-      if (thatCb.checked)
-        this.checkedInputCols.push(thatCb.value);
-    }
-    //console.log(this.checkedInputCols);
-    return this.checkedInputCols;
-  }
-  getCheckedOutputCol() : string {
-    this.checkedOutputCol = '';
-    let radiobuttons = document.getElementsByName("rbs");
-
-    for (let i = 0; i < radiobuttons.length; i++) {
-      let thatRb = <HTMLInputElement>radiobuttons[i];
-      if (thatRb.checked) {
-        this.checkedOutputCol = thatRb.value;
-        break; 
-      }
-    }
-    //console.log(this.checkedOutputCol);
-    return this.checkedOutputCol;
-  }
-  validationInputsOutput() {
-    if (this.checkedInputCols.length == 0) {
-      alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.")
-      return;
-    } 
-    for (let i = 0; i < this.checkedInputCols.length; i++) {  
-      if (this.checkedInputCols[i] == this.checkedOutputCol) {
-        let colName = this.checkedOutputCol;
-        alert("Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor.");
-        return;
-      }
-    }
-  }
 }
-- 
cgit v1.2.3