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

# Conflicts:
#	frontend/src/app/_elements/form-model/form-model.component.ts

1 files changed, 9 insertions, 3 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 e41cd51d..44a15f22 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.ts
+++ b/frontend/src/app/_elements/column-table/column-table.component.ts
@@ -24,6 +24,7 @@ export class ColumnTableComponent implements AfterViewInit {
   @Input() experiment!: Experiment;
   @Output() okPressed: EventEmitter<string> = new EventEmitter();
   @Output() columnTableChanged = new EventEmitter();
+  @Output() experimentChanged = new EventEmitter();
 
   Object = Object;
   Encoding = Encoding;
@@ -175,7 +176,7 @@ export class ColumnTableComponent implements AfterViewInit {
   }
   openEncodingDialog() {
     const dialogRef = this.dialog.open(EncodingDialogComponent, {
-      width: '300px'
+      width: '400px'
     });
     dialogRef.afterClosed().subscribe(selectedEncoding => {
       if (selectedEncoding != undefined)
@@ -231,14 +232,19 @@ export class ColumnTableComponent implements AfterViewInit {
     });
     dialogRef.afterClosed().subscribe(experiment => {
       if (experiment) {
-        this.experiment = experiment;
+        Object.assign(this.experiment, experiment);
+        this.experiment._columnsSelected = true;
+        this.experimentChanged.emit();
+        console.log(this.experiment);
       }
     });
   }
 
   openUpdateExperimentDialog() {
     this.experimentService.updateExperiment(this.experiment).subscribe((response) => {
-      this.experiment = response;
+      Object.assign(this.experiment, response);
+      this.experiment._columnsSelected = true;
+      this.experimentChanged.emit();
       Shared.openDialog("Izmena eksperimenta", "Uspešno ste izmenili podatke o eksperimentu.");
     });
   }