From 3e1dd2a20b4cbb3fd18c097d287c175adfad2997 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 11 May 2022 23:36:05 +0200
Subject: Dodata opcija ,,Nema enkodiranja" kod numerickih kolona. Sredjeno
 globalno podesavanje enkodinga.

---
 .../_elements/column-table/column-table.component.html   |  3 +++
 .../app/_elements/column-table/column-table.component.ts | 16 +++++++++++++---
 .../_modals/encoding-dialog/encoding-dialog.component.ts | 11 ++++++++---
 3 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'frontend/src/app')

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 59c1899b..d07d50b2 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -143,6 +143,9 @@
                             <td *ngFor="let colInfo of dataset.columnInfo; let i = index" class="pad-fix" [ngClass]="{'text-disabled' : !columnsChecked[i]}">
                                 <mat-form-field>
                                     <mat-select matNativeControl [(value)]="experiment.encodings[i].encoding" [disabled]="!columnsChecked[i] || experiment.columnTypes[i] == ColumnType.numerical || colInfo.columnName == experiment.outputColumn" (selectionChange)="columnTableChangeDetected()">
+                                        <mat-option [value]="Encoding.Label" *ngIf="experiment.columnTypes[i] == ColumnType.numerical || colInfo.columnName == experiment.outputColumn" [selected]="experiment.columnTypes[i] == ColumnType.numerical || colInfo.columnName == experiment.outputColumn">
+                                            Nema enkodiranja
+                                        </mat-option>
                                         <mat-option *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)" [value]="option">
                                             {{ optionName }}
                                         </mat-option>
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 b3fcf9a3..b9e39092 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -176,20 +176,30 @@ export class ColumnTableComponent implements AfterViewInit {
   resetColumnEncodings(encodingType: Encoding) {
     if (this.experiment != undefined && this.dataset != undefined) {
       this.experiment.encodings = [];
-      for (let i = 0; i < this.dataset?.columnInfo.length; i++) {
+      for (let i = 0; i < this.dataset.columnInfo.length; i++) {
         this.experiment.encodings.push(new ColumnEncoding(this.dataset?.columnInfo[i].columnName, encodingType));
         //console.log(this.experiment.encodings);
       }
       this.columnTableChangeDetected();
     }
   }
+  resetColumnEncodingsGlobalSetting(encodingType: Encoding) {
+    if (this.experiment != undefined && this.dataset != undefined) {
+      for (let i = 0; i < this.dataset.columnInfo.length; i++) {
+        if (this.experiment.columnTypes[i] == ColumnType.categorical && this.dataset.columnInfo[i].columnName != this.experiment.outputColumn) //promeni
+          this.experiment.encodings[i].encoding = encodingType; 
+      }
+      this.columnTableChangeDetected();
+    }
+  }
   openEncodingDialog() {
     const dialogRef = this.dialog.open(EncodingDialogComponent, {
-      width: '400px'
+      width: '400px',
+      data: { experiment: this.experiment, dataset: this.dataset }
     });
     dialogRef.afterClosed().subscribe(selectedEncoding => {
       if (selectedEncoding != undefined)
-        this.resetColumnEncodings(selectedEncoding);
+        this.resetColumnEncodingsGlobalSetting(selectedEncoding);
     });
   }
 
diff --git a/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.ts b/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.ts
index 231d81a6..9c45d7b6 100644
--- a/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.ts
+++ b/frontend/src/app/_modals/encoding-dialog/encoding-dialog.component.ts
@@ -1,7 +1,10 @@
 import { Component, OnInit } from '@angular/core';
-import { MatDialogRef } from '@angular/material/dialog';
-import { Encoding } from 'src/app/_data/Experiment';
-
+import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import { ColumnType, Encoding } from 'src/app/_data/Experiment';
+import Experiment from 'src/app/_data/Experiment';
+import { ExperimentsService } from 'src/app/_services/experiments.service';
+import { Inject} from '@angular/core';
+import Dataset from 'src/app/_data/Dataset';
 
 @Component({
   selector: 'app-encoding-dialog',
@@ -13,6 +16,7 @@ export class EncodingDialogComponent implements OnInit {
   selectedEncodingType?: Encoding;
   Encoding = Encoding;
   Object = Object;
+  categoricalColumnExists: boolean = true;
 
   constructor(public dialogRef: MatDialogRef<EncodingDialogComponent>) 
   { 
@@ -20,6 +24,7 @@ export class EncodingDialogComponent implements OnInit {
   }
 
   ngOnInit(): void {
+
   }
 
   onNoClick() {
-- 
cgit v1.2.3