Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into Redesign

1 files changed, 13 insertions, 2 deletions

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 3f958aee..1946c1f1 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, ElementRef, EventEmitter, Input, OnInit, Output, ViewChildren } from '@angular/core';
-import Dataset from 'src/app/_data/Dataset';
+import Dataset, { ColumnType } from 'src/app/_data/Dataset';
 import Experiment, { ColumnEncoding, Encoding, NullValReplacer, NullValueOptions } from 'src/app/_data/Experiment';
 import { DatasetsService } from 'src/app/_services/datasets.service';
 import { EncodingDialogComponent } from 'src/app/_modals/encoding-dialog/encoding-dialog.component';
@@ -22,6 +22,7 @@ export class ColumnTableComponent implements AfterViewInit {
   Object = Object;
   Encoding = Encoding;
   NullValueOptions = NullValueOptions;
+  ColumnType = ColumnType;
   tableData?: any[][];
   nullValOption: string[] = [];
 
@@ -34,7 +35,9 @@ export class ColumnTableComponent implements AfterViewInit {
 
   ngAfterViewInit(): void {
     this.datasetService.getMyDatasets().subscribe((datasets) => {
-      this.dataset = datasets[0];
+      this.dataset = datasets[1];
+
+      this.setColumnTypeInitial();
       this.experiment = new Experiment();
       this.dataset.columnInfo.forEach(column => {
         this.columnsChecked.push(true);
@@ -56,6 +59,14 @@ export class ColumnTableComponent implements AfterViewInit {
     });
   }
 
+  setColumnTypeInitial() {
+    if (this.dataset != undefined) {
+      for (let i = 0; i < this.dataset.columnInfo.length; i++) {
+        this.dataset.columnInfo[i].columnType = (this.dataset.columnInfo[i].isNumber) ? ColumnType.numerical : ColumnType.categorical;
+      }
+    }
+  }
+
   setDeleteColumnsForMissingValTreatment() {
     if (this.experiment != undefined) {
       this.experiment.nullValues = NullValueOptions.DeleteRows;