From 9091fe4f92a45bff7adaa841bf8c4a3c498ecadb Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Thu, 24 Mar 2022 15:29:40 +0100
Subject: Dodao odabir za automatsko popunjavanje string vrednosti, i
 checkboxove za delCol, delRows za svaku kolonu.

---
 frontend/src/app/_data/Model.ts                    |  2 +-
 .../app/_pages/add-model/add-model.component.html  | 23 +++++++++++++++++-----
 .../app/_pages/add-model/add-model.component.ts    |  3 ++-
 3 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index 07364564..f6e01d08 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -107,7 +107,7 @@ export enum NullValueOptions {
 }
 
 export enum ReplaceWith {
-    None = '...',
+    None = 'Popuni...',
     Mean = 'Srednja vrednost',
     Median = 'Medijana'
 }
\ No newline at end of file
diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index afd4ceb4..7e944a19 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -96,12 +96,12 @@
                         <input type="radio" [(ngModel)]="newModel.nullValues" [value]="NullValueOptions.DeleteRows"
                             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
+                        <label for="delRows" class="form-check-label">Obriši sve
                             redove sa nedostajućim vrednostima</label><br>
                         <input type="radio" [(ngModel)]="newModel.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
+                        <label for="delCols" class="form-check-label">Obriši sve
                             kolone sa nedostajućim vrednostima</label><br>
                         <input type="radio" [(ngModel)]="newModel.nullValues" [value]="NullValueOptions.Replace"
                             class="form-check-input" name="fillMissing" id="replace" data-bs-toggle="collapse"
@@ -114,11 +114,11 @@
                                 <div id="columnReplacers">
                                     <div *ngFor="let column of selectedDataset.header; let i = index" class="my-3">
                                         <div class="input-group row" *ngIf="getInputById('cb_'+column).checked">
-                                            <span class="input-group-text col-4 text-center">
+                                            <span class="input-group-text col-2 text-center">
                                                 {{column}}
                                             </span>
-                                            <input type="text" class="form-control col-4">
-                                            <select [id]="'replaceOptions'+i" class="form-control col-4"
+                                            <input type="text" class="form-control col-2">
+                                            <select [id]="'replaceOptions'+i" class="form-control col-2"
                                                 *ngIf="isNumber(datasetFile[1][i])">
                                                 <option
                                                     *ngFor="let option of Object.keys(ReplaceWith); let optionName of Object.values(ReplaceWith)"
@@ -126,6 +126,19 @@
                                                     {{ optionName }}
                                                 </option>
                                             </select>
+                                            <select [id]="'replaceOptions'+i" class="form-control col-2"
+                                                *ngIf="!isNumber(datasetFile[1][i])">
+                                                <option *ngFor="let option of arrayColumn(datasetFile, i)"
+                                                    [value]="option">
+                                                    {{ option }}
+                                                </option>
+                                            </select>
+                                            <label class="form-control col-2" [for]="'delCol_'+column">Izbriši kolonu
+                                                <input type="radio" [id]="'delCol_'+column"
+                                                    [name]="'delOp_'+column"></label>
+                                            <label class="form-control col-2" [for]="'delRows_'+column">Izbriši redove
+                                                <input type="radio" [id]="'delRows_'+column" [name]="'delOp_'+column"
+                                                    checked></label>
                                         </div>
                                     </div>
                                 </div>
diff --git a/frontend/src/app/_pages/add-model/add-model.component.ts b/frontend/src/app/_pages/add-model/add-model.component.ts
index 156e51bc..fcc8ea70 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -271,8 +271,9 @@ export class AddModelComponent implements OnInit {
       !isNaN(Number(value.toString())));
   }
 
-
   getInputById(id: string): HTMLInputElement {
     return document.getElementById(id) as HTMLInputElement;
   }
+
+  arrayColumn = (arr: any[][], n: number) => [...new Set(arr.map(x => x[n]))];
 }
-- 
cgit v1.2.3