From c4d5880586ebd73f080a921c4448c27308bf68b0 Mon Sep 17 00:00:00 2001
From: tejagerjovic <teja.gerjovic@fdv.uni-lj.si>
Date: Thu, 3 Mar 2022 18:01:30 +0100
Subject: [PATCH] [Redizajn 1KA] - Testiranje --> Trajanje --> Ocenjevanje
 trajanja - v1

---
 admin/survey/SurveyAdminSettings.php          | 20 ++++++++-----------
 public/css/admin_new.css                      | 11 +++++-----
 .../pages/my_surveys/testiranje.scss          | 11 ++++------
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index e88defe14..810a96aa9 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -6013,7 +6013,7 @@ class SurveyAdminSettings {
 
 		echo '<tr>';
 		echo '<th>'.$lang['srv_casi_po_straneh_stran'].'</th>';
-		echo '<th>'.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'</th>';
+		echo '<th colspan="2">'.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'</th>';
 		echo '</tr>';
 
 		
@@ -6022,26 +6022,22 @@ class SurveyAdminSettings {
 			$row = mysqli_fetch_array($sql);
 			
 			echo '<tr>';
-			echo '<td class="nowrap">'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
+			echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
 
 			echo '<td>';
+			echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
+			echo '</td>';
+
+			echo '<td class="graph_cell">';
 			echo '<div class="graph_cell">';
 
-			echo '<div class="time">';
-			echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ <span class="gray">'.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>';
-			echo '</div>';
-
-			echo '<div class="graph_full" style="text-align: right; float: left; width: '.($time[0]/$max*85).'%">&nbsp;</div>';
+			echo '<div class="graph_full" style="width: '.($time[0]/$max*85).'%">&nbsp;</div>';
 			if ((($time[1]-$time[0])/$max*85) > 0)
-				echo '  <div class="graph_empty" style="border-left: 0; text-align: right; float: left; width: '.(($time[1]-$time[0])/$max*85).'%">&nbsp;</div>';
+				echo '  <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$max*85).'%">&nbsp;</div>';
 			
 			echo '</div>';
 			echo '</td>';
 			
-			/*echo '<td style="width:100%">';
-			
-			echo '</td>';*/
-			
 			echo '</tr>';
 		}
 		echo '</table>';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 26d7a7608..2f9988159 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10006,16 +10006,15 @@ div.srv_diagnostic h2:first-of-type {
 
 div.subpage_predvidenicas table {
   width: 100%;
+  white-space: nowrap;
 }
-div.subpage_predvidenicas table td div.graph_cell {
+div.subpage_predvidenicas table td.graph_cell {
+  width: 100%;
+}
+div.subpage_predvidenicas table td.graph_cell div.graph_cell {
   display: flex;
   flex-direction: row;
 }
-div.subpage_predvidenicas table td div.graph_cell div.time {
-  min-width: 120px;
-  white-space: nowrap;
-  padding-right: 8px;
-}
 div.subpage_predvidenicas div.graph_full {
   background-color: #1E88E5;
   height: 24px;
diff --git a/resources/sass/admin_new/pages/my_surveys/testiranje.scss b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
index 6be0837dd..d73175fdb 100644
--- a/resources/sass/admin_new/pages/my_surveys/testiranje.scss
+++ b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
@@ -17,18 +17,15 @@ div.subpage_predvidenicas {
 
     table {
         width: 100%;
+        white-space: nowrap;
+
+        td.graph_cell {
+            width: 100%;
 
-        td {
             div.graph_cell {
                 
                 display:flex;
                 flex-direction: row;
-
-                div.time {
-                    min-width: 120px;
-                    white-space: nowrap;
-                    padding-right: 8px;
-                }
             }
         }
     }