From cc7a29e73371b4b8546a43e3f9115507557a5259 Mon Sep 17 00:00:00 2001
From: Ognjen Cirkovic <ciraboxkg@gmail.com>
Date: Wed, 25 May 2022 02:04:59 +0200
Subject: Dugmici za delete i download spusteni ispod forme. Dodat
 background-color da bi se lakse uocili. Napravljena class-a
 file-bootom-buttons-helper da ih pozicionira.

---
 frontend/src/app/_elements/folder/folder.component.css | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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

diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 682fc645..810ad05d 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -184,9 +184,13 @@
 }
 
 .file-bottom-buttons {
-    position: absolute;
-    bottom: 5px;
-    right: 4%;
+    position: relative;
+    position: relative;
+    top:-36px
+    
+}
+.file-bottom-buttons-helper{
+    position: relative;
     display: flex;
     flex-direction: row-reverse;
 }
@@ -196,6 +200,7 @@
     color: var(--offwhite);
     border-radius: 4px;
     border: 1px solid var(--ns-primary);
+    background-color: var(--ns-bg-dark-50);
     margin: 5px;
     padding: 5px;
     cursor: pointer;
-- 
cgit v1.2.3


From 1a5b7cc3cc03e47c559f52528e075d314b804932 Mon Sep 17 00:00:00 2001
From: Sonja Galovic <galovicsonja@gmail.com>
Date: Wed, 25 May 2022 23:45:21 +0200
Subject: Text-overflow postavljen svuda gde treba.

---
 .../column-table/column-table.component.html       | 26 ++++++++++++++--------
 .../src/app/_elements/folder/folder.component.css  | 17 ++++++++++----
 .../src/app/_elements/folder/folder.component.html | 14 ++++++------
 3 files changed, 37 insertions(+), 20 deletions(-)

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

diff --git a/frontend/src/app/_elements/column-table/column-table.component.html b/frontend/src/app/_elements/column-table/column-table.component.html
index e970bfb4..d5273d59 100644
--- a/frontend/src/app/_elements/column-table/column-table.component.html
+++ b/frontend/src/app/_elements/column-table/column-table.component.html
@@ -27,7 +27,9 @@
                             <th>#</th>
                             <th class="columnNames" *ngFor="let colInfo of dataset.columnInfo; let i = index" [ngClass]="{'header-disabled' : !columnsChecked[i]}">
                                 <div class="cell-align">
-                                    #{{i + 1}}&nbsp;&nbsp;{{colInfo.columnName}}
+                                    <div class="text-overflow">
+                                        #{{i + 1}}&nbsp;&nbsp;{{colInfo.columnName}}
+                                    </div>
                                     <mat-checkbox color="primary" [(ngModel)]="columnsChecked[i]" (change)="changeInputColumns($event, colInfo.columnName)"></mat-checkbox>
                                 </div>
                             </th>
@@ -63,7 +65,9 @@
                             <th>Kolona</th>
                             <th class="columnNames" *ngFor="let colInfo of dataset.columnInfo; let i = index" [ngClass]="{'header-disabled' : !columnsChecked[i]}">
                                 <div class="cell-align">
-                                    #{{i + 1}}&nbsp;&nbsp;{{colInfo.columnName}}
+                                    <div class="text-overflow">
+                                        #{{i + 1}}&nbsp;&nbsp;{{colInfo.columnName}}
+                                    </div>
                                     <mat-checkbox color="primary" [(ngModel)]="columnsChecked[i]" (change)="changeInputColumns($event, colInfo.columnName)"></mat-checkbox>
                                 </div>
                             </th>
@@ -72,7 +76,7 @@
                     <tbody>
                         <tr *ngFor="let row of dataset.cMatrix; let i = index">
                             <th [ngClass]="{'header-disabled col-disabled' : !columnsChecked[i]}">
-                                <div class="text-left">
+                                <div class="text-left text-overflow">
                                     {{dataset.columnInfo[i].columnName}}
                                 </div>
                             </th>
@@ -97,7 +101,9 @@
                             <th>Naziv</th>
                             <th class="columnNames" *ngFor="let colInfo of dataset.columnInfo; let i = index" [ngClass]="{'header-disabled' : !columnsChecked[i]}">
                                 <div class="cell-align">
-                                    #{{i + 1}}&nbsp;&nbsp;{{colInfo.columnName}}
+                                    <div class="text-overflow">
+                                        #{{i + 1}}&nbsp;&nbsp;{{colInfo.columnName}}
+                                    </div>
                                     <mat-checkbox color="primary" [(ngModel)]="columnsChecked[i]" (change)="changeInputColumns($event, colInfo.columnName)"></mat-checkbox>
                                 </div>
                             </th>
@@ -168,11 +174,13 @@
 
                                 <div *ngIf="colInfo.numNulls > 0">
                                     <button class="w-100" mat-raised-button [ngClass]="{ 'menu-disabled' : !columnsChecked[i]}" [matMenuTriggerFor]="menu" id="main_{{colInfo.columnName}}" #nullValMenu>
-                                    <div class="cell-align">
-                                        {{nullValOption[i]}}
-                                        <mat-icon>arrow_drop_down</mat-icon>
-                                    </div>
-                                </button>
+                                        <div class="cell-align">
+                                            <div [ngClass]="{'text-overflow' : experiment.nullValuesReplacers[i].option == NullValueOptions.Replace}">
+                                                {{nullValOption[i]}}
+                                            </div>
+                                            <mat-icon>arrow_drop_down</mat-icon>
+                                        </div>
+                                    </button>
                                     <mat-menu #menu="matMenu">
                                         <!--<button mat-menu-item (click)="MissValsDeleteClicked($event, NullValueOptions.DeleteColumns, i)" value={{colInfo.columnName}}>Obriši kolonu</button>-->
                                         <button mat-menu-item (click)="MissValsDeleteClicked($event, NullValueOptions.DeleteRows, i)" value={{colInfo.columnName}}>Obriši redove ({{colInfo.numNulls}})</button>
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index 810ad05d..fe21e7b1 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -1,6 +1,5 @@
 #folder {
     width: 100%;
-    
 }
 
 #tabs {
@@ -186,10 +185,10 @@
 .file-bottom-buttons {
     position: relative;
     position: relative;
-    top:-36px
-    
+    top: -36px
 }
-.file-bottom-buttons-helper{
+
+.file-bottom-buttons-helper {
     position: relative;
     display: flex;
     flex-direction: row-reverse;
@@ -226,4 +225,14 @@
 .highlight-exp {
     /*font-size: 16px;*/
     font-weight: 700;
+}
+
+.text-overflow {
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+}
+
+.selected-file-tab {
+    max-width: 230px !important;
 }
\ No newline at end of file
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index 54444e95..bf0bad10 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -13,8 +13,8 @@
             <a class="m-1 stretched-link tab-link" (click)="selectTab(tab)" (mouseenter)="hoverOverTab(tab)" (mouseleave)="hoverOverTab(TabType.None)">{{tabTitles[tab]}}</a>
         </div>
 
-        <div class="folder-tab p-1 rounded-top" *ngIf="selectedFile" [style]="'z-index:' + (selectedTab == TabType.File ? 11 : (tabsToShow.length)) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.File, 'hover-tab' : hoverTab == TabType.File}">
-            <a class="m-1 stretched-link tab-link" (click)="selectTab(TabType.File)" (mouseenter)="hoverOverTab(TabType.File)" (mouseleave)="hoverOverTab(TabType.None)">{{selectedFile.name}}</a>
+        <div class="folder-tab p-1 rounded-top selected-file-tab" *ngIf="selectedFile" [style]="'z-index:' + (selectedTab == TabType.File ? 11 : (tabsToShow.length)) + ' ;'" [ngClass]="{'selected-tab' : selectedTab == TabType.File, 'hover-tab' : hoverTab == TabType.File}">
+            <a class="m-1 stretched-link tab-link text-overflow" (click)="selectTab(TabType.File)" (mouseenter)="hoverOverTab(TabType.File)" (mouseleave)="hoverOverTab(TabType.None)">{{selectedFile.name}}</a>
         </div>
     </div>
     <div id="selected-content" class="rounded-bottom text-offwhite">
@@ -105,7 +105,7 @@
                     </div>
 
                 </div>
-                <div class="list-add" [ngSwitch]="type" *ngIf="privacy != Privacy.Public" >
+                <div class="list-add" [ngSwitch]="type" *ngIf="privacy != Privacy.Public">
                     <!-- {{privacy == Privacy.Public ? 'javni ' : ' '}} -->
                     <button mat-raised-button *ngSwitchCase="FolderType.Dataset" (click)="selectNewFile()">Dodaj izvor podataka</button>
                     <button mat-raised-button *ngSwitchCase="FolderType.Model" (click)="selectNewFile()">Dodaj konfiguraciju neuronske mreže</button>
@@ -152,17 +152,17 @@
     <div [ngSwitch]="newFileSelected" *ngIf="!listView">
         <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
             <div class="file-bottom-buttons-helper">
-            <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
+                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
                 <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;">
+                <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 matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
             </button>
-        </div>
+            </div>
             <!-- <button class="btn-clear file-button">
                 <mat-icon>zoom_out_map</mat-icon>
             </button> -->
         </div>
     </div>
-    
+
 </div>
\ No newline at end of file
-- 
cgit v1.2.3


From d9f2acad56bc42a05ae9c0b4fd25827fb6cea374 Mon Sep 17 00:00:00 2001
From: Ivan Ljubisavljevic <ivan996sk@gmail.com>
Date: Thu, 26 May 2022 22:07:42 +0200
Subject: Ispravljen bug sa OK dugmetom (kod ucitanog dataseta)

---
 .../src/app/_elements/folder/folder.component.css  |  9 ++++--
 .../src/app/_elements/folder/folder.component.html | 35 +++++++++++-----------
 .../notifications/notifications.component.html     |  2 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

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

diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index fe21e7b1..dd984918 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -184,14 +184,19 @@
 
 .file-bottom-buttons {
     position: relative;
-    position: relative;
-    top: -36px
+    display: flex;
+    flex-direction: row-reverse;
+    height: 0;
+
 }
 
+
 .file-bottom-buttons-helper {
     position: relative;
     display: flex;
     flex-direction: row-reverse;
+    width: fit-content;
+    height: 45px;
 }
 
 .file-button {
diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html
index bf0bad10..eed0eb1e 100644
--- a/frontend/src/app/_elements/folder/folder.component.html
+++ b/frontend/src/app/_elements/folder/folder.component.html
@@ -72,10 +72,10 @@
                         </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 matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
+                                <mat-icon matTooltip="Preuzmi" matTooltipPosition="above">download</mat-icon>
                             </button>
                             <button class="btn-clear file-button" (click)="deleteFile(file, $event)" style="display: inline-block;">
-                                <mat-icon matTooltip="Obriši" matTooltipPosition="right">delete</mat-icon>
+                                <mat-icon matTooltip="Obriši" matTooltipPosition="above">delete</mat-icon>
                             </button>
                         </div>
                         <div class="mx-2 hover-show" *ngIf="selectedTab == TabType.PublicDatasets || selectedTab == TabType.PublicModels">
@@ -114,6 +114,21 @@
             </div>
         </div>
     </div>
+    <div [ngSwitch]="newFileSelected" *ngIf="!listView">
+        <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
+            <div class="file-bottom-buttons-helper">
+                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
+                    <mat-icon matTooltip="Obriši" matTooltipPosition="above">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 matTooltip="Preuzmi" matTooltipPosition="above">download</mat-icon>
+                </button>
+            </div>
+            <!-- <button class="btn-clear file-button">
+                <mat-icon>zoom_out_map</mat-icon>
+            </button> -->
+        </div>
+    </div>
     <div id="footer" [ngSwitch]="newFileSelected" *ngIf="!listView">
         <button mat-button (click)="saveNewFile()" class="bottom-button text-offwhite rounded-bottom" [disabled]="saveDisabled" *ngSwitchCase="true">
             <div  class="f-row">
@@ -149,20 +164,6 @@
             </button>
         </ng-container>
     </div>
-    <div [ngSwitch]="newFileSelected" *ngIf="!listView">
-        <div class="file-bottom-buttons" *ngIf="selectedTab != TabType.NewFile">
-            <div class="file-bottom-buttons-helper">
-                <button *ngIf="this.selectedFile && selectedTab == TabType.File && privacy != Privacy.Public" class="btn-clear file-button" (click)="deleteFile(this.selectedFile, $event)">
-                <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 matTooltip="Preuzmi" matTooltipPosition="before">download</mat-icon>
-            </button>
-            </div>
-            <!-- <button class="btn-clear file-button">
-                <mat-icon>zoom_out_map</mat-icon>
-            </button> -->
-        </div>
-    </div>
+    
 
 </div>
\ No newline at end of file
diff --git a/frontend/src/app/_elements/notifications/notifications.component.html b/frontend/src/app/_elements/notifications/notifications.component.html
index 3b2f4eaa..d3218a96 100644
--- a/frontend/src/app/_elements/notifications/notifications.component.html
+++ b/frontend/src/app/_elements/notifications/notifications.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="notifications && notifications.length > 0" class="position-fixed card card-body p-1 m-3" style="bottom: 0; right: 0; width: 18rem;">
+<div *ngIf="notifications && notifications.length > 0" class="position-fixed card card-body p-1 m-3" style="bottom: 0; right: 0; width: 18rem; z-index: 5000;">
     <h2 class="m-auto" (click)="closed = !closed;" data-bs-toggle="collapse" href="#collapseNotifs" role="button" aria-expanded="true" aria-controls="collapseNotifs">
         Notifikacije
         <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
-- 
cgit v1.2.3


From fb12795236f6c3879e448ca1ef844ef7ace52a66 Mon Sep 17 00:00:00 2001
From: Danijel Anđelković <adanijel99@gmail.com>
Date: Mon, 6 Jun 2022 05:15:05 +0200
Subject: Popravio z index za donje dugmice u folderu.

---
 frontend/src/app/_elements/folder/folder.component.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

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

diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css
index dd984918..b2363816 100644
--- a/frontend/src/app/_elements/folder/folder.component.css
+++ b/frontend/src/app/_elements/folder/folder.component.css
@@ -187,10 +187,8 @@
     display: flex;
     flex-direction: row-reverse;
     height: 0;
-
 }
 
-
 .file-bottom-buttons-helper {
     position: relative;
     display: flex;
@@ -208,7 +206,7 @@
     margin: 5px;
     padding: 5px;
     cursor: pointer;
-    z-index: 1001;
+    z-index: 801;
     display: flex;
     flex-direction: row;
     align-items: center;
-- 
cgit v1.2.3