1 files changed, 29 insertions, 17 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 843a5709..913592eb 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 { Component, EventEmitter, Output, ViewChild } from '@angular/core';
 import { NgxCsvParser, NgxCSVParserError } from 'ngx-csv-parser';
+import Dataset from 'src/app/_data/Dataset';
 
 @Component({
   selector: 'app-dataset-load',
@@ -8,6 +9,8 @@ import { NgxCsvParser, NgxCSVParserError } from 'ngx-csv-parser';
 })
 export class DatasetLoadComponent {
 
+  @Output() loaded = new EventEmitter<string>();
+
   delimiter: string = "";
   delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano ","
 
@@ -16,17 +19,21 @@ export class DatasetLoadComponent {
   slice: string = "";
 
   csvRecords: any[] = [];
-  files: any[] = [];
+  files: File[] = [];
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
+  dataset: Dataset;
+
   constructor(private ngxCsvParser: NgxCsvParser) {
+    this.dataset = new Dataset();
   }
 
   @ViewChild('fileImportInput', { static: false }) fileImportInput: any;
 
   changeListener($event: any): void {
     this.files = $event.srcElement.files;
+    console.log(this.files);
     this.update();
   }
 
@@ -35,20 +42,25 @@ export class DatasetLoadComponent {
     if (this.files.length < 1)
       return;
 
-    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);
-    });
+    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;
+
+          this.dataset.header = this.csvRecords[0];
+
+          this.loaded.emit("loaded");
+        }
+      }, (error: NgxCSVParserError) => {
+        console.log('Error', error);
+      });
   }
+
 }