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

3 files changed, 45 insertions, 13 deletions

diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.css b/frontend/src/app/_elements/dataset-load/dataset-load.component.css
index e69de29b..05819702 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.css
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.css
@@ -0,0 +1,6 @@
+#divInputs {
+    margin-left: 20px;
+}
+#divOutputs {
+    margin-left: 20px;
+}
\ No newline at end of file
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 c89add43..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,19 +1,32 @@
 <div>
 
-  <input style="display: inline-block; width:350px;" list=delimiterOptions
+  <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"
     (input)="update()">
-  <datalist id=delimiterOptions>
-    <option *ngFor="let option of delimiterOptions">{{option}}</option>
-  </datalist>
-  &nbsp;&nbsp;&nbsp;&nbsp;
-  <label for="checkboxHeader">Da li .csv ima header?</label> &nbsp;
-  <input (input)="update()" [(ngModel)]="hasHeader" type="checkbox" value="" id="checkboxHeader" checked>
-  <br><br>
+    <datalist id=delimiterOptions>
+      <option *ngFor="let option of delimiterOptions">{{option}}</option>
+    </datalist>  &nbsp;&nbsp;&nbsp;&nbsp;
+ 
+    <label for="type" class="form-check-label">Da li .csv ima header?
+      <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="hasHeader" type="checkbox" value="" id="checkboxHeader" checked>
+    </label> &nbsp;&nbsp;&nbsp;&nbsp;
 
-  <input id="fileInput" class="form-control mb-5" type="file" class="upload" (change)="changeListener($event)" accept=".csv">
-
-  <table *ngIf="csvRecords.length > 0 && hasHeader" class="table table-bordered table-light mt-5">
+    <input id="fileInput" class="form-control" type="file" class="upload" (change)="changeListener($event)" accept=".csv">
+  </div>
+  
+  <table *ngIf="csvRecords.length > 0 && hasHeader" class="table table-bordered table-light my-4">
     <thead>
       <tr>
         <th *ngFor="let item of csvRecords[0]; let i = index">{{item}}</th>
@@ -26,7 +39,7 @@
     </tbody>
   </table>
 
-  <table *ngIf="csvRecords.length > 0 && !hasHeader" class="table table-bordered table-light mt-5">
+  <table *ngIf="csvRecords.length > 0 && !hasHeader" class="table table-bordered table-light mt-4">
     <tbody>
       <tr *ngFor="let row of csvRecords | slice:0:10">
         <td *ngFor="let col of row">{{col}}</td>
@@ -39,4 +52,6 @@
     {{rowsNumber}} x {{colsNumber}}
   </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 cde3e8b1..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;
@@ -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);
     });
   }
+
 }