2 files changed, 48 insertions, 8 deletions

diff --git a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.html b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.html
index dfeb4f62..eb68b54c 100644
--- a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.html
+++ b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.html
@@ -24,9 +24,9 @@
     </div>
     <div class="col-4 mt-4">
 
-      <input list=delimiterOptions placeholder="Izaberite ili ukucajte delimiter za .csv fajl" class="form-control mt-2"
+      <input list="delimiterOptions" placeholder="Izaberite ili ukucajte delimiter za .csv fajl" class="form-control mt-2"
         [(ngModel)]="dataset.delimiter" (input)="update()">
-      <datalist id=delimiterOptions>
+      <datalist id="delimiterOptions">
         <option *ngFor="let option of delimiterOptions">{{option}}</option>
       </datalist>
 
@@ -38,4 +38,12 @@
       <input id="fileInput" class="form-control" type="file" class="upload" (change)="changeListener($event)"
         accept=".csv">
     </div>
-  </div>
\ No newline at end of file
+</div>
+
+<div class="px-5 mt-5">
+  <app-datatable [data]="csvRecords" [hasHeader]="dataset.hasHeader"></app-datatable>
+</div>
+
+<div class="d-flex flex-row align-items-center justify-content-center w-100">
+  <button (click)="uploadDataset()" class="btn btn-lg col-4" style="background-color:#003459; color:white;">Dodaj izvor podataka</button>
+</div>
diff --git a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts
index fceb53cf..c5e6558a 100644
--- a/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts
+++ b/frontend/src/app/_elements/add-new-dataset/add-new-dataset.component.ts
@@ -1,6 +1,10 @@
 import { Component, EventEmitter, Output, ViewChild } from '@angular/core';
 import { NgxCsvParser, NgxCSVParserError } from 'ngx-csv-parser';
 import Dataset from 'src/app/_data/Dataset';
+import { DatasetsService } from 'src/app/_services/datasets.service';
+import { ModelsService } from 'src/app/_services/models.service';
+import shared from 'src/app/Shared';
+import { DatatableComponent } from '../datatable/datatable.component';
 
 @Component({
   selector: 'app-add-new-dataset',
@@ -9,7 +13,8 @@ import Dataset from 'src/app/_data/Dataset';
 })
 export class AddNewDatasetComponent {
 
-  @Output() loaded = new EventEmitter<string>();
+  @Output() newDatasetAdded = new EventEmitter<string>();
+  @ViewChild(DatatableComponent) datatable?: DatatableComponent;
 
   delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano ","
 
@@ -23,7 +28,7 @@ export class AddNewDatasetComponent {
 
   dataset: Dataset; //dodaj ! potencijalno
 
-  constructor(private ngxCsvParser: NgxCsvParser) {
+  constructor(private ngxCsvParser: NgxCsvParser, private modelsService: ModelsService, private datasetsService: DatasetsService) {
     this.dataset = new Dataset();
   }
 
@@ -48,6 +53,9 @@ export class AddNewDatasetComponent {
     if (this.files.length < 1)
       return;
 
+    this.datatable!.loaded = false;
+    this.datatable!.hasInput = this.hasInput;
+
     this.ngxCsvParser.parse(this.files[0], { header: false, delimiter: (this.dataset.delimiter == "razmak") ? " " : (this.dataset.delimiter == "") ? "," : this.dataset.delimiter })
       .pipe().subscribe((result) => {
 
@@ -60,10 +68,12 @@ export class AddNewDatasetComponent {
             this.rowsNumber = this.csvRecords.length;
           this.colsNumber = this.csvRecords[0].length;
 
-          if (this.dataset.hasHeader) //kasnije dodati opciju kada nema header da korisnik rucno unosi header-e
+          if (this.dataset.hasHeader) 
             this.dataset.header = this.csvRecords[0];
-
-          this.loaded.emit("loaded");
+          
+          this.datatable!.data = this.csvRecords;
+          this.datatable!.hasHeader = this.dataset.hasHeader;
+          this.datatable!.loaded = true;
         }
       }, (error: NgxCSVParserError) => {
         console.log('Error', error);
@@ -75,4 +85,26 @@ export class AddNewDatasetComponent {
       this.dataset.accessibleByLink = true;
   }
 
+  uploadDataset() {
+        this.modelsService.uploadData(this.files[0]).subscribe((file) => {
+          //console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id);
+            this.dataset.fileId = file._id;
+            this.dataset.username = shared.username;
+
+            this.datasetsService.addDataset(this.dataset).subscribe((dataset) => {
+             
+              this.newDatasetAdded.emit("added");
+              //this.refreshMyDatasetList(); refreshuj dataset listu u ds-load i selektuj taj ds
+              //this.showMyDatasets = true;
+              //this.selectThisDataset(dataset);
+
+              shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira.");
+            }, (error) => {
+              shared.openDialog("Neuspeo pokušaj!", "Dataset sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
+            }); //kraj addDataset subscribe
+        }, (error) => {
+          
+        }); //kraj uploadData subscribe
+  }
+
 }