1 files changed, 36 insertions, 34 deletions

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 7bfb7204..1c9198a3 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
-import Model from 'src/app/_data/Model';
-import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer } from 'src/app/_data/Model';
+import Model, { ReplaceWith } from 'src/app/_data/Model';
+import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer, NullValueOptions } from 'src/app/_data/Model';
 import { DatasetLoadComponent } from 'src/app/_elements/dataset-load/dataset-load.component';
 import { ModelsService } from 'src/app/_services/models.service';
 import shared from 'src/app/Shared';
 import Dataset from 'src/app/_data/Dataset';
+import { DatatableComponent } from 'src/app/_elements/datatable/datatable.component';
 
 
 @Component({
@@ -15,6 +16,7 @@ import Dataset from 'src/app/_data/Dataset';
 export class AddModelComponent implements OnInit {
 
   @ViewChild(DatasetLoadComponent) datasetLoadComponent?: DatasetLoadComponent;
+  @ViewChild(DatatableComponent) datatable?: DatatableComponent;
   datasetLoaded: boolean = false;
 
   newModel: Model;
@@ -24,7 +26,10 @@ export class AddModelComponent implements OnInit {
   ActivationFunction = ActivationFunction;
   LossFunction = LossFunction;
   Optimizer = Optimizer;
+  NullValueOptions = NullValueOptions;
+  ReplaceWith = ReplaceWith;
   Object = Object;
+  document = document;
   shared = shared;
 
   selectedOutputColumnVal: string = '';
@@ -33,6 +38,8 @@ export class AddModelComponent implements OnInit {
   myDatasets?: Dataset[];
   existingDatasetSelected: boolean = false;
   selectedDataset?: Dataset;
+  datasetFile?: any[];
+  datasetHasHeader?: boolean = true;
 
   tempTestSetDistribution: number = 90;
 
@@ -62,9 +69,9 @@ export class AddModelComponent implements OnInit {
 
   addModel() {
     if (!this.showMyDatasets)
-      this.saveModelWithNewDataset(); 
+      this.saveModelWithNewDataset();
     else
-      this.saveModelWithExistingDataset(); 
+      this.saveModelWithExistingDataset();
   }
 
   trainModel() {
@@ -124,14 +131,14 @@ export class AddModelComponent implements OnInit {
     if (this.selectedDataset) { //dataset je izabran
       this.getCheckedInputCols();
       this.getCheckedOutputCol();
-  
-      if (this.validationInputsOutput()) { 
+
+      if (this.validationInputsOutput()) {
         this.newModel.datasetId = this.selectedDataset._id;
-        
+
         this.newModel.randomTestSetDistribution = 1 - Math.round(this.tempTestSetDistribution / 100 * 10) / 10;
         this.tempTestSetDistribution = 90;
         this.newModel.username = shared.username;
-        
+
         this.models.addModel(this.newModel).subscribe((response) => {
           console.log('ADD MODEL: DONE! REPLY:\n', response);
         }, (error) => {
@@ -147,11 +154,9 @@ export class AddModelComponent implements OnInit {
   getCheckedInputCols() {
     this.newModel.inputColumns = [];
     let checkboxes: any;
-    if (this.showMyDatasets)
-      checkboxes = document.getElementsByName("cbsExisting");
-    else
-      checkboxes = document.getElementsByName("cbsNew"); 
-      
+
+    checkboxes = document.getElementsByName("cbsNew");
+
     for (let i = 0; i < checkboxes.length; i++) {
       let thatCb = <HTMLInputElement>checkboxes[i];
       if (thatCb.checked == true && thatCb.disabled == false)
@@ -162,10 +167,8 @@ export class AddModelComponent implements OnInit {
   getCheckedOutputCol() {
     this.newModel.columnToPredict = '';
     let radiobuttons: any;
-    if (this.showMyDatasets)
-      radiobuttons = document.getElementsByName("rbsExisting");
-    else
-      radiobuttons = document.getElementsByName("rbsNew"); 
+
+    radiobuttons = document.getElementsByName("rbsNew");
 
     for (let i = 0; i < radiobuttons.length; i++) {
       let thatRb = <HTMLInputElement>radiobuttons[i];
@@ -208,6 +211,10 @@ export class AddModelComponent implements OnInit {
       if (datasets[i]._id == dataset._id)
     }*/
 
+
+    //this.datasetFile = csvRecords;
+    this.datasetHasHeader = false;
+
     this.resetCbsAndRbs();
   }
 
@@ -223,17 +230,8 @@ export class AddModelComponent implements OnInit {
   }
   checkAllCbs() {
     let checkboxes: any;
-    //if (this.showMyDatasets)
-      checkboxes = document.getElementsByName("cbsExisting");
-    //else
-      //checkboxes = document.getElementsByName("cbsNew"); 
-      
-    for (let i = 0; i < checkboxes.length; i++) {
-      (<HTMLInputElement>checkboxes[i]).checked = true;
-      (<HTMLInputElement>checkboxes[i]).disabled = false;
-    }
 
-    checkboxes = document.getElementsByName("cbsNew"); 
+    checkboxes = document.getElementsByName("cbsNew");
     for (let i = 0; i < checkboxes.length; i++) {
       (<HTMLInputElement>checkboxes[i]).checked = true;
       (<HTMLInputElement>checkboxes[i]).disabled = false;
@@ -242,16 +240,10 @@ export class AddModelComponent implements OnInit {
   uncheckRbs() {
     this.selectedOutputColumnVal = '';
     let radiobuttons: any;
-    //if (this.showMyDatasets)
-      radiobuttons = document.getElementsByName("rbsExisting");
-    //else
-      //radiobuttons = document.getElementsByName("rbsNew"); 
 
+    radiobuttons = document.getElementsByName("rbsNew");
     for (let i = 0; i < radiobuttons.length; i++)
       (<HTMLInputElement>radiobuttons[i]).checked = false;
-      radiobuttons = document.getElementsByName("rbsNew"); 
-      for (let i = 0; i < radiobuttons.length; i++)
-      (<HTMLInputElement>radiobuttons[i]).checked = false;
   }
 
   refreshMyDatasetList() {
@@ -260,4 +252,14 @@ export class AddModelComponent implements OnInit {
     });
   }
 
+  isNumber(value: string | number): boolean {
+    return ((value != null) &&
+      (value !== '') &&
+      !isNaN(Number(value.toString())));
+  }
+
+
+  getInputById(id: string): HTMLInputElement {
+    return document.getElementById(id) as HTMLInputElement;
+  }
 }