1 files changed, 23 insertions, 18 deletions
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 7cdfe384..843a5709 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -11,12 +11,12 @@ export class DatasetLoadComponent {
   delimiter: string = "";
   delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano ","
 
-  header: string = "";
-  headerOptions: Array<string> = ["Da", "Ne"]; //podrazumevano je "Da" ======> false
+  hasHeader: boolean = true;
 
   slice: string = "";
 
   csvRecords: any[] = [];
+  files: any[] = [];
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
@@ -25,25 +25,30 @@ export class DatasetLoadComponent {
 
   @ViewChild('fileImportInput', { static: false }) fileImportInput: any;
 
-    changeListener($event: any): void {
+  changeListener($event: any): void {
+    this.files = $event.srcElement.files;
+    this.update();
+  }
 
-    const files = $event.srcElement.files;
+  update() {
 
-    this.ngxCsvParser.parse(files[0], { header: (this.header == "") ? false : (this.header == "Da") ? false : true, delimiter: (this.delimiter == "razmak") ? " " : (this.delimiter == "") ? "," : this.delimiter})
-      .pipe().subscribe((result) => {
+    if (this.files.length < 1)
+      return;
 
-        console.log('Result', result);
-        if (result.constructor === Array) {
-          this.csvRecords = result;
-          this.rowsNumber = this.csvRecords.length;
-          this.colsNumber = this.csvRecords[0].length;
-        }
-        
-      }, (error: NgxCSVParserError) => {
-        console.log('Error', error);
-      });
+    this.ngxCsvParser.parse(this.files[0], { header: false, delimiter: (this.delimiter == "razmak") ? " " : (this.delimiter == "") ? "," : this.delimiter})
+    .pipe().subscribe((result) => {
 
+      //console.log('Result', result);
+      if (result.constructor === Array) {
+        this.csvRecords = result;
+        if (this.hasHeader)
+          this.rowsNumber = this.csvRecords.length - 1;
+        else 
+          this.rowsNumber = this.csvRecords.length;
+        this.colsNumber = this.csvRecords[0].length;
+      }
+    }, (error: NgxCSVParserError) => {
+      console.log('Error', error);
+    });
   }
-
-
 }