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

3 files changed, 34 insertions, 18 deletions

diff --git a/backend/microservice/api/controller.py b/backend/microservice/api/controller.py
index 988ad987..8d49fcc4 100644
--- a/backend/microservice/api/controller.py
+++ b/backend/microservice/api/controller.py
@@ -54,12 +54,20 @@ class train_callback(tf.keras.callbacks.Callback):
 @app.route('/train', methods = ['POST'])
 def train():
     print("******************************TRAIN*************************************************")
-    
-    f = request.files.get("file")
-    data = pd.read_csv(f)
     paramsModel = json.loads(request.form["model"])
     paramsExperiment = json.loads(request.form["experiment"])
     paramsDataset = json.loads(request.form["dataset"])
+    f = request.files.get("file")
+    if(paramsDataset['delimiter']=='novi red'):
+        separation='\n'
+
+    elif(paramsDataset['delimiter']=='razmak'):
+        separation=' '
+    else:
+        separation=paramsDataset['delimiter']
+    data = pd.read_csv(f,sep=separation)
+    
+
     #dataset, paramsModel, paramsExperiment, callback)
     filepath,result = newmlservice.train(data, paramsModel, paramsExperiment,paramsDataset, train_callback)
     """
@@ -110,7 +118,14 @@ def returnColumnsInfo():
    
     dataset = json.loads(request.form["dataset"])
     file = request.files.get("file")
-    data=pd.read_csv(file)
+    if(dataset['delimiter']=='novi red'):
+        separation='\n'
+
+    elif(dataset['delimiter']=='razmak'):
+        separation=' '
+    else:
+        separation=dataset['delimiter']
+    data=pd.read_csv(file,sep=separation)
     '''
     #f = request.json['filepath']
     #data=pd.read_csv(f)
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 11b6ef5e..95ace1ef 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.css
+++ b/frontend/src/app/_elements/form-model/form-model.component.css
@@ -101,4 +101,4 @@ mat-slider {
     padding-bottom: 15px;
     font-size: 20px !important;
     font-weight: 600;
-}
\ No newline at end of file
+}
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 96a5e1b6..8ec29a09 100644
--- a/frontend/src/app/_elements/form-model/form-model.component.html
+++ b/frontend/src/app/_elements/form-model/form-model.component.html
@@ -121,14 +121,15 @@
 
         <div class="ns-col" id="layers-control">
             <div>Broj Skrivenih Slojeva</div>
-            <button class="btn-clear btn-icon bubble" (click)="addLayer()">
-            <mat-icon>add</mat-icon>
-        </button>
-            <div>{{newModel.hiddenLayers}}</div>
             <button class="btn-clear btn-icon bubble" (click)="removeLayer()">
-            <mat-icon>remove</mat-icon>
-        </button>
-
+                <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>
         </div>
         <div class="break-1"></div>
         <div class="ns-col">
@@ -196,13 +197,13 @@
 
                 <div class="d-flex flex-row align-items-center justify-content-center tm">
                     <div class="col-6" style="font-size: 13px;">Broj čvorova</div>
-                    <button class="btn-clear btn-icon bubble" (click)="addNeuron(i)">
-                <mat-icon>add</mat-icon>
-            </button>
-                    <div class="col-2 text-center">{{newModel.layers[i].neurons}}</div>
                     <button class="btn-clear btn-icon bubble" (click)="removeNeuron(i)">
-                <mat-icon>remove</mat-icon>
-            </button>
+                        <mat-icon>remove</mat-icon>
+                    </button>
+                    <div class="col-2 text-center">{{newModel.layers[i].neurons}}</div>
+                    <button class="btn-clear btn-icon bubble" (click)="addNeuron(i)">
+                        <mat-icon>add</mat-icon>
+                    </button>
                 </div>
 
                 <mat-form-field appearance="fill" class="mat-fix">