From 7b46f81cfbb813638dc3d766878a6088fa47b17b Mon Sep 17 00:00:00 2001
From: Nevena Bojovic <nenabojov@gmail.com>
Date: Sun, 27 Mar 2022 22:34:12 +0200
Subject: Front razno.

---
 frontend/src/app/_data/Model.ts                          | 13 +++++++------
 .../src/app/_pages/add-model/add-model.component.html    | 16 ++++++++++------
 frontend/src/app/_pages/add-model/add-model.component.ts |  7 +++++--
 frontend/src/app/_pages/home/home.component.ts           |  2 ++
 frontend/src/app/_services/home.service.spec.ts          | 16 ++++++++++++++++
 frontend/src/app/_services/home.service.ts               |  9 +++++++++
 6 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 frontend/src/app/_services/home.service.spec.ts
 create mode 100644 frontend/src/app/_services/home.service.ts

diff --git a/frontend/src/app/_data/Model.ts b/frontend/src/app/_data/Model.ts
index f6e01d08..48418d51 100644
--- a/frontend/src/app/_data/Model.ts
+++ b/frontend/src/app/_data/Model.ts
@@ -15,7 +15,7 @@ export default class Model {
         public randomTestSetDistribution: number = 0.1, //0.1-0.9 (10% - 90%) JESTE OVDE ZAKUCANO 10, AL POSLATO JE KAO 0.1 BACK-U
 
         // Neural net training settings
-        public type: ANNType = ANNType.FullyConnected,
+        public type: ProblemType = ProblemType.Regression,
         public encoding: Encoding = Encoding.Label,
         public optimizer: Optimizer = Optimizer.Adam,
         public lossFunction: LossFunction = LossFunction.MeanSquaredError,
@@ -23,8 +23,8 @@ export default class Model {
         public hiddenLayerNeurons: number = 1,
         public hiddenLayers: number = 1,
         public batchSize: number = 5,
-        public inputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
-        public hiddenLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
+        public hiddenLayerActivationFunction = [],
+        //public inputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public outputLayerActivationFunction: ActivationFunction = ActivationFunction.Sigmoid,
         public username: string = '',
         public nullValues: NullValueOptions = NullValueOptions.DeleteRows,
@@ -32,9 +32,10 @@ export default class Model {
     ) { }
 }
 
-export enum ANNType {
-    FullyConnected = 'potpuno povezana',
-    Convolutional = 'konvoluciona'
+export enum ProblemType {
+    Regression = 'regresioni',
+    BinaryClassification = 'binarni-klasifikacioni',
+    MultiClassification = 'multi-klasifikacioni'
 }
 
 // replaceMissing srednja vrednost mean, median, najcesca vrednost (mode)
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 b17093c3..9dde9afe 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -40,11 +40,11 @@
                     Dodajte novi dataset
                 </button>
             </div>
-
+            <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
             <div class="px-5">
                 <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;">
                     <ul class="list-group">
-                        <li class="list-group-item p-3" *ngFor="let dataset of myDatasets"
+                        <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term"
                             [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}">
                             <app-item-dataset name="usersDataset" [dataset]="dataset"
                                 (click)="scrollToNextForm(); selectThisDataset(dataset);"></app-item-dataset>
@@ -71,7 +71,7 @@
                         <br>
                         <div *ngFor="let item of selectedDataset.header; let i = index">
                             <input class="form-check-input" type="checkbox" value="{{item}}" id="cb_{{item}}"
-                                name="cbsNew" checked [disabled]="this.selectedOutputColumnVal == item">&nbsp;
+                                name="cbsNew" [checked] = "this.selectedOutputColumnVal != item" [disabled]="this.selectedOutputColumnVal == item">&nbsp;
                             <label class="form-check-label" for="cb_{{item}}">
                                 {{item}}
                             </label>
@@ -159,11 +159,11 @@
                 <div class="col-1">
                 </div>
                 <div class="col-3">
-                    <label for="type" class="col-form-label">Tip mreže: </label>
+                    <label for="type" class="col-form-label">Tip problema: </label>
                 </div>
                 <div class="col-2">
                     <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)"
+                        <option *ngFor="let option of Object.keys(ProblemType); let optionName of Object.values(ProblemType)"
                             [value]="option">
                             {{ optionName }}
                         </option>
@@ -258,12 +258,14 @@
             </div>
 
             <div class="row p-2">
-                <div class="col-1">
+                
+                 <!--   <div class="col-1">
                 </div>
                 <div class="col-3">
                     <label for="inputLayerActivationFunction" class="col-form-label">Funkcija aktivacije ulaznog
                         sloja:</label>
                 </div>
+               
                 <div class="col-2">
                     <select id=inputLayerActivationFunctionOptions class="form-control"
                         name="inputLayerActivationFunction" [(ngModel)]="newModel.inputLayerActivationFunction">
@@ -276,6 +278,8 @@
                 </div>
                 <div class="col-1">
                 </div>
+                 -->
+                
                 <div class="col-5">
                     <label for="splitYesNo" class="form-check-label">Podela test skupa:&nbsp;&nbsp;
                         <input id="splitYesNo" class="form-check-input" type="checkbox"
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 d6e9dbc5..37672d0a 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,6 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import Model, { ReplaceWith } from 'src/app/_data/Model';
-import { ANNType, Encoding, ActivationFunction, LossFunction, Optimizer, NullValueOptions } from 'src/app/_data/Model';
+import { ProblemType, Encoding, ActivationFunction, LossFunction, Optimizer, NullValueOptions } from 'src/app/_data/Model';
 import { DatasetLoadComponent } from 'src/app/_elements/dataset-load/dataset-load.component';
 import { ModelsService } from 'src/app/_services/models.service';
 import shared from 'src/app/Shared';
@@ -23,7 +23,7 @@ export class AddModelComponent implements OnInit {
 
   newModel: Model;
 
-  ANNType = ANNType;
+  ProblemType = ProblemType;
   Encoding = Encoding;
   ActivationFunction = ActivationFunction;
   LossFunction = LossFunction;
@@ -47,6 +47,9 @@ export class AddModelComponent implements OnInit {
 
   tempTestSetDistribution: number = 90;
 
+  //accepted: Boolean;
+  term: string = "";
+
   constructor(private models: ModelsService, private datasets: DatasetsService, private csv: CsvParseService) {
     this.newModel = new Model();
 
diff --git a/frontend/src/app/_pages/home/home.component.ts b/frontend/src/app/_pages/home/home.component.ts
index 7e4471e8..c9267e77 100644
--- a/frontend/src/app/_pages/home/home.component.ts
+++ b/frontend/src/app/_pages/home/home.component.ts
@@ -3,6 +3,8 @@ import Dataset from 'src/app/_data/Dataset';
 import Predictor from 'src/app/_data/Predictor';
 import { ItemDatasetComponent } from 'src/app/_elements/item-dataset/item-dataset.component';
 import shared from 'src/app/Shared';
+import { DatasetsService } from 'src/app/_services/datasets.service';
+import { PredictorsService } from 'src/app/_services/predictors.service';
 
 @Component({
   selector: 'app-home',
diff --git a/frontend/src/app/_services/home.service.spec.ts b/frontend/src/app/_services/home.service.spec.ts
new file mode 100644
index 00000000..1afaf229
--- /dev/null
+++ b/frontend/src/app/_services/home.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { HomeService } from './home.service';
+
+describe('HomeService', () => {
+  let service: HomeService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(HomeService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/frontend/src/app/_services/home.service.ts b/frontend/src/app/_services/home.service.ts
new file mode 100644
index 00000000..0026413a
--- /dev/null
+++ b/frontend/src/app/_services/home.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class HomeService {
+
+  constructor() { }
+}
-- 
cgit v1.2.3