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

4 files changed, 248 insertions, 194 deletions

diff --git a/frontend/src/app/_pages/add-model/add-model.component.css b/frontend/src/app/_pages/add-model/add-model.component.css
index e69de29b..5184733d 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.css
+++ b/frontend/src/app/_pages/add-model/add-model.component.css
@@ -0,0 +1,14 @@
+#header {
+    background-color: #003459;
+    padding-top: 25px;
+    padding-bottom: 20px;
+}
+#header h1 {
+    font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;
+    text-align: center;
+    color: white;
+}
+
+#container {
+    border-radius: 8px;
+}
\ No newline at end of file
diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html
index 08e27dd7..f5270127 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -1,190 +1,177 @@
-<div class="container p-3" style="background-color: rgb(249, 251, 253); min-height: 100%;">
-
-    <h2 class="my-4 text-primary"> Nov model: </h2>
-    <div class="form-group row align-items-center">
-        <label for="name" class="col-sm-2 col-form-label col-form-label-lg">Naziv</label>
-        <div class="col-sm-7">
-            <input type="text" class="form-control form-control-lg" name="name" placeholder="Naziv..."
-                [(ngModel)]="newModel.name">
-        </div>
-
-        <div class="col-sm-3">
-            <input type="text" class="form-control-plaintext text-center" id="dateCreated" placeholder="--/--/--"
-                value="{{newModel.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="desc" class="col-sm-2 col-form-label">Opis</label>
-        <div class="col-sm-10">
-            <textarea class="form-control" name="desc" rows="3" [(ngModel)]="newModel.description"></textarea>
-        </div>
-    </div>
-
-    <!--<div class="form-group row">
-    <label for="value" class="col-4">Vrednost</label>
-    <div class="input-group">
-        <input type="number" min="0" class="form-control" name="value" placeholder="Vrednost..."
-            [(ngModel)]="newModel.value">
-        <div class="input-group-prepend">
-            <span class="input-group-text">#</span>
-        </div>
-        <input type="number" min="1" class="form-control" name="count" placeholder="Br." [(ngModel)]="newModel.count">
-        <input type="text" class="form-control" name="sum" placeholder="Suma"
-            value="=({{newModel.value * newModel.count}})" readonly>
-        </div>
-    </div>-->
-
-    <div class="my-4">
-        <label for="dataset">Izvor podataka:</label>
-        <app-dataset-load id="dataset"></app-dataset-load>
-    </div>
-
-    <div class="form-group row my-2">
-        <div class="col-sm-2 col-form-label">
-            <label for="type" class="form-check-label">Automatska podela test skupa:
-                <input class="mx-3 form-check-input" type="checkbox" [checked]="newModel.randomTestSet"
-                    (change)="newModel.randomTestSet = !newModel.randomTestSet">
-            </label>
-
-        </div>
-        <div>
-            <mat-slider min="0.1" max="0.9" step="0.1" value="0.2" name="randomTestSetDistribution" thumbLabel
-                class="w-50" [disabled]="!newModel.randomTestSet" [(ngModel)]="newModel.randomTestSetDistribution">
-            </mat-slider>
-        </div>
-    </div>
-
-    <h3> Parametri treniranja </h3>
-
-    <div class="form-group row my-2">
-        <label for="type" class="col-sm-2 col-form-label">Tip mreže: </label>
-        <div class="col-sm-10">
-            <select id=typeOptions class="form-control" name="type" [(ngModel)]="newModel.type">
-                <option *ngFor="let option of Object.keys(ANNType); let optionName of Object.values(ANNType)"
-                    [value]="option">
-                    {{ optionName }}
-                </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="encoding" class="col-sm-2 col-form-label">Enkoding: </label>
-        <div class="col-sm-10">
-            <select id=encodingOptions class="form-control" name="encoding" [(ngModel)]="newModel.encoding">
-                <option *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)"
-                    [value]="option">
-                    {{ optionName }}
+<div id="header">
+    <h1>Napravite svoj model veštačke neuronske mreže</h1>
+</div>
+
+<div id="wrapper">
+    
+    <div id="container" class="container p-5" style="background-color: white; min-height: 100%;">
+        
+        <div class="form-group row mb-4 d-flex"> <!--justify-content-center-->
+            <h2 class="col-sm-2" style="color: #00171f"> Nov model: </h2>
+            <div class="col-sm-3">
+                <div class="mb-4">
+                    <label for="name" class="col-form-label">Naziv modela:</label>
+                    <input type="text" class="form-control" name="name" placeholder="Naziv..."
+                        [(ngModel)]="newModel.name">
+                </div>
+                <div class="d-inline-flex align-items-center">
+                    <label for="dateCreated" class="col-form-label">Datum:</label> &nbsp;&nbsp;
+                    <input type="text" class="form-control-plaintext" id="dateCreated" placeholder="--/--/--"
+                        value="{{newModel.dateCreated | date: 'dd/MM/yyyy'}}" readonly>
+                </div>
+            </div>
+            <div class="col-sm-5">
+                <label for="desc" class="col-sm-2 col-form-label">Opis:</label>
+                <div>
+                    <textarea class="form-control" name="desc" rows="3" [(ngModel)]="newModel.description"></textarea>
+                </div>
+            </div>
+        </div>
+    
+        <div class="my-5 justify-content-center">
+            <h2>Izvor podataka:</h2>
+            <app-dataset-load id="dataset" (loaded)="datasetLoaded = true"></app-dataset-load>
+        </div>
+
+        <div *ngIf="datasetLoaded" class="mt-2">
+            <div *ngIf="datasetLoadComponent" class="row">
+              <div class="col d-flex justify-content-center">
+                <h3>Izaberite ulazne kolone:</h3> 
+                <div id="divInputs" class="form-check">
+                  <br>
+                  <div *ngFor="let item of datasetLoadComponent.dataset.header; let i = index">  
+                    <input *ngIf="i == 0" class="form-check-input" type="checkbox" value="{{item}}" id="cb_{{item}}" name="cbs" checked>
+                    <input *ngIf="i != 0" class="form-check-input" type="checkbox" value="{{item}}" id="cb_{{item}}" name="cbs">&nbsp;
+                    <label class="form-check-label" for="cb_{{item}}">
+                      {{item}}
+                    </label>
+                  </div>
+                </div>
+              </div>
+              <div class="col d-flex justify-content-left">
+                <h3>Izaberite izlaznu kolonu:</h3>
+                <div id="divOutputs" class="form-check">
+                  <br>
+                  <div *ngFor="let item of datasetLoadComponent.dataset.header; let i = index">
+                    <input *ngIf="i == 0" class="form-check-input" type="radio" value="{{item}}" id="rb_{{item}}" name="rbs" checked>
+                    <input *ngIf="i != 0" class="form-check-input" type="radio" value="{{item}}" id="rb_{{item}}" name="rbs">&nbsp;
+                    <label class="form-check-label" for="rb_{{item}}">
+                      {{item}}
+                    </label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        
+        <h2>Parametri treniranja:</h2>
+
+        <div class="row">
+            <div class="col-2 mt-4">
+                <label for="type" class="col-form-label">Tip mreže: </label>
+                <select id=typeOptions class="form-control" name="type" [(ngModel)]="newModel.type">
+                    <option *ngFor="let option of Object.keys(ANNType); let optionName of Object.values(ANNType)"
+                        [value]="option">
+                        {{ optionName }}
+                    </option>
+                </select>
+            </div>
+            <div class="col-1 mt-4">
+                <label for="encoding" class="col-form-label">Enkoding: </label>
+                <select id=encodingOptions class="form-control" name="encoding" [(ngModel)]="newModel.encoding">
+                    <option *ngFor="let option of Object.keys(Encoding); let optionName of Object.values(Encoding)"
+                        [value]="option">
+                        {{ optionName }}
+                    </option>
+                </select>
+            </div>
+            <div class="col-1 mt-4">
+                <label for="optimizer" class="col-form-label">Optimizacija: </label>
+                <select id=optimizerOptions class="form-control" name="optimizer" [(ngModel)]="newModel.optimizer">
+                    <option *ngFor="let option of Object.keys(Optimizer); let optionName of Object.values(Optimizer)"
+                        [value]="option">
+                        {{ optionName }}
+                    </option>
+                </select>
+            </div>
+            <div class="col mt-4"> 
+                <label for="lossFunction" class="col-form-label">Funkcija obrade gubitka: </label>
+                <select id=lossFunctionOptions class="form-control" name="lossFunction" [(ngModel)]="newModel.lossFunction">
+                    <option *ngFor="let option of Object.keys(LossFunction); let optionName of Object.values(LossFunction)"
+                        [value]="option">
+                        {{ optionName }}
+                    </option>
+                </select>
+            </div>
+            <div class="col-2">
+                <label for="inputLayerActivationFunction" class="col-form-label">Funkcija aktivacije<br>ulaznog sloja:</label>
+                <select id=inputLayerActivationFunctionOptions class="form-control" name="inputLayerActivationFunction"
+                    [(ngModel)]="newModel.inputLayerActivationFunction">
+                    <option
+                        *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
+                        [value]="option">
+                        {{ optionName }}
+                    </option>
+                </select>
+            </div>
+            <div class="col">
+                <label for="hiddenLayerActivationFunction" class="col-form-label">Funkcija aktivacije<br>skrivenih slojeva:</label>
+                <select id=hiddenLayerActivationFunctionOptions class="form-control" name="hiddenLayerActivationFunction"
+                    [(ngModel)]="newModel.hiddenLayerActivationFunction">
+                    <option
+                        *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
+                        [value]="option">
+                        {{ optionName }}
                 </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="optimizer" class="col-sm-2 col-form-label">Optimizacija: </label>
-        <div class="col-sm-10">
-            <select id=optimizerOptions class="form-control" name="optimizer" [(ngModel)]="newModel.optimizer">
-                <option *ngFor="let option of Object.keys(Optimizer); let optionName of Object.values(Optimizer)"
-                    [value]="option">
-                    {{ optionName }}
-                </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="lossFunction" class="col-sm-2 col-form-label">Funkcija obrade gubitka: </label>
-        <div class="col-sm-10">
-            <select id=lossFunctionOptions class="form-control" name="lossFunction" [(ngModel)]="newModel.lossFunction">
-                <option *ngFor="let option of Object.keys(LossFunction); let optionName of Object.values(LossFunction)"
-                    [value]="option">
-                    {{ optionName }}
-                </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="inputNeurons" class="col-sm-2 col-form-label">Broj ulaznih neurona: </label>
-        <div class="col-sm-10">
-            <input type="number" min="1" class="form-control" name="inputNeurons" [(ngModel)]="newModel.inputNeurons">
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="inputLayerActivationFunction" class="col-sm-2 col-form-label">Funkcija aktivacije ulaznog sloja:
-        </label>
-        <div class="col-sm-10">
-            <select id=inputLayerActivationFunctionOptions class="form-control" name="inputLayerActivationFunction"
-                [(ngModel)]="newModel.inputLayerActivationFunction">
-                <option
-                    *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
-                    [value]="option">
-                    {{ optionName }}
-                </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="hiddenLayerNeurons" class="col-sm-2 col-form-label">Broj neurona skrivenih slojeva: </label>
-        <div class="col-sm-10">
-            <input type="number" min="1" class="form-control" name="hiddenLayerNeurons"
-                [(ngModel)]="newModel.hiddenLayerNeurons">
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="hiddenLayerActivationFunction" class="col-sm-2 col-form-label">Funkcija aktivacije skrivenih
-            slojeva:
-        </label>
-        <div class="col-sm-10">
-            <select id=hiddenLayerActivationFunctionOptions class="form-control" name="hiddenLayerActivationFunction"
-                [(ngModel)]="newModel.hiddenLayerActivationFunction">
-                <option
-                    *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
-                    [value]="option">
-                    {{ optionName }}
-                </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="hiddenLayers" class="col-sm-2 col-form-label">Broj skrivenih slojeva: </label>
-        <div class="col-sm-10">
-            <input type="number" min="1" class="form-control" name="hiddenLayers" [(ngModel)]="newModel.hiddenLayers">
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="outputLayerActivationFunction" class="col-sm-2 col-form-label">Funkcija aktivacije izlaznog
-            sloja:
-        </label>
-        <div class="col-sm-10">
-            <select id=outputLayerActivationFunctionOptions class="form-control" name="outputLayerActivationFunction"
-                [(ngModel)]="newModel.outputLayerActivationFunction">
-                <option
-                    *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
-                    [value]="option">
-                    {{ optionName }}
-                </option>
-            </select>
-        </div>
-    </div>
-
-    <div class="form-group row my-2">
-        <label for="batchSize" class="col-sm-2 col-form-label">Broj uzorka po iteraciji: </label>
-        <div class="col-sm-10">
-            <input type="number" min="1" class="form-control" name="batchSize" [(ngModel)]="newModel.batchSize">
-        </div>
-    </div>
-
-    <div class=" form-group row my-4">
-        <div class="col-4"></div>
-        <button class="btn btn-lg btn-primary col-4" (click)="addModel();">Dodaj</button>
-        <div class="col-4"></div>
-    </div>
-
-</div>
\ No newline at end of file
+                </select>
+            </div>
+            <div class="col">
+                <label for="outputLayerActivationFunction" class="col-form-label">Funkcija aktivacije<br>izlaznog sloja:</label>
+                <select id=outputLayerActivationFunctionOptions class="form-control" name="outputLayerActivationFunction"
+                    [(ngModel)]="newModel.outputLayerActivationFunction">
+                    <option
+                        *ngFor="let option of Object.keys(ActivationFunction); let optionName of Object.values(ActivationFunction)"
+                        [value]="option">
+                        {{ optionName }}
+                    </option>
+                </select>
+            </div>
+        </div>
+
+        <div class="row mt-5">
+            <div class="col-2">
+                <label for="inputNeurons" class="col-form-label">Broj ulaznih neurona: </label> <!--UMESTO OVOGA IDE NASUMICAN REDOSLED? YES/NO-->
+                <input type="number" min="1" class="form-control" name="inputNeurons" [(ngModel)]="newModel.inputNeurons">
+            </div>
+            <div class="col-2">
+                <label for="hiddenLayers" class="col-form-label">Broj skrivenih slojeva: </label>
+                <input type="number" min="1" class="form-control" name="hiddenLayers" [(ngModel)]="newModel.hiddenLayers">
+            </div>
+            <div class="col-3 ">
+                <label for="hiddenLayerNeurons" class="col-form-label">Broj neurona skrivenih slojeva: </label>
+                <input type="number" min="1" class="form-control" name="hiddenLayerNeurons" [(ngModel)]="newModel.hiddenLayerNeurons">
+            </div>
+            <div class="col-2">
+                <label for="batchSize" class="col-form-label">Broj uzorka po iteraciji: </label>
+                <input type="number" min="1" class="form-control" name="batchSize" [(ngModel)]="newModel.batchSize">
+            </div>
+            <div class="col-3 mt-1">
+                <label for="type" class="form-check-label mb-3">&nbsp;&nbsp;Podela test skupa:
+                    <input class="mx-3 form-check-input" type="checkbox" [checked]="newModel.randomTestSet"
+                        (change)="newModel.randomTestSet = !newModel.randomTestSet">
+                </label>
+                <mat-slider min="0.1" max="0.9" step="0.1" value="0.2" name="randomTestSetDistribution" thumbLabel
+                     [disabled]="!newModel.randomTestSet" [(ngModel)]="newModel.randomTestSetDistribution">
+                </mat-slider>
+            </div>
+        </div>
+
+        <br><br>
+        <div class="form-group row mt-5">
+            <div class="col-4"></div>
+            <button class="btn btn-lg col-4" style="background-color:#003459; color:white;" (click)="addModel();">Napravi model</button>
+            <div class="col-4"></div>
+        </div>
+
+    </div>
+</div>
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 3cb47d61..c18ad324 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -1,6 +1,9 @@
-import { Component, OnInit } from '@angular/core';
+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 { DatasetLoadComponent } from 'src/app/_elements/dataset-load/dataset-load.component';
+import { ModelsService } from 'src/app/_services/models.service';
+
 
 @Component({
   selector: 'app-add-model',
@@ -9,7 +12,10 @@ import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer } from '
 })
 export class AddModelComponent implements OnInit {
 
-  newModel: Model
+  @ViewChild(DatasetLoadComponent) datasetLoadComponent?: DatasetLoadComponent;
+  datasetLoaded: boolean = false;
+
+  newModel: Model;
 
   ANNType = ANNType;
   Encoding = Encoding;
@@ -18,7 +24,7 @@ export class AddModelComponent implements OnInit {
   Optimizer = Optimizer;
   Object = Object;
 
-  constructor() {
+  constructor(private models: ModelsService) {
     this.newModel = new Model();
   }
 
@@ -26,7 +32,54 @@ export class AddModelComponent implements OnInit {
   }
 
   addModel() {
-    //TODO
+    if (this.datasetLoadComponent)
+      this.models.addDataset(this.datasetLoadComponent?.dataset);
+
+    this.getCheckedInputCols();
+    this.getCheckedOutputCol();
+    if (this.validationInputsOutput()) 
+      this.models.addModel(this.newModel).subscribe((response) => {
+        console.log(response);
+      });
+  }
+
+  getCheckedInputCols() {
+    this.newModel.inputColumns = [];
+    let checkboxes = document.getElementsByName("cbs");
+
+    for (let i = 0; i < checkboxes.length; i++) {
+      let thatCb = <HTMLInputElement>checkboxes[i];
+      if (thatCb.checked)
+        this.newModel.inputColumns.push(thatCb.value);
+    }
+    //console.log(this.checkedInputCols);
+  }
+  getCheckedOutputCol() {
+    this.newModel.columnToPredict = '';
+    let radiobuttons = document.getElementsByName("rbs");
+
+    for (let i = 0; i < radiobuttons.length; i++) {
+      let thatRb = <HTMLInputElement>radiobuttons[i];
+      if (thatRb.checked) {
+        this.newModel.columnToPredict = thatRb.value;
+        break; 
+      }
+    }
+    //console.log(this.checkedOutputCol);
+  }
+  validationInputsOutput() : boolean {
+    if (this.newModel.inputColumns.length == 0) {
+      alert("Molimo Vas da izaberete ulaznu kolonu/kolone za mrežu.")
+      return false;
+    } 
+    for (let i = 0; i < this.newModel.inputColumns.length; i++) {  
+      if (this.newModel.inputColumns[i] == this.newModel.columnToPredict) {
+        let colName = this.newModel.columnToPredict;
+        alert("Izabrali ste istu kolonu (" + colName + ") kao ulaznu i izlaznu iz mreže. Korigujte izbor.");
+        return false;
+      }
+    }
+    return true;
   }
 
 }
diff --git a/frontend/src/app/_pages/home/home.component.html b/frontend/src/app/_pages/home/home.component.html
index b17b9a56..274f0fd8 100644
--- a/frontend/src/app/_pages/home/home.component.html
+++ b/frontend/src/app/_pages/home/home.component.html
@@ -1,4 +1,4 @@
-<div class="d-flex flex-column align-items-center">
+<div class="d-flex flex-column align-items-center bg-light">
     <img src="../../../assets/svg/logo.svg" class="bi me-2" width="256" height="256" role="img">
     <div *ngIf="shared.loggedIn" class="d-flex flex-column align-items-center">
         <h2 class="my-4">Započnite sa treniranjem!</h2>