From 59e3f40095eba7b541b0553c5a048e36dfe94f95 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Sat, 19 Mar 2022 19:56:01 +0100
Subject: Add-model izmene. Obrnuta pozicija trening i test skupa i dodato
 input dugme za rucni unos. Ulazne kolone sve cekirane i po potrebi disabled.

---
 .../app/_pages/add-model/add-model.component.html  | 39 ++++++++++++----------
 1 file changed, 21 insertions(+), 18 deletions(-)

(limited to 'frontend/src/app/_pages/add-model/add-model.component.html')

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 c6f21f1e..98cd204b 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -38,10 +38,8 @@
                     <div id="divInputs" class="form-check mt-2">
                         <br>
                         <div *ngFor="let item of datasetLoadComponent.dataset.header; let i = index">
-                            <input *ngIf="i == 0" class="form-check-input" type="checkbox" value="{{item}}"
-                                id="cb_{{item}}" name="cbs" checked>
-                            <input *ngIf="i != 0" class="form-check-input" type="checkbox" value="{{item}}"
-                                id="cb_{{item}}" name="cbs">&nbsp;
+                            <input class="form-check-input" type="checkbox" value="{{item}}"
+                                id="cb_{{item}}" name="cbs" checked [disabled]="this.selectedOutputColumnVal == item">&nbsp;
                             <label class="form-check-label" for="cb_{{item}}">
                                 {{item}}
                             </label>
@@ -53,10 +51,8 @@
                     <div id="divOutputs" class="form-check mt-2">
                         <br>
                         <div *ngFor="let item of datasetLoadComponent.dataset.header; let i = index">
-                            <input *ngIf="i == 0" class="form-check-input" type="radio" value="{{item}}"
-                                id="rb_{{item}}" name="rbs" checked>
-                            <input *ngIf="i != 0" class="form-check-input" type="radio" value="{{item}}"
-                                id="rb_{{item}}" name="rbs">&nbsp;
+                            <input class="form-check-input" type="radio" value="{{item}}"
+                                id="rb_{{item}}" name="rbs" (change)="this.selectedOutputColumnVal = item">&nbsp;
                             <label class="form-check-label" for="rb_{{item}}">
                                 {{item}}
                             </label>
@@ -193,15 +189,10 @@
                 <div class="col-1">
                 </div>
                 <div class="col-5">
-                    <label for="type" class="form-check-label">Podela test skupa:&nbsp;&nbsp;
-                        <input class="form-check-input" type="checkbox" [checked]="newModel.randomTestSet"
+                    <label for="splitYesNo" class="form-check-label">Podela test skupa:&nbsp;&nbsp;
+                        <input id="splitYesNo" class="form-check-input" type="checkbox" [checked]="newModel.randomTestSet"
                             (change)="newModel.randomTestSet = !newModel.randomTestSet">
-                    </label> &nbsp;&nbsp;&nbsp;&nbsp;
-                    test
-                    <mat-slider min="0.1" max="0.9" step="0.1" value="0.2" name="randomTestSetDistribution" thumbLabel
-                        [disabled]="!newModel.randomTestSet" [(ngModel)]="newModel.randomTestSetDistribution">
-                    </mat-slider>
-                    trening
+                    </label>
                 </div>
                 <div class="col">
                 </div>
@@ -224,9 +215,14 @@
                         </option>
                     </select>
                 </div>
-                <div class="col">
+                <div class="col-1">
                 </div>
-                <div class="col">
+                <div class="col-2">
+                    <label for="percentage" class="form-label">Procenat podataka koji se uzima za trening skup:</label>
+                </div>
+                <div class="col-1">
+                    <input id="percentage" type="number" class="form-control" min="10" max="90" step="10" value="10" [(ngModel)]="newModel.randomTestSetDistribution"
+                        [disabled] = "!newModel.randomTestSet">
                 </div>
             </div>
 
@@ -247,7 +243,14 @@
                         </option>
                     </select>
                 </div>
+                <div class="col-1">
+                </div>
                 <div class="col">
+                    trening
+                    <mat-slider min="10" max="90" step="10" value="10" name="randomTestSetDistribution" thumbLabel
+                        [disabled]="!newModel.randomTestSet" [(ngModel)]="newModel.randomTestSetDistribution">
+                    </mat-slider>
+                    test
                 </div>
                 <div class="col">
                 </div>
-- 
cgit v1.2.3