From 545ce7b8d919579e710139d64cde05363cf446b0 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Mon, 11 Apr 2022 17:00:39 +0200
Subject: Sredjeno komplet cuvanje eksperimenta, zamena nedostajucih vrednosti,
 prikaz samo onih kolona koje imaju nedostajucih vrednosti za zamenu,
 izmenjena logika odabira ulaznih/izlaznih kolona

---
 .../src/app/experiment/experiment.component.html   | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'frontend/src/app/experiment/experiment.component.html')

diff --git a/frontend/src/app/experiment/experiment.component.html b/frontend/src/app/experiment/experiment.component.html
index 25d1b3e3..7746b13e 100644
--- a/frontend/src/app/experiment/experiment.component.html
+++ b/frontend/src/app/experiment/experiment.component.html
@@ -21,7 +21,8 @@
                             <input class="form-check-input" type="checkbox" value="{{item.columnName}}"
                                 id="cb_{{item.columnName}}" name="cbsNew"
                                 [checked]="this.selectedOutputColumnVal != item.columnName"
-                                [disabled]="this.selectedOutputColumnVal == item.columnName">&nbsp;
+                                [disabled]="this.selectedOutputColumnVal == item.columnName"
+                                (click)="checkedColumnsChanged(item, 0)">&nbsp;
                             <label class="form-check-label" for="cb_{{item.columnName}}">
                                 {{item.columnName}}
                             </label>
@@ -36,7 +37,8 @@
                             <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;
+                                (change)="this.selectedOutputColumnVal = item.columnName"
+                                (click)="checkedColumnsChanged(item, 1);">&nbsp;
                             <label class="form-check-label" for="rb_{{item.columnName}}">
                                 {{item.columnName}}
                             </label>
@@ -66,9 +68,18 @@
             <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" >
+                        <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> 
+                            </span>
+                            nemaju nedostajućih vrednosti za popunjavanje.
+                        </label>
+                    </div>
                     <div id="columnReplacers">
-                        <div *ngFor="let column of selectedDataset.columnInfo; let i = index" class="my-3">
-                            <div *ngIf="getInputById('cb_'+column.columnName).checked || selectedOutputColumnVal == column.columnName" class="">
+                        <div *ngFor="let column of selectedColumnsInfoArray; let i = index" class="my-3">
+                            <div *ngIf="column.numNulls > 0">
                                 <span class="w-20 mx-3">
                                     {{column.columnName}}&nbsp;<span class="small" style="color:gray;">({{column.numNulls}} null)
                                     </span>
@@ -97,7 +108,7 @@
 
                                             <div class="input-group-append">
                                                 <select [id]="'replaceOptions'+i" class="form-control btn-primary"
-                                                    *ngIf="column.isNumber" (change)="replace($event, column);">
+                                                    *ngIf="column.isNumber" (change)="replace($event, column); checkFillColRadio(column.columnName);">
                                                     <option
                                                         *ngFor="let option of Object.keys(ReplaceWith); let optionName of Object.values(ReplaceWith)"
                                                         [value]="option">
@@ -107,7 +118,7 @@
                                                 <select [id]="'replaceOptions'+i"
                                                     class="form-control btn-outline-primary"
                                                     *ngIf="!column.isNumber && column.numNulls > 0"
-                                                    (change)="replace($event, column);">
+                                                    (change)="replace($event, column); checkFillColRadio(column.columnName);">
                                                     <option *ngFor="let option of column.uniqueValues" [value]="option">
                                                         {{ option }}
                                                     </option>
-- 
cgit v1.2.3