From c69f7ee7d2acbe17766f5b0f0f3cc764354cd151 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 16 May 2022 00:13:08 +0200
Subject: Element se samo prikazuje kada se izabere postojeci dataset.

---
 frontend/src/app/_elements/folder/folder.component.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'frontend/src/app/_elements/folder/folder.component.ts')

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 665659a8..e426e2a0 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -65,8 +65,10 @@ export class FolderComponent implements AfterViewInit {
   }
 
   displayFile() {
-    if (this.type == FolderType.Dataset)
+    if (this.type == FolderType.Dataset){
       this.formDataset.dataset = <Dataset>this.fileToDisplay;
+      this.formDataset.existingFlag=false;
+    }
     else if (this.type == FolderType.Model)
       this.formModel.newModel = <Model>this.fileToDisplay;
   }
-- 
cgit v1.2.3


From 717ed39075bc89aa00741cfdb6a48c27bf34c992 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Mon, 16 May 2022 00:20:07 +0200
Subject: Pozicionirano na sredinu u arhivi. Sredjen bug kada ostane zapamcena
 strana na kojoj se nalazimo ako promenimo dataset.

---
 frontend/src/app/_elements/folder/folder.component.ts               | 4 +++-
 frontend/src/app/_elements/form-dataset/form-dataset.component.html | 2 +-
 frontend/src/app/_elements/form-dataset/form-dataset.component.ts   | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'frontend/src/app/_elements/folder/folder.component.ts')

diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index e426e2a0..654d5510 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -95,11 +95,13 @@ export class FolderComponent implements AfterViewInit {
     this.newFileSelected = true;
     this.listView = false;
     this.displayFile();
-    if (this.type == FolderType.Dataset)
+    if (this.type == FolderType.Dataset){
       this.formDataset.clear();
+    }
   }
 
   selectFile(file?: FolderFile) {
+    this.formDataset.resetPagging();
     this.selectedFile = file;
     this.fileToDisplay = file;
     if (this.type == FolderType.Experiment && file) {
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
index 8965d451..1f91405b 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -47,7 +47,7 @@
             <input class="file" id="file-upload" (change)="changeListener($event)" #fileInput type="file" accept=".csv">
 
             <div class="mt-5 datatable">
-                <div [ngClass]="{'hidden': (!existingFlag)}">
+                <div [ngClass]="{'hidden': (!existingFlag)}" class="text-center">
                     <button mat-button  (click)="goBack()"><mat-icon>keyboard_arrow_left</mat-icon></button>
                     <div style="display: inline;">{{((this.begin+1)/10)+1}}</div>
                     <button mat-button (click)="goForward()"><mat-icon>keyboard_arrow_right</mat-icon></button>
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
index 03564939..99583437 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.ts
@@ -43,6 +43,9 @@ export class FormDatasetComponent {
   }
 
   //@ViewChild('fileImportInput', { static: false }) fileImportInput: any; cemu je ovo sluzilo?
+  resetPagging(){
+    this.begin=-1;
+  }
   goBack(){
     if(this.begin-10<=0)
       this.begin=-1;
-- 
cgit v1.2.3


From 22911bdc9c5ff39ff86d8298179b147c4580f82c Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Mon, 16 May 2022 00:49:30 +0200
Subject: Uvoz javnih datasetova i modela

---
 backend/api/api/Services/FillAnEmptyDb.cs          |  2 ++
 .../src/app/_elements/folder/folder.component.css  |  2 +-
 .../src/app/_elements/folder/folder.component.html |  7 +++++-
 .../src/app/_elements/folder/folder.component.ts   | 26 ++++++++++++++++++++++
 .../form-dataset/form-dataset.component.css        |  4 ++++
 .../form-dataset/form-dataset.component.html       |  2 +-
 6 files changed, 40 insertions(+), 3 deletions(-)

(limited to 'frontend/src/app/_elements/folder/folder.component.ts')

diff --git a/backend/api/api/Services/FillAnEmptyDb.cs b/backend/api/api/Services/FillAnEmptyDb.cs
index 32ce5c2e..fc169853 100644
--- a/backend/api/api/Services/FillAnEmptyDb.cs
+++ b/backend/api/api/Services/FillAnEmptyDb.cs
@@ -83,6 +83,8 @@ namespace api.Services
                 dataset.nullCols = 3;
                 dataset.nullRows = 708;
                 dataset.isPreProcess = true;
+                dataset.cMatrix = new float[11][];
+                dataset.cMatrix[0] = new float[] {1f,-0.005006660707294941f, -0.03514399379491806f,-0.03855886310338974f,0.04293888062238693f,0.03684719651937485f};
 
                 _datasetService.Create(dataset);
 
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index ada2dba0..3ecba343 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -177,7 +177,7 @@
 
 .file-content {
     width: 100%;
-    height: 100%;
+    height: 95%;
     position: relative;
 }
 
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 8896e7e5..db4f28f0 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -78,7 +78,12 @@
                         <div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
                             <button class="btn-clear file-button" (click)="deleteFile(file, $event)">
                                 <mat-icon>delete</mat-icon>
-                            </button>
+                            </button>   
+                        </div>
+                        <div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels">
+                            <button  class="btn-clear file-button" (click)="addFile(file, $event)">
+                                <mat-icon>note_add</mat-icon>
+                            </button>   
                         </div>
                     </div>
                     <div *ngIf="type == FolderType.Experiment" class="list-view">
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 665659a8..e62c59f9 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -292,6 +292,32 @@ export class FolderComponent implements AfterViewInit {
     }
   }
 
+  addFile(file: FolderFile, event: Event) {
+    event.stopPropagation();
+    switch (this.type) {
+      case FolderType.Dataset:
+        (<Dataset>file)._id="";
+        
+        (<Dataset>file).isPublic=false;
+        this.datasetsService.addDataset(<Dataset>file).subscribe((response) => {
+          this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
+          this.refreshFiles(null);
+        });
+        break;
+      case FolderType.Model:
+        this.modelsService.addModel(<Model>file).subscribe((response) => {
+          this.refreshFiles(null);
+        });
+        break;
+      case FolderType.Experiment:
+        // this.experimentsService.addExperiment(<Model>file).subscribe((response) => {
+        //   console.log(response);
+        // });
+        //todo delete za predictor
+        break;
+    }
+  }
+
   folders: { [tab: number]: FolderFile[] } = {};
 
   tabTitles: { [tab: number]: string } = {
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.css b/frontend/src/app/_elements/form-dataset/form-dataset.component.css
index 079711d0..99ed5d40 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.css
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.css
@@ -63,4 +63,8 @@
 .file-container input{
     border-radius: 5px;
     left: 0%;
+}
+
+.naslov{
+    font-size: 30px;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/form-dataset/form-dataset.component.html b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
index b96276bd..07a3ee1a 100644
--- a/frontend/src/app/_elements/form-dataset/form-dataset.component.html
+++ b/frontend/src/app/_elements/form-dataset/form-dataset.component.html
@@ -35,7 +35,7 @@
         </div>
         
     <div class="row" *ngIf="firstInput">
-        <label class=" mt-5">{{filename}}</label>
+        <label class="naslov mt-2">{{filename}}</label>
 
     </div>
 
-- 
cgit v1.2.3