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

# Conflicts:
#	backend/api/api/Models/Dataset.cs
#	backend/api/api/Services/FillAnEmptyDb.cs

3 files changed, 32 insertions, 4 deletions

diff --git a/frontend/src/app/_elements/form-model/form-model.component.css b/frontend/src/app/_elements/form-model/form-model.component.css
index 8c279523..9b55a814 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.css
+++ b/frontend/src/app/_elements/form-model/form-model.component.css
@@ -84,4 +84,12 @@ hr {
 
 .m-2 {
     max-height: 20 rem;
-}
\ No newline at end of file
+}
+
+mat-slider {
+    width: 40%;
+}
+
+.slider {
+    background-color: var(--ns-bg-dark-100);
+}
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 76601465..e51c2cac 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -85,7 +85,23 @@
 
     </div>
 </div>
+<div>
+    <div class="ns-row" style="margin-top: 10px;">
+        <div class="ns-col slider rounded" style="border:1px solid var(--ns-primary);margin-left: 10px;">
+
+            <div class="text-center pt-3 pb-0 mb-0"><b>{{testSetDistribution}}%</b> : <b>{{100-testSetDistribution}}%</b></div>
+            <div class="text-center pt-0 mt-0">Trening
+                <mat-slider min="10" max="90" step="10" [(ngModel)]="testSetDistribution" (input)="updateTestSet($event)"></mat-slider>
+                Test</div>
+        
+        </div>
+        <div class="ns-col slider rounded text-offwhite justify-content-center align-items-center" style="border:1px solid var(--ns-primary);margin-left: 10px;">
+                    <mat-checkbox class="pt-4" color="accent">Nasumični redosled podataka</mat-checkbox>
+        </div>
+        
 
+    </div>
+</div>
 
 <!--kraj unosa parametara-->
 <hr>
@@ -199,4 +215,5 @@
             </mat-select>
         </mat-form-field>
     </div>
-</div>
\ No newline at end of file
+</div>
+
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 2c78cd56..d5c497aa 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.ts
+++ b/frontend/src/app/_elements/form-model/form-model.component.ts
@@ -4,7 +4,7 @@ import Shared from 'src/app/Shared';
 import Experiment from 'src/app/_data/Experiment';
 import Model, { Layer, ActivationFunction, LossFunction, LearningRate, LossFunctionBinaryClassification, LossFunctionMultiClassification, LossFunctionRegression, Metrics, MetricsBinaryClassification, MetricsMultiClassification, MetricsRegression, NullValueOptions, Optimizer, ProblemType, Regularisation, RegularisationRate, BatchSize } from 'src/app/_data/Model';
 import { GraphComponent } from '../graph/graph.component';
-
+import { MatSliderChange } from '@angular/material/slider';
 
 @Component({
   selector: 'app-form-model',
@@ -15,7 +15,7 @@ export class FormModelComponent implements AfterViewInit {
   @ViewChild(GraphComponent) graph!: GraphComponent;
   @Input() forExperiment?: Experiment;
   @Output() selectedModelChangeEvent = new EventEmitter<Model>();
-
+  testSetDistribution: number = 70;
   constructor() { }
 
   ngAfterViewInit(): void {
@@ -132,6 +132,9 @@ export class FormModelComponent implements AfterViewInit {
       this.updateGraph();
     }
   }
+  updateTestSet(event: MatSliderChange) {
+    this.testSetDistribution = event.value!;
+  }