From ef1e5b2a2cdd5680be8d9d1cea92c97c05da826d Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 18 May 2022 23:42:15 +0200
Subject: Pristup eksperiment strani izabranim prediktorom. Preostalo testirati
 sa back-om.

---
 frontend/src/app/_elements/folder/folder.component.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index da04b219..f7320264 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -87,7 +87,7 @@
                         </div>
                     </div>
                     <div *ngIf="type == FolderType.Experiment" class="list-view">
-                        <div *ngFor="let predictor of predictorsForExp[file._id];" class="list-item">
+                        <div *ngFor="let predictor of predictorsForExp[file._id];" class="list-item" (click)="goToExperimentPageWithPredictor(file, predictor)">
 
                             <div class="mx-3">
                                 <div class="f-row">
-- 
cgit v1.2.3


From 6e2ce46164efc843302b30b6fc3b9e080d5f604d Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Thu, 19 May 2022 01:08:10 +0200
Subject: Mat-icon upgrade

---
 backend/api/api/Controllers/DatasetController.cs        |  1 -
 backend/api/api/Services/MlConnectionService.cs         | 13 -------------
 frontend/src/app/_elements/folder/folder.component.css  |  2 +-
 frontend/src/app/_elements/folder/folder.component.html | 10 +++++-----
 4 files changed, 6 insertions(+), 20 deletions(-)

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

diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index 6fb139bd..849d9884 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -144,7 +144,6 @@ namespace api.Controllers
         [Authorize(Roles = "User,Guest")]
         public async Task<ActionResult<Dataset>> Post([FromBody] Dataset dataset)
         {
-            Console.WriteLine("PROBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
             string uploaderId = getUserId();
 
             dataset.uploaderId = uploaderId;
diff --git a/backend/api/api/Services/MlConnectionService.cs b/backend/api/api/Services/MlConnectionService.cs
index 0ecdb1af..6a307e0d 100644
--- a/backend/api/api/Services/MlConnectionService.cs
+++ b/backend/api/api/Services/MlConnectionService.cs
@@ -63,19 +63,6 @@ namespace api.Services
                 foreach (var connection in ChatHub.getAllConnectionsOfUser(id))
                     await _ichat.Clients.Client(connection).SendAsync("NotifyDataset",newDataset.name,newDataset._id);
 
-
-            string proba = "";
-
-            for (int i = 0; i < newDataset.cMatrix.Length; i++)
-            {
-                proba = i +"      ";
-                for (int j = 0; j < newDataset.cMatrix[i].Length; j++)
-                    proba += newDataset.cMatrix[i][j] + "f, ";
-
-                Console.WriteLine(proba);
-                proba = "";
-            }
-
             return;
 
         }
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 4a06faa4..1a1e70ec 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -183,7 +183,7 @@
 .file-bottom-buttons {
     position: absolute;
     bottom: 15px;
-    right: 15px;
+    right: 4%;
     display: flex;
     flex-direction: row-reverse;
 }
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index de9a6353..97ae0d23 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -57,10 +57,10 @@
             <div class="file-content" [ngClass]="{'form-hidden' : listView}">
                 <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, $event)">
-                        <mat-icon>delete</mat-icon>
+                        <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
                     </button>
                     <button *ngIf="this.selectedFile && selectedTab==TabType.File && FolderType.Dataset==this.type" class="btn-clear file-button" (click)="downloadFile(this.selectedFile,$event)" style="display: inline-block;">
-                        <mat-icon>download</mat-icon>
+                        <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
                     </button>
 
                     
@@ -82,15 +82,15 @@
                         </div>
                         <div class="mx-2 hover-show" *ngIf="selectedTab !== TabType.PublicDatasets && selectedTab !== TabType.PublicModels">
                             <button *ngIf="selectedTab==TabType.MyDatasets" class="btn-clear file-button" (click)="downloadFile(file,$event)" style="display: inline-block;">
-                                <mat-icon>download</mat-icon>
+                                <mat-icon matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
                             </button>
                             <button class="btn-clear file-button" (click)="deleteFile(file, $event)" style="display: inline-block;">
-                                <mat-icon>delete</mat-icon>
+                                <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
                             </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>
+                                <mat-icon matTooltip="Uvezi" matTooltipPosition="right">note_add</mat-icon>
                             </button>
                         </div>
                     </div>
-- 
cgit v1.2.3