Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

1 files changed, 13 insertions, 2 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..8465c3d6 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 ","
 
@@ -20,7 +23,10 @@ export class DatasetLoadComponent {
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
+  dataset: Dataset;
+
   constructor(private ngxCsvParser: NgxCsvParser) {
+    this.dataset = new Dataset();
   }
 
   @ViewChild('fileImportInput', { static: false }) fileImportInput: any;
@@ -38,7 +44,7 @@ export class DatasetLoadComponent {
     this.ngxCsvParser.parse(this.files[0], { header: false, delimiter: (this.delimiter == "razmak") ? " " : (this.delimiter == "") ? "," : this.delimiter})
     .pipe().subscribe((result) => {
 
-      //console.log('Result', result);
+      console.log('Result', result);
       if (result.constructor === Array) {
         this.csvRecords = result;
         if (this.hasHeader)
@@ -46,9 +52,14 @@ export class DatasetLoadComponent {
         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);
     });
   }
+
 }