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

2 files changed, 8 insertions, 4 deletions

diff --git a/frontend/src/app/_elements/form-model/form-model.component.html b/frontend/src/app/_elements/form-model/form-model.component.html
index 361e2545..d13cb3aa 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -109,7 +109,7 @@
 
             <div class="col-sm-9">
                 <!-- {{forExperiment._columnsSelected}} -->
-                <app-graph [model]="newModel" *ngIf="forExperiment._columnsSelected" [inputColumns]="forExperiment.inputColumns"></app-graph>
+                <app-graph [model]="newModel" *ngIf="forExperiment._columnsSelected" [inputColumns]="getInputColumns()"></app-graph>
                 <app-graph [model]="newModel" *ngIf="!forExperiment._columnsSelected" [inputColumns]="['Nisu odabrane ulazne kolone']"></app-graph>
             </div>
         </div>
@@ -124,9 +124,9 @@
             <button class="btn-clear btn-icon bubble" (click)="removeLayer()">
                 <mat-icon>remove</mat-icon>
             </button>
-            
+
             <div>{{newModel.hiddenLayers}}</div>
-            
+
             <button class="btn-clear btn-icon bubble" (click)="addLayer()">
                 <mat-icon>add</mat-icon>
             </button>
diff --git a/frontend/src/app/_elements/form-model/form-model.component.ts b/frontend/src/app/_elements/form-model/form-model.component.ts
index 82fa0e95..a98ceaec 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.ts
+++ b/frontend/src/app/_elements/form-model/form-model.component.ts
@@ -149,5 +149,9 @@ export class FormModelComponent implements AfterViewInit {
     this.lossFunction = LossFunctionMultiClassification;
     this.newModel.lossFunction=LossFunction.SparseCategoricalCrossEntropy;
     }
-  }
+  
+}
+getInputColumns() {
+    return this.forExperiment.inputColumns.filter(x => x != this.forExperiment.outputColumn);
+}
 }