From c746191b225f3e59f4b7b0cee6a01c2e5bf00271 Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Wed, 4 May 2022 18:17:28 +0200
Subject: Dodao dodavanje modela i popravio klasu model na beku.

---
 .../src/app/_elements/folder/folder.component.html | 19 ++++------
 .../src/app/_elements/folder/folder.component.ts   | 43 ++++++++++++++++++++--
 2 files changed, 48 insertions(+), 14 deletions(-)

(limited to 'frontend/src/app/_elements/folder')

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 113db616..48b59dc8 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -30,20 +30,20 @@
                 </mat-form-field>
             </div>
             <div id="search-options">
-                <div id="collapseFilters" class="collapse collapse-horizontal">
+                <!-- <div id="collapseFilters" class="collapse collapse-horizontal">
                     <mat-icon class="text-offwhite ">timeline</mat-icon>
                     Regresioni
                     <mat-icon class="text-offwhite ">looks_two</mat-icon>
                     Binarni klasifikacioni
                     <mat-icon class="text-offwhite ">auto_awesome_motion</mat-icon>
                     Multiklasifikacioni
-                </div>
+                </div> -->
                 <button class="btn-clear icon-toggle" data-bs-toggle="collapse" data-bs-target="#collapseFilters" aria-expanded="false" aria-controls="collapseFilters">
                     <mat-icon>filter_alt</mat-icon>
                 </button>
-                <div id="collapseSort" class="collapse collapse-horizontal">
+                <!-- <div id="collapseSort" class="collapse collapse-horizontal">
                     [sort options here TODO]
-                </div>
+                </div> -->
                 <button class="btn-clear icon-toggle" data-bs-toggle="collapse" data-bs-target="#collapseSort" aria-expanded="false" aria-controls="collapseSort">
                     <mat-icon>sort</mat-icon>
                 </button>
@@ -55,16 +55,13 @@
         <!--{{fileToDisplay ? fileToDisplay.name : 'No file selected.'}} {{selectedFileIndex}} {{hoveringOverFileIndex}}-->
         <div class="folder-inside bg-blur">
             <div class="file-content" [ngClass]="{'form-hidden' : listView}">
-                <div class="file-bottom-buttons">
-                    <button class="btn-clear file-button" (click)="deleteFile()">
+                <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
+                    <button *ngIf="this.selectedFile && selectedTab == TabType.File" class="btn-clear file-button" (click)="deleteFile(this.selectedFile)">
                         <mat-icon>delete</mat-icon>
                     </button>
-                    <button class="btn-clear file-button">
-                        <mat-icon>share</mat-icon>
-                    </button>
-                    <button class="btn-clear file-button">
+                    <!-- <button class="btn-clear file-button">
                         <mat-icon>zoom_out_map</mat-icon>
-                    </button>
+                    </button> -->
                 </div>
                 <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}"></app-form-model>
                 <app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}"></app-form-dataset>
diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts
index 1e57fdf1..20ca1121 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -137,6 +137,7 @@ export class FolderComponent implements AfterViewInit {
     });
 
     this.modelsService.getMyModels().subscribe((models) => {
+      console.log(models);
       this.folders[TabType.MyModels] = models;
     });
 
@@ -160,8 +161,26 @@ export class FolderComponent implements AfterViewInit {
   }
 
   saveNewFile() {
-    if (this.type == FolderType.Dataset)
-      this.formDataset!.uploadDataset();
+    switch (this.type) {
+      case FolderType.Dataset:
+        this.formDataset!.uploadDataset((dataset: Dataset) => {
+          Shared.openDialog("Obaveštenje", "Uspešno ste dodali novi izvor podataka u kolekciju. Molimo sačekajte par trenutaka da se procesira.");
+          this.refreshFiles(dataset._id);
+        },
+          () => {
+            Shared.openDialog("Neuspeo pokušaj!", "Izvor podataka sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeći dataset.");
+          });
+        break;
+      case FolderType.Model:
+        this.modelsService.addModel(this.formModel.newModel).subscribe(model => {
+          this.formModel.newModel = model;
+          Shared.openDialog("Obaveštenje", "Uspešno ste dodali novu konfiguraciju neuronske mreže u kolekciju.");
+          this.refreshFiles(null); // todo select model
+        }, (err) => {
+          Shared.openDialog("Neuspeo pokušaj!", "Konfiguracija neuronske mreže sa unetim nazivom već postoji u Vašoj kolekciji. Izmenite naziv ili iskoristite postojeću konfiguraciju.");
+        });
+        break;
+    }
   }
 
 
@@ -207,8 +226,26 @@ export class FolderComponent implements AfterViewInit {
     this.listView = !this.listView;
   }
 
-  deleteFile() {
+  deleteFile(file: FolderFile) {
     console.log('delete');
+    switch (this.type) {
+      case FolderType.Dataset:
+        this.datasetsService.deleteDataset(<Dataset>file).subscribe((response) => {
+          console.log(response);
+        });
+        break;
+      case FolderType.Model:
+        this.modelsService.deleteModel(<Model>file).subscribe((response) => {
+          console.log(response);
+        });
+        break;
+      case FolderType.Experiment:
+        // this.experimentsService.deleteExperiment(<Model>file).subscribe((response) => {
+        //   console.log(response);
+        // });
+        //todo delete za predictor
+        break;
+    }
   }
 
   folders: { [tab: number]: FolderFile[] } = {};
-- 
cgit v1.2.3