From 2b985326e9ebf4f1e421114b09d9f7f456ce78f9 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Fri, 25 Mar 2022 22:17:39 +0100
Subject: Resena greska kod inputNeurona na backu i preuzimanju fajla od public
 dataseta.

---
 backend/api/api/Controllers/ModelController.cs | 1 +
 backend/api/api/Services/FileService.cs        | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index b4a4b4f2..b997efa3 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -126,6 +126,7 @@ namespace api.Controllers
         public ActionResult<Model> Post([FromBody] Model model)
         {
             //username="" ako je GUEST
+            model.inputNeurons = model.inputColumns.Length;
             if (_modelService.CheckHyperparameters(model.inputNeurons, model.hiddenLayerNeurons, model.hiddenLayers, model.outputNeurons) == false)
                 return BadRequest("Bad parameters!");
 
diff --git a/backend/api/api/Services/FileService.cs b/backend/api/api/Services/FileService.cs
index b02d0da4..c5759953 100644
--- a/backend/api/api/Services/FileService.cs
+++ b/backend/api/api/Services/FileService.cs
@@ -8,11 +8,13 @@ namespace api.Services
     {
 
         private readonly IMongoCollection<FileModel> _file;
+        private readonly IMongoCollection<Dataset> _dataset;
 
         public FileService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient)
         {
             var database = mongoClient.GetDatabase(settings.DatabaseName);
             _file = database.GetCollection<FileModel>(settings.FilesCollectionName);
+            _dataset = database.GetCollection<Dataset>(settings.DatasetCollectionName);
         }
 
         public FileModel Create(FileModel file)
@@ -25,7 +27,11 @@ namespace api.Services
         }
         public string GetFilePath(string id, string username)
         {
-            FileModel file = _file.Find(x => x._id == id && x.username == username).FirstOrDefault();
+            FileModel file;
+            if (_dataset.Find(x=>x.fileId==id && x.isPublic==true).FirstOrDefault()!=null)
+                file = _file.Find(x => x._id == id).FirstOrDefault();
+            else
+                file = _file.Find(x => x._id == id && x.username == username).FirstOrDefault();
             if (file == null)
                 return null;
             return file.path;
-- 
cgit v1.2.3


From e9112baa067850cbbd460060347cb1987e389902 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Sat, 26 Mar 2022 14:43:04 +0100
Subject: Dodat atribut hasHeader u klasi Dataset (front i back) i iskoriscen u
 tabelarnom prikazu (datatable component).

---
 backend/api/api/Models/Dataset.cs                                | 1 +
 frontend/src/app/_data/Dataset.ts                                | 3 ++-
 .../src/app/_elements/dataset-load/dataset-load.component.html   | 2 +-
 .../src/app/_elements/dataset-load/dataset-load.component.ts     | 9 +++++----
 .../src/app/_elements/item-dataset/item-dataset.component.html   | 2 +-
 frontend/src/app/_pages/add-model/add-model.component.html       | 2 +-
 frontend/src/app/_pages/add-model/add-model.component.ts         | 3 ++-
 7 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'backend/api')

diff --git a/backend/api/api/Models/Dataset.cs b/backend/api/api/Models/Dataset.cs
index 67ef8cfe..dcfde3b1 100644
--- a/backend/api/api/Models/Dataset.cs
+++ b/backend/api/api/Models/Dataset.cs
@@ -21,6 +21,7 @@ namespace api.Models
         public DateTime dateCreated { get; set; }
         public DateTime lastUpdated { get; set; }
         public string delimiter { get; set; }
+        public bool hasHeader { get; set; }
     }
 }
 
diff --git a/frontend/src/app/_data/Dataset.ts b/frontend/src/app/_data/Dataset.ts
index 665df932..c5b56957 100644
--- a/frontend/src/app/_data/Dataset.ts
+++ b/frontend/src/app/_data/Dataset.ts
@@ -11,6 +11,7 @@ export default class Dataset {
         public dateCreated: Date = new Date(),
         public lastUpdated: Date = new Date(),
         public username: string = '',
-        public delimiter: string = ''
+        public delimiter: string = '',
+        public hasHeader: boolean = true
     ) { }
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.html b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
index 3ac43f73..76e46092 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.html
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.html
@@ -33,7 +33,7 @@
       </datalist>
 
       <label for="type" class="form-check-label my-5">Da li .csv ima header?
-        <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="hasHeader" type="checkbox"
+        <input class="mx-3 form-check-input" type="checkbox" (input)="update()" [(ngModel)]="dataset.hasHeader" type="checkbox"
           value="" id="checkboxHeader" checked>
       </label>
       <br>
diff --git a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
index e7b19f9a..f9343117 100644
--- a/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
+++ b/frontend/src/app/_elements/dataset-load/dataset-load.component.ts
@@ -13,7 +13,7 @@ export class DatasetLoadComponent {
 
   delimiterOptions: Array<string> = [",", ";", "\t", "razmak", "|"]; //podrazumevano ","
 
-  hasHeader: boolean = true;
+  //hasHeader: boolean = true;
   hasInput: boolean = false;
 
   csvRecords: any[] = [];
@@ -21,7 +21,7 @@ export class DatasetLoadComponent {
   rowsNumber: number = 0;
   colsNumber: number = 0;
 
-  dataset: Dataset;
+  dataset: Dataset; //dodaj ! potencijalno
 
   constructor(private ngxCsvParser: NgxCsvParser) {
     this.dataset = new Dataset();
@@ -54,13 +54,14 @@ export class DatasetLoadComponent {
         console.log('Result', result);
         if (result.constructor === Array) {
           this.csvRecords = result;
-          if (this.hasHeader)
+          if (this.dataset.hasHeader)
             this.rowsNumber = this.csvRecords.length - 1;
           else
             this.rowsNumber = this.csvRecords.length;
           this.colsNumber = this.csvRecords[0].length;
 
-          this.dataset.header = this.csvRecords[0];
+          if (this.dataset.hasHeader) //kasnije dodati opciju kada nema header da korisnik rucno unosi header-e
+            this.dataset.header = this.csvRecords[0];
 
           this.loaded.emit("loaded");
         }
diff --git a/frontend/src/app/_elements/item-dataset/item-dataset.component.html b/frontend/src/app/_elements/item-dataset/item-dataset.component.html
index 46840cdd..8751fce5 100644
--- a/frontend/src/app/_elements/item-dataset/item-dataset.component.html
+++ b/frontend/src/app/_elements/item-dataset/item-dataset.component.html
@@ -8,7 +8,7 @@
         </p>
         <table class="table table-bordered table-sm">
             <thead>
-                <th scope="col" *ngFor="let column of dataset.header">{{column}}</th>
+                <th scope="col" *ngFor="let column of dataset.header">{{column}}</th> <!-- treba da se namesti da kad nema hedere, da korisnik unese nazive kolona pa da se taj heder prikaze  -->
             </thead>
         </table>
     </div>
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 7e944a19..f4574eab 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -54,7 +54,7 @@
             </div>
 
             <app-dataset-load *ngIf="!showMyDatasets" id="dataset"
-                (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.hasHeader">
+                (loaded)="datasetLoaded = true; selectedDataset = datasetLoadComponent?.dataset; datasetFile = datasetLoadComponent?.csvRecords; datasetHasHeader = datasetLoadComponent?.dataset!.hasHeader">
             </app-dataset-load>
             <app-datatable [data]="datasetFile" [hasHeader]="datasetHasHeader"></app-datatable>
         </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 fcc8ea70..2552f612 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -209,6 +209,7 @@ export class AddModelComponent implements OnInit {
   selectThisDataset(dataset: Dataset) {
     this.selectedDataset = dataset;
     this.existingDatasetSelected = true;
+    this.datasetHasHeader = this.selectedDataset.hasHeader;
 
     /*let datasets = document.getElementsByClassName("usersDataset") as HTMLCollection;
     for (let i = 0; i < datasets.length; i++) {
@@ -222,7 +223,7 @@ export class AddModelComponent implements OnInit {
         this.datasetFile = this.csv.csvToArray(file, (dataset.delimiter == "razmak") ? " " : (dataset.delimiter == "") ? "," : dataset.delimiter);
       }
     });
-    this.datasetHasHeader = false;
+    //this.datasetHasHeader = false;
 
     this.resetCbsAndRbs();
   }
-- 
cgit v1.2.3