diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index 8c2857e08..d338497a3 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -6004,7 +6004,7 @@ class SurveyAdminSettings {
echo '
'.$lang['srv_casi_po_vprasanjih_skupaj'].' | '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s | | '.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s | | |
';
@@ -6153,7 +6151,7 @@ class SurveyAdminSettings {
echo '';
}
- echo '
'.$lang['srv_casi_po_vprasanjih_skupaj'].' | '.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s |
';
+ echo '
'.$lang['srv_casi_po_vprasanjih_skupaj'].' | '.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s | | | |
';
echo '';
@@ -6187,7 +6185,6 @@ class SurveyAdminSettings {
echo '
'.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].' | ';
echo '
'.$lang['srv_bruto_v_cas'].' | ';
echo '
'.$lang['srv_verjetnost_pojavitve'].' | ';
- echo '
'.$lang['srv_neto_v_cas'].' | ';
echo '
'.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].' | ';
echo '';
@@ -6195,7 +6192,7 @@ class SurveyAdminSettings {
if($vprasanje[4]){
if (!$prevstran || $prevstran != $vprasanje[4]) {
- echo '
'.$vprasanje[4].' |
---|
';
+ echo '
'.$vprasanje[4].' |
';
$prevstran = $vprasanje[4];
}
@@ -6207,7 +6204,6 @@ class SurveyAdminSettings {
echo '
'.skrajsaj($vprasanje[2], 30).' | ';
echo '
'.round($bruto, 1).'s | ';
echo '
'.round($verjetnost*100, 2).'% | ';
- echo '
'.round($neto, 1).'s | ';
echo '
';
echo round($neto, 1).'s / '.round($bruto, 1).'s';
@@ -6227,7 +6223,7 @@ class SurveyAdminSettings {
}
}
- echo ' | '.$lang['srv_casi_po_vprasanjih_skupaj'].' | '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s | | '.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s | | |
';
+ echo '
'.$lang['srv_casi_po_vprasanjih_skupaj'].' | '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s | | | |
';
echo '';
echo '
';
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index d42d4501d..ede551dc5 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -10004,41 +10004,52 @@ div.srv_diagnostic h2:first-of-type {
margin-top: 0;
}
-div.subpage_predvidenicas table {
+div.subpage_predvidenicas table,
+div.subpage_cas table {
width: 100%;
white-space: nowrap;
}
-div.subpage_predvidenicas table td.graph_cell {
+div.subpage_predvidenicas table td.graph_cell,
+div.subpage_cas table td.graph_cell {
width: 100%;
}
-div.subpage_predvidenicas table td.graph_cell div.graph_cell {
+div.subpage_predvidenicas table td.graph_cell div.graph_cell,
+div.subpage_cas table td.graph_cell div.graph_cell {
display: flex;
flex-direction: row;
}
-div.subpage_predvidenicas table td.time {
+div.subpage_predvidenicas table td.time,
+div.subpage_cas table td.time {
padding-right: 0;
}
-div.subpage_predvidenicas div.graph_full {
+div.subpage_predvidenicas div.graph_full,
+div.subpage_cas div.graph_full {
background-color: #1E88E5;
height: 24px;
text-align: right;
}
-div.subpage_predvidenicas div.graph_empty {
+div.subpage_predvidenicas div.graph_empty,
+div.subpage_cas div.graph_empty {
background-color: #E5E5E5;
height: 24px;
}
-div.subpage_predvidenicas div.tabela_trajanje_legenda {
+div.subpage_predvidenicas div.tabela_trajanje_legenda,
+div.subpage_cas div.tabela_trajanje_legenda {
display: flex;
flex-direction: row;
justify-content: start;
+ align-items: center;
margin-top: 16px;
}
-div.subpage_predvidenicas div.tabela_trajanje_legenda div.legend {
+div.subpage_predvidenicas div.tabela_trajanje_legenda div.legend,
+div.subpage_cas div.tabela_trajanje_legenda div.legend {
width: 16px;
height: 16px;
margin-right: 8px;
+ border-radius: 2px;
}
-div.subpage_predvidenicas div.tabela_trajanje_legenda span.legend {
+div.subpage_predvidenicas div.tabela_trajanje_legenda span.legend,
+div.subpage_cas div.tabela_trajanje_legenda span.legend {
margin-right: 32px;
}
diff --git a/resources/sass/admin_new/pages/my_surveys/testiranje.scss b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
index 6a12b1405..704a25dc6 100644
--- a/resources/sass/admin_new/pages/my_surveys/testiranje.scss
+++ b/resources/sass/admin_new/pages/my_surveys/testiranje.scss
@@ -12,8 +12,9 @@ div.srv_diagnostic {
}
}
-//OCENJEVANJE TRAJANJA
-div.subpage_predvidenicas {
+//OCENJEVANJE TRAJANJA, DEJANSKI ČASI
+div.subpage_predvidenicas,
+div.subpage_cas {
table {
width: 100%;
@@ -49,6 +50,7 @@ div.subpage_predvidenicas {
display: flex;
flex-direction: row;
justify-content: start;
+ align-items: center;
margin-top: 16px;
@@ -56,6 +58,7 @@ div.subpage_predvidenicas {
width: 16px;
height: 16px;
margin-right: 8px;
+ border-radius: 2px;
}
span.legend {