From 8097c0ced5e16657a92ca08fa788839147a4b56f Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Sun, 10 Apr 2022 23:03:44 +0200
Subject: Datasetovi - izmene i testiranje

---
 frontend/src/app/_data/Experiment.ts                       |  2 +-
 .../app/_elements/dataset-load/dataset-load.component.html | 14 +++++++-------
 .../app/_elements/dataset-load/dataset-load.component.ts   |  7 ++++++-
 .../src/app/_elements/datatable/datatable.component.html   |  3 +++
 frontend/src/app/experiment/experiment.component.html      |  1 +
 frontend/src/app/experiment/experiment.component.ts        |  4 +++-
 6 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'frontend/src/app')

diff --git a/frontend/src/app/_data/Experiment.ts b/frontend/src/app/_data/Experiment.ts
index aba9bb6e..a5aad218 100644
--- a/frontend/src/app/_data/Experiment.ts
+++ b/frontend/src/app/_data/Experiment.ts
@@ -6,7 +6,7 @@ export default class Experiment {
         public description: string = '',
         public datasetId: string = '',
         public inputColumns: string[] = [],
-        public columnToPredict: string = '',
+        public outputColumn: string = '',
         public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
         public nullValuesReplacers: NullValReplacer[] = [],
         public dateCreated: Date = new Date(),
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 2052c9b5..09487b3b 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -19,8 +19,8 @@
       <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga"
           [(ngModel)]="term">
   </div>
-  <div class="px-5">
-      <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;">
+  <div class="px-5" *ngIf="showMyDatasets">
+        <div class="overflow-auto" style="max-height: 500px;">
             <ul class="list-group">
                 <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term"
                     [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
@@ -28,14 +28,14 @@
                         (click)="selectThisDataset(dataset);"></app-item-dataset>
                 </li>
             </ul>
-            <div class="px-5 mt-5">
-                <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
-            </div>
-      </div>
+        </div>
+        <div class="px-5 mt-5">
+            <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
+        </div>
   </div>
 
   <app-add-new-dataset [style]="(showMyDatasets)?'display:none;visibility:hidden;':''" id="dataset"
-      (newDatasetAdded)="showMyDatasets = true">
+      (newDatasetAdded)="refreshMyDatasets()">
   </app-add-new-dataset>
 
 </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 6a5734e5..7329033c 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -54,7 +54,7 @@ export class DatasetLoadComponent {
   refreshMyDatasets() {
     this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
-      this.viewMyDatasetsForm();
+      this.showMyDatasets = true;
       //this.
     });
   }
@@ -67,6 +67,9 @@ export class DatasetLoadComponent {
 
     this.datasets.getDatasetFile(dataset.fileId).subscribe((file: string | undefined) => {
       if (file) {
+        console.log(file);
+        this.datatable!.hasInput = true;
+        this.datatable!.loaded = true;
         this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter);
         /*for (let i = this.datasetFile.length - 1; i >= 0; i--) {  //moguce da je vise redova na kraju fajla prazno i sl.
           if (this.datasetFile[i].length != this.datasetFile[0].length)
@@ -74,7 +77,9 @@ export class DatasetLoadComponent {
           else
             break; //nema potrebe dalje
         }*/
+        console.log(this.datatable!.data);
         console.log(this.datasetFile);
+        console.log(this.datatable!.hasInput);
         //this.resetCbsAndRbs();                        //TREBA DA SE DESI
         //this.refreshThreeNullValueRadioOptions();       //TREBA DA SE DESI
         this.selectedDatasetLoaded = true;
diff --git a/frontend/src/app/_elements/datatable/datatable.component.html b/frontend/src/app/_elements/datatable/datatable.component.html
index 52d50443..b6cbd303 100644
--- a/frontend/src/app/_elements/datatable/datatable.component.html
+++ b/frontend/src/app/_elements/datatable/datatable.component.html
@@ -1,4 +1,7 @@
+PRE IFA
+{{hasInput}}
 <div *ngIf="data && hasInput">
+    PROSLO IF
     <div class="table-responsive" style="height: 34rem; overflow: auto; border-radius: 5px;" class="mh-5">
         <div *ngIf="!loaded" style="background-color: #003459; width: 100%; height: 100%;"
             class="d-flex justify-content-center align-items-center">
diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html
index 1c38e103..25d1b3e3 100644
--- a/frontend/src/app/experiment/experiment.component.html
+++ b/frontend/src/app/experiment/experiment.component.html
@@ -35,6 +35,7 @@
                         <div *ngFor="let item of selectedDataset.columnInfo; let i = index">
                             <input class="form-check-input" type="radio" value="{{item.columnName}}"
                                 id="rb_{{item.columnName}}" name="rbsNew"
+                                [(ngModel)]="this.experiment.outputColumn"
                                 (change)="this.selectedOutputColumnVal = item.columnName">&nbsp;
                             <label class="form-check-label" for="rb_{{item.columnName}}">
                                 {{item.columnName}}
diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index 9e8f6881..047963b5 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -137,11 +137,13 @@ export class ExperimentComponent implements OnInit {
     }
     //ispitivanje da li ima ulazne kolone TODO
 
-    if (this.selectedOutputColumnVal == '') {
+    if (this.experiment.outputColumn == '') {
       Shared.openDialog("Greška", "Molimo Vas da izaberete izlaznu kolonu.");
       return;
     }
     
+    this.experiment._id = '';
+    this.experiment.uploaderId = '';
     this.experiment.datasetId = this.selectedDataset._id;
     
     this.experimentsService.addExperiment(this.experiment).subscribe((response) => {
-- 
cgit v1.2.3