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

2 files changed, 7 insertions, 5 deletions

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 9dde9afe..8d763b00 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.html
+++ b/frontend/src/app/_pages/add-model/add-model.component.html
@@ -40,7 +40,9 @@
                     Dodajte novi dataset
                 </button>
             </div>
-            <input type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+            <div class="px-5 my-2">
+                <input *ngIf="showMyDatasets" type="text" class="form-control" placeholder="Pretraga" [(ngModel)]="term">
+            </div>
             <div class="px-5">
                 <div *ngIf="showMyDatasets" class="overflow-auto" style="max-height: 500px;">
                     <ul class="list-group">
@@ -93,7 +95,7 @@
                 </div>
 
 
-                <div class="my-2" *ngIf="datasetFile">
+                <div class="mt-5" *ngIf="datasetFile">
                     <h2>Popunjavanje nedostajućih vrednosti:</h2>
                     <div class="form-check">
                         <input type="radio" [(ngModel)]="newModel.nullValues" [value]="NullValueOptions.DeleteRows"
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 37672d0a..78e1255b 100644
--- a/frontend/src/app/_pages/add-model/add-model.component.ts
+++ b/frontend/src/app/_pages/add-model/add-model.component.ts
@@ -53,7 +53,7 @@ export class AddModelComponent implements OnInit {
   constructor(private models: ModelsService, private datasets: DatasetsService, private csv: CsvParseService) {
     this.newModel = new Model();
 
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }
@@ -103,7 +103,7 @@ export class AddModelComponent implements OnInit {
             this.datasetLoadComponent.dataset.fileId = file._id;
             this.datasetLoadComponent.dataset.username = shared.username;
 
-            this.models.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
+            this.datasets.addDataset(this.datasetLoadComponent.dataset).subscribe((dataset) => {
               console.log('ADD MODEL: STEP 3 - ADD MODEL WITH DATASET ID ', dataset._id);
               this.newModel.datasetId = dataset._id;
 
@@ -279,7 +279,7 @@ export class AddModelComponent implements OnInit {
   }
 
   refreshMyDatasetList() {
-    this.models.getMyDatasets().subscribe((datasets) => {
+    this.datasets.getMyDatasets().subscribe((datasets) => {
       this.myDatasets = datasets;
     });
   }