From 3c4bfb16f55aa51a50ee99327caca639e072cdab Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 13 Apr 2022 22:43:52 +0200
Subject: Kod preprocesiranja i tretiranja null vrednosti korisnik vidi koliko
 ima null redova/kolona od ukupnog broja redova/kolona. Obrisani
 console.log-ovi po frontu.

---
 .../src/app/experiment/experiment.component.html   | 16 ++++++++--------
 .../src/app/experiment/experiment.component.ts     | 22 +++++++++++++++++-----
 2 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'frontend/src/app/experiment')

diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html
index 337d7369..e46f5bd9 100644
--- a/frontend/src/app/experiment/experiment.component.html
+++ b/frontend/src/app/experiment/experiment.component.html
@@ -67,12 +67,12 @@
                             class="form-check-input" value="deleteRows" name="fillMissing" id="delRows" checked
                             data-bs-toggle="collapse" data-bs-target="#fillMissingCustom.show">
                         <label for="delRows" class="form-check-label">Obriši sve
-                            redove sa nedostajućim vrednostima ({{selectedDataset.nullRows}} / TODO)</label><br>
+                            redove sa nedostajućim vrednostima ({{selectedDataset.nullRows}} od {{selectedDataset.rowCount}})</label><br>
                         <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.DeleteColumns"
                             class="form-check-input" value="deleteCols" name="fillMissing" id="delCols" data-bs-toggle="collapse"
                             data-bs-target="#fillMissingCustom.show">
                         <label for="delCols" class="form-check-label">Obriši sve
-                            kolone sa nedostajućim vrednostima ({{selectedDataset.nullCols}} / TODO)</label><br>
+                            kolone sa nedostajućim vrednostima ({{countSelectedNullCols()}} od {{selectedDataset.columnInfo.length}})</label><br>
                         <input type="radio" [(ngModel)]="experiment.nullValues" [value]="NullValueOptions.Replace"
                             class="form-check-input" name="fillMissing" id="replace" data-bs-toggle="collapse"
                             data-bs-target="#fillMissingCustom:not(.show)">
@@ -81,11 +81,11 @@
                         <div class="collapse" id="fillMissingCustom">
                             <div>
                                 <label for="columnReplacers" class="form-label">Unesite zamenu za svaku kolonu:</label>
-                                <div class="my-3" *ngIf="getSelectedNullColumnsArray().length > 0" >
+                                <div class="my-3" *ngIf="getSelectedColumnsArrayWithoutNullVals().length > 0" >
                                     <label class="text-center form-control mx-3 text-secondary">
-                                        Kolone <span style="font-style: italic;" *ngFor="let colname of getSelectedNullColumnsArray(); let i = index">
-                                            <span *ngIf="i != getSelectedNullColumnsArray().length - 1">{{colname}}, </span> 
-                                            <span *ngIf="i == getSelectedNullColumnsArray().length - 1">{{colname}} </span> 
+                                        Kolone <span style="font-style: italic;" *ngFor="let colname of getSelectedColumnsArrayWithoutNullVals(); let i = index">
+                                            <span *ngIf="i != getSelectedColumnsArrayWithoutNullVals().length - 1">{{colname}}, </span> 
+                                            <span *ngIf="i == getSelectedColumnsArrayWithoutNullVals().length - 1">{{colname}} </span> 
                                         </span>
                                         nemaju nedostajućih vrednosti za popunjavanje.
                                     </label>
@@ -203,8 +203,8 @@
                         </div>
                     </div>
     
-                    <div id="encodingForColumns" class="my-5">
-                        <div class="col-3">
+                    <div id="encodingForColumns" class="row px-3 my-5">
+                        <div class="col-1">
                             <label for="encoding" class="col-form-label">Enkoding: </label>
                         </div>
                         <div class="col-2">
diff --git a/frontend/src/app/experiment/experiment.component.ts b/frontend/src/app/experiment/experiment.component.ts
index a2b5602b..b5e1d1f4 100644
--- a/frontend/src/app/experiment/experiment.component.ts
+++ b/frontend/src/app/experiment/experiment.component.ts
@@ -24,11 +24,12 @@ export class ExperimentComponent implements OnInit {
   Object = Object;
 
   selectedColumnsInfoArray: ColumnInfo[] = [];
-  selectedNullColumnsArray: string[] = [];
+  selectedNotNullColumnsArray: string[] = [];
 
   tempTestSetDistribution = 90;
 
-  constructor(private modelsService: ModelsService, private experimentsService: ExperimentsService) { }
+  constructor(private modelsService: ModelsService, private experimentsService: ExperimentsService) {
+  }
 
   ngOnInit(): void {
   }
@@ -36,7 +37,7 @@ export class ExperimentComponent implements OnInit {
   updateDataset(dataset: Dataset) {
     this.selectedDataset = dataset;
     this.selectedColumnsInfoArray = this.selectedDataset.columnInfo;
-    this.selectedNullColumnsArray = [];
+    this.selectedNotNullColumnsArray = [];
   }
 
   getInputById(id: string): HTMLInputElement {
@@ -104,7 +105,7 @@ export class ExperimentComponent implements OnInit {
     }
   }
 
-  getSelectedNullColumnsArray(): string[] {
+  getSelectedColumnsArrayWithoutNullVals(): string[] {
     let colNames: string[] = [];
 
     for (let i = 0; i < this.selectedColumnsInfoArray.length; i++) {
@@ -184,7 +185,7 @@ export class ExperimentComponent implements OnInit {
       this.experiment = response;
 
       this.selectedColumnsInfoArray = [];
-      this.selectedNullColumnsArray = [];
+      this.selectedNotNullColumnsArray = [];
 
       Shared.openDialog("Obaveštenje", "Eksperiment je uspešno kreiran.");
     }, (error) => {
@@ -193,4 +194,15 @@ export class ExperimentComponent implements OnInit {
       }
     });
   }
+
+  countSelectedNullCols(): number {
+    let counter: number = 0;
+
+    for (let i = 0; i < this.selectedColumnsInfoArray.length; i++) {
+      let oneColInfo = this.selectedColumnsInfoArray[i];
+      if (oneColInfo.numNulls > 0)
+        ++counter;
+    }
+    return counter;
+  }
 }
-- 
cgit v1.2.3