From ea54b441b0b2aae522f26ed045757aee8f981f7d Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 25 Apr 2022 22:44:48 +0200
Subject: Dodata column-table komponenta na experiment stranicu.

---
 frontend/src/app/_elements/column-table/column-table.component.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'frontend/src/app/_elements/column-table/column-table.component.html')

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 62699284..b9fdd84a 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -23,9 +23,9 @@
         <tr>
             <th>Grafik</th>
             <td *ngFor="let colInfo of dataset.columnInfo; let i = index">
-                <app-box-plot *ngIf="colInfo.isNumber"></app-box-plot>
-                <!--TODO: dodati [data]-->
-                <app-pie-chart *ngIf="!colInfo.isNumber"></app-pie-chart>
+                <!-- <app-box-plot *ngIf="colInfo.isNumber"></app-box-plot>
+                TODO: dodati [data]
+                <app-pie-chart *ngIf="!colInfo.isNumber"></app-pie-chart> -->
             </td>
         </tr>
         <tr>
-- 
cgit v1.2.3


From 9d49bbdc2c4b0bda69fca7e130d8153091da8c04 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 26 Apr 2022 02:10:35 +0200
Subject: Dodat slider , dropdown za biranje tipa problema i dropdown za izbor
 izlazne kolone.

---
 .../column-table/column-table.component.css        |  9 +++++++
 .../column-table/column-table.component.html       | 30 +++++++++++++++++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)

(limited to 'frontend/src/app/_elements/column-table/column-table.component.html')

diff --git a/frontend/src/app/_elements/column-table/column-table.component.css b/frontend/src/app/_elements/column-table/column-table.component.css
index f65d7c3d..060fcc05 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.css
+++ b/frontend/src/app/_elements/column-table/column-table.component.css
@@ -2,4 +2,13 @@ table {
     display: block;
     overflow-x: auto;
     white-space: nowrap;
+}
+mat-slider{
+    width: 300px;
+}
+.belowColumn{
+    background-color: var(--ns-bg-dark-50);
+}
+.slider{
+    background-color: var(--ns-bg-dark-100);
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index b9fdd84a..8225de6d 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -101,4 +101,32 @@
             </td>
         </tr>
     </tbody>
-</table>
\ No newline at end of file
+</table>
+
+<div class="container text-offwhite belowColumn">
+    <div class="row " >
+        <div class="col-sm slider">
+            Trening<mat-slider thumbLabel min="10" max="90" step="10" value="50"></mat-slider>Test
+        </div>
+        <div class="col-sm d-flex">
+            <mat-form-field appearance="fill" style="width: 270px;">
+                <mat-label>Tip problema</mat-label>
+                <mat-select value="ToDo1">
+                    <mat-option value="ToDo1">Regresioni</mat-option>
+                    <mat-option value="ToDo2">Binarni-Klasifikacioni</mat-option>
+                    <mat-option value="ToDo3">Multi-Klasifikacioni</mat-option>
+                </mat-select>
+            </mat-form-field>
+        </div>
+        <div class="col-sm d-flex">
+            <mat-form-field appearance="fill" >
+                <mat-label>Izlazna kolona</mat-label>
+                <mat-select>
+                    <mat-option *ngFor="let item of dataset?.columnInfo" [value]="item.columnName">{{item.columnName}}</mat-option>
+                </mat-select>
+            </mat-form-field>
+        </div>
+
+    </div>
+
+</div>
\ No newline at end of file
-- 
cgit v1.2.3


From 1cd21bb27492de6c8c61f36b258e4acfacab7fd3 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 26 Apr 2022 18:40:13 +0200
Subject: Promenjen dizajn. Dodati procenti kod trening i test skupa.

---
 .../src/app/_elements/column-table/column-table.component.html | 10 ++++++----
 .../src/app/_elements/column-table/column-table.component.ts   |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'frontend/src/app/_elements/column-table/column-table.component.html')

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 8225de6d..4418d21b 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -105,10 +105,12 @@
 
 <div class="container text-offwhite belowColumn">
     <div class="row " >
-        <div class="col-sm slider">
-            Trening<mat-slider thumbLabel min="10" max="90" step="10" value="50"></mat-slider>Test
+        <div class="col-sm slider rounded">
+            <div class="text-center">Trening<mat-slider thumbLabel min="10" max="90" step="10" [(ngModel)]="testSetDistribution"></mat-slider>Test</div>
+            <div class="text-center">Trening:<b>{{testSetDistribution}}%</b> : Test:<b>{{100-testSetDistribution}}%</b></div>
         </div>
-        <div class="col-sm d-flex">
+        
+        <div class="col-sm-3 d-flex pt-3">
             <mat-form-field appearance="fill" style="width: 270px;">
                 <mat-label>Tip problema</mat-label>
                 <mat-select value="ToDo1">
@@ -118,7 +120,7 @@
                 </mat-select>
             </mat-form-field>
         </div>
-        <div class="col-sm d-flex">
+        <div class="col-sm-3 d-flex pt-3">
             <mat-form-field appearance="fill" >
                 <mat-label>Izlazna kolona</mat-label>
                 <mat-select>
diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index 18e38203..78abe438 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -19,7 +19,7 @@ export class ColumnTableComponent implements OnInit {
   Object = Object;
   Encoding = Encoding;
   NullValueOptions = NullValueOptions;
-
+  testSetDistribution:number=70;
   constructor(private datasetService: DatasetsService, public dialog: MatDialog) { 
     //ovo mi nece trebati jer primam dataset iz druge komponente
     this.datasetService.getMyDatasets().subscribe((datasets) => {
-- 
cgit v1.2.3


From 9a8e08fbae8e5c08abebc977f51eb275fee66bca Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Tue, 26 Apr 2022 19:33:00 +0200
Subject: Dodata realtime promena % po pomeranju slidera.

---
 frontend/src/app/_elements/column-table/column-table.component.html | 5 +++--
 frontend/src/app/_elements/column-table/column-table.component.ts   | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'frontend/src/app/_elements/column-table/column-table.component.html')

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index 4418d21b..c8b1e477 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -106,8 +106,9 @@
 <div class="container text-offwhite belowColumn">
     <div class="row " >
         <div class="col-sm slider rounded">
-            <div class="text-center">Trening<mat-slider thumbLabel min="10" max="90" step="10" [(ngModel)]="testSetDistribution"></mat-slider>Test</div>
-            <div class="text-center">Trening:<b>{{testSetDistribution}}%</b> : Test:<b>{{100-testSetDistribution}}%</b></div>
+            <div class="text-center pt-3 pb-0 mb-0"><b>{{testSetDistribution}}%</b> : <b>{{100-testSetDistribution}}%</b></div>
+            <div class="text-center pt-0 mt-0">Trening<mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>Test</div>
+            
         </div>
         
         <div class="col-sm-3 d-flex pt-3">
diff --git a/frontend/src/app/_elements/column-table/column-table.component.ts b/frontend/src/app/_elements/column-table/column-table.component.ts
index 78abe438..c9b3b887 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -5,6 +5,7 @@ import { DatasetsService } from 'src/app/_services/datasets.service';
 import { EncodingDialogComponent } from 'src/app/_modals/encoding-dialog/encoding-dialog.component';
 import { MatDialog } from '@angular/material/dialog';
 import { MissingvaluesDialogComponent } from 'src/app/_modals/missingvalues-dialog/missingvalues-dialog.component';
+import { MatSliderChange } from '@angular/material/slider';
 
 @Component({
   selector: 'app-column-table',
@@ -118,4 +119,9 @@ export class ColumnTableComponent implements OnInit {
         this.resetMissingValuesTreatment(selectedMissingValuesOption);
     });
   }
+  updateTestSet(event:MatSliderChange){
+    this.testSetDistribution=event.value!;
+  }
+
+
 }
-- 
cgit v1.2.3