From d6b8cd90f225bb4b390ef16603da9f5f0739899f Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Wed, 18 May 2022 17:07:43 +0200
Subject: Promenio dodavanje fajla u folderu da ne menja naslov tab-a. Podesio
 form-model komponentu da setuje tip problema modela na tip problema
 eksperimenta i ispravio da se uvak prikazuju korektne funkcije gubitka za taj
 tip problema. Popravio forme za dodavanje/pregled fajlova u arhivi.

---
 .../src/app/_elements/folder/folder.component.html    | 10 +++++-----
 frontend/src/app/_elements/folder/folder.component.ts | 19 +++++++++++++------
 2 files changed, 18 insertions(+), 11 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 db4f28f0..da04b219 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -3,7 +3,7 @@
         <div id="new-file-tab" *ngIf="newFile" class="folder-tab p-1 rounded-top" [style]="'z-index:' + (selectedTab == TabType.NewFile ? 11 : 10) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.NewFile, 'hover-tab' : hoverTab == TabType.NewFile}">
             <mat-icon class="text-offwhite">add</mat-icon>
             <a class="stretched-link tab-link" (click)="selectTab(TabType.NewFile)" (mouseenter)="hoverOverTab(TabType.NewFile)" (mouseleave)="hoverOverTab(TabType.None)">
-                {{newFile.name}}
+                {{newTabTitles[type]}}
             </a>
         </div>
         <!--<div class="folder-tab p-1 rounded-top" *ngFor="let file of filteredFiles; let i = index" [style]="'z-index:' + calcZIndex(i) + ' ;'" [ngClass]="{'selected-tab' : selectedFileIndex == i, 'hover-tab' : hoveringOverFileIndex == i}">
@@ -63,7 +63,7 @@
                         <mat-icon>zoom_out_map</mat-icon>
                     </button> -->
                 </div>
-                <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}" [forExperiment]="forExperiment"></app-form-model>
+                <app-form-model [ngClass]="{'form-hidden': type != FolderType.Model}" [forExperiment]="forExperiment" [hideProblemType]="(forExperiment ? true : false)" [forProblemType]="(forExperiment ? forExperiment.type : ProblemType.Regression)"></app-form-model>
                 <app-form-dataset [ngClass]="{'form-hidden': type != FolderType.Dataset}" [forExperiment]="forExperiment"></app-form-dataset>
             </div>
             <div [ngClass]="{'form-hidden' : !listView}" class="list-view">
@@ -78,12 +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)">
+                            <button class="btn-clear file-button" (click)="addFile(file, $event)">
                                 <mat-icon>note_add</mat-icon>
-                            </button>   
+                            </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 d26ac999..be72ebc5 100644
--- a/frontend/src/app/_elements/folder/folder.component.ts
+++ b/frontend/src/app/_elements/folder/folder.component.ts
@@ -1,7 +1,7 @@
 import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
 import Dataset from 'src/app/_data/Dataset';
 import { FolderFile, FolderType } from 'src/app/_data/FolderFile';
-import Model from 'src/app/_data/Model';
+import Model, { ProblemType } from 'src/app/_data/Model';
 import { DatasetsService } from 'src/app/_services/datasets.service';
 import Shared from 'src/app/Shared';
 import { ModelsService } from 'src/app/_services/models.service';
@@ -65,9 +65,9 @@ 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;
+      this.formDataset.existingFlag = false;
     }
     else if (this.type == FolderType.Model)
       this.formModel.newModel = <Model>this.fileToDisplay;
@@ -95,7 +95,7 @@ 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();
     }
   }
@@ -234,6 +234,7 @@ export class FolderComponent implements AfterViewInit {
           });
         break;
       case FolderType.Model:
+        this.formModel.newModel.type = this.formModel.forProblemType;
         this.modelsService.addModel(this.formModel.newModel).subscribe(model => {
           this.newFile = undefined;
           Shared.openDialog("Obaveštenje", "Uspešno ste dodali novu konfiguraciju neuronske mreže u kolekciju.");
@@ -300,9 +301,9 @@ export class FolderComponent implements AfterViewInit {
     event.stopPropagation();
     switch (this.type) {
       case FolderType.Dataset:
-        (<Dataset>file)._id="";
+        (<Dataset>file)._id = "";
         (<Dataset>file).isPreProcess = true;
-        (<Dataset>file).isPublic=false;
+        (<Dataset>file).isPublic = false;
         this.datasetsService.stealDataset(<Dataset>file).subscribe((response) => {
           this.filteredFiles.splice(this.filteredFiles.indexOf(file), 1);
           this.refreshFiles(null);
@@ -335,6 +336,7 @@ export class FolderComponent implements AfterViewInit {
   };
 
   FolderType = FolderType;
+  ProblemType = ProblemType;
   Privacy = Privacy;
   TabType = TabType;
 
@@ -428,6 +430,11 @@ export class FolderComponent implements AfterViewInit {
       this.formModel.updateGraph();
     }
   }
+
+  newTabTitles: { [tab: number]: string } = {
+    [FolderType.Dataset]: 'Novi izvor podataka',
+    [FolderType.Model]: 'Nova konfiguracija neuronske mreže',
+  };
 }
 
 export enum Privacy {
-- 
cgit v1.2.3