From e22b83919e6442dfb55d7953d9227268c850adf8 Mon Sep 17 00:00:00 2001
From: Danijel Andjelkovic <adanijel99@gmail.com>
Date: Thu, 17 Mar 2022 00:32:49 +0100
Subject: Napravio neophodne izmene tako da backend i frontend komuniciraju
 uspesno.

---
 .../app/_pages/add-model/add-model.component.ts    | 37 ++++++++++++----------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'frontend/src/app/_pages/add-model/add-model.component.ts')

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 76a09782..a4cabb82 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -4,6 +4,7 @@ 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';
+import shared from 'src/app/Shared';
 
 
 @Component({
@@ -24,6 +25,7 @@ export class AddModelComponent implements OnInit {
   LossFunction = LossFunction;
   Optimizer = Optimizer;
   Object = Object;
+  shared = shared;
 
   constructor(private models: ModelsService) {
     this.newModel = new Model();
@@ -44,24 +46,27 @@ export class AddModelComponent implements OnInit {
   }
 
   saveModel(temporary: boolean): any {
-    console.log('ADD MODEL: STEP 1 - UPLOAD FILE');
-    if (this.datasetLoadComponent) {
-      this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((fileId) => {
-        console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + fileId);
-        if (this.datasetLoadComponent) {
-          this.datasetLoadComponent.dataset.fileId = fileId;
-          this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((datasetId) => {
-            console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ' + datasetId);
-            this.newModel.datasetId = datasetId;
-            this.getCheckedInputCols();
-            this.getCheckedOutputCol();
-            if (this.validationInputsOutput())
+    this.getCheckedInputCols();
+    this.getCheckedOutputCol();
+    if (this.validationInputsOutput()) {
+      console.log('ADD MODEL: STEP 1 - UPLOAD FILE');
+      if (this.datasetLoadComponent) {
+        this.models.uploadData(this.datasetLoadComponent.files[0]).subscribe((file) => {
+          console.log('ADD MODEL: STEP 2 - ADD DATASET WITH FILE ID ' + file._id);
+          if (this.datasetLoadComponent) {
+            this.datasetLoadComponent.dataset.fileId = file._id;
+            this.datasetLoadComponent.dataset.username = shared.username;
+            this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
+              console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id);
+              this.newModel.datasetId = dataset._id;
+              this.newModel.username = shared.username;
               this.models.addModel(this.newModel).subscribe((response) => {
-                console.log('ADD MODEL: DONE! REPLY:\n' + response);
+                console.log('ADD MODEL: DONE! REPLY:\n', response);
               });
-          });
-        }
-      });
+            });
+          }
+        });
+      }
     }
   }
 
-- 
cgit v1.2.3