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

3 files changed, 42 insertions, 9 deletions

diff --git a/frontend/src/app/_pages/experiment/experiment.component.css b/frontend/src/app/_pages/experiment/experiment.component.css
index 36c35484..4c063f87 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.css
+++ b/frontend/src/app/_pages/experiment/experiment.component.css
@@ -52,4 +52,16 @@ mat-stepper {
     width: 98%;
     height: 98%;
     overflow-y: auto;
-}
\ No newline at end of file
+}
+.ekspName{
+    font-weight: bold;
+    font-size: large;
+}
+
+
+.addedElement{
+    color:var(--ns-accent);
+}
+.text-overflow {
+    overflow-wrap: break-word;
+}
diff --git a/frontend/src/app/_pages/experiment/experiment.component.html b/frontend/src/app/_pages/experiment/experiment.component.html
index 28bacf1f..a2ede838 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.html
+++ b/frontend/src/app/_pages/experiment/experiment.component.html
@@ -1,28 +1,48 @@
 <div class="container-fluid p-0 text-offwhite holder" style="height: calc(100vh - 64px); text-align: center;">
     <div class="d-flex flex-colum align-items-center sidenav">
+        <div>
+        <div class="ekspName " style="width: 250px;">
+            <div class="text-overflow" *ngIf="experiment.name=='exp1'" style="width: 250px;">
+                Novi Eksperiment
+            </div>
+            <div class="text-overflow" *ngIf="experiment.name!='exp1'" style="width: 250px;">
+                {{experiment.name}}
+            </div>
+
+        </div>
         <mat-stepper orientation="vertical" (selectionChange)="changePage($event)">
             <mat-step>
                 <!--editable="false"-->
-                <ng-template matStepLabel><span class="label">Izvor podataka</span></ng-template>
+                <ng-template matStepLabel>
+                    <span class="label" *ngIf="dataset==undefined">Izvor podataka</span>
+                    <span class="label addedElement" *ngIf="dataset!=undefined">{{dataset.name}}</span>
+                </ng-template>
                 <ng-template matStepContent>
-                    <p>Izaberite vas izvor podataka</p>
+                    <p class="text-left">Izaberite vas izvor podataka</p>
                 </ng-template>
             </mat-step>
             <mat-step>
-                <ng-template matStepLabel> <span class="label">Odabir kolona</span></ng-template>
+                <ng-template matStepLabel>
+                    <span class="label addedElement" *ngIf="experiment.name!='exp1'">Predvideti:{{experiment.outputColumn}}</span>
+                    <span class="label" *ngIf="experiment.name=='exp1'">Odabir kolona</span>
+                </ng-template>
                 <ng-template matStepContent>
-                    <p>Pripremite podatke i izaberite izlazne kolone</p>
+                    <p class="text-left">Pripremite podatke i izaberite izlazne kolone</p>
                 </ng-template>
             </mat-step>
             <mat-step>
-                <ng-template matStepLabel><span class="label">Treniranje</span></ng-template>
-                <p>Odaberite parametre i trenirajte model</p>
+                <ng-template matStepLabel>
+                    <span class="label addedElement" *ngIf="modelToTrain!=undefined">{{modelToTrain.name}}</span>
+                    <span class="label" *ngIf="modelToTrain==undefined">Treniranje</span>
+                </ng-template>
+                <p class="text-left">Odaberite parametre i trenirajte model</p>
             </mat-step>
             <mat-step>
                 <ng-template matStepLabel><span class="label">Pregled rezultata treniranja</span></ng-template>
-                <p>Pregledajte tok treniranja i grafički prikaz rezultata</p>
+                <p class="text-left">Pregledajte tok treniranja i grafički prikaz rezultata</p>
             </mat-step>
         </mat-stepper>
+        </div>
     </div>
     <div #stepsContainer class="steps-container">
         <div #steps id="step_1" class="step-content">
@@ -46,4 +66,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/frontend/src/app/_pages/experiment/experiment.component.ts b/frontend/src/app/_pages/experiment/experiment.component.ts
index 97029565..abf4b697 100644
--- a/frontend/src/app/_pages/experiment/experiment.component.ts
+++ b/frontend/src/app/_pages/experiment/experiment.component.ts
@@ -157,6 +157,7 @@ export class ExperimentComponent implements AfterViewInit {
     this.dataset = d;
 
     this.columnTable.loadDataset(this.dataset);
+    
   }
 
   modelToTrain?: Model;