may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Testiranje --> Trajanje --> Ocenjevanje trajanja -v3

Browse Source
This commit is contained in:
tejagerjovic 2022-03-03 22:38:40 +01:00
parent 1bf8c31d5c
commit 1e51227398
3 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/survey/SurveyAdminSettings.php
View File

@ -6004,7 +6004,7 @@ class SurveyAdminSettings {
echo '<fieldset><legend>'.$lang['srv_total_trajanje'].'</legend>';
echo '<p class="bold">'.$lang['srv_dejansko_trajanje'].':</p>';
echo '<p class="semi-bold">'.$lang['srv_dejansko_trajanje'].':</p>';
echo '<p>'.$skupni_cas.'</p>';
echo '</fieldset>';
@ -6069,14 +6069,13 @@ class SurveyAdminSettings {
echo '<th>'.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].'</th>';
echo '<th>'.$lang['srv_bruto_v_cas'].'</th>';
echo '<th>'.$lang['srv_verjetnost_pojavitve'].'</th>';
echo '<th>'.$lang['srv_neto_v_cas'].'</th>';
echo '<th colspan="2">'.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].'</th>';
echo '</tr>';
foreach ($expected_vprasanja AS $vprasanje) {
if (!$prevstran || $prevstran != $vprasanje[3]) {
echo '<tr><td class="bold" colspan="6">'.$vprasanje[3].'</td></tr>';
echo '<tr><td class="semi-bold" colspan="5">'.$vprasanje[3].'</td></tr>';
$prevstran = $vprasanje[3];
}
@ -6088,7 +6087,6 @@ class SurveyAdminSettings {
echo '<td><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td>';
echo '<td class="right">'.round($bruto, 1).'s</td>';
echo '<td class="center">'.round($verjetnost*100, 2).'%</td>';
echo '<td class="center">'.round($neto, 1).'s</td>';
echo '<td class="right time">';
echo round($neto, 1).'s / <span class="gray">'.round($bruto, 1).'s</span>';
@ -6107,7 +6105,7 @@ class SurveyAdminSettings {
echo '</tr>';
}
echo '<tr class="bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="center">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</td><td></td><td></td><tr>';
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td></td><td></td></tr>';
echo '</table>';
echo '<div class="tabela_trajanje_legenda">';
@ -6153,7 +6151,7 @@ class SurveyAdminSettings {
echo '</tr>';
}
echo '<tr class="bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="nowrap">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</td></tr>';
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</td><td></td><td></td><td></td></tr>';
echo '</table>';
@ -6187,7 +6185,6 @@ class SurveyAdminSettings {
echo '<th>'.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].'</th>';
echo '<th>'.$lang['srv_bruto_v_cas'].'</th>';
echo '<th>'.$lang['srv_verjetnost_pojavitve'].'</th>';
echo '<th>'.$lang['srv_neto_v_cas'].'</th>';
echo '<th colspan="2">'.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].'</th>';
echo '</tr>';
@ -6195,7 +6192,7 @@ class SurveyAdminSettings {
if($vprasanje[4]){
if (!$prevstran || $prevstran != $vprasanje[4]) {
echo '<tr><th style="text-align:left; border-bottom:1px solid #E4E4F9; padding-top:10px" colspan="5">'.$vprasanje[4].'</th></tr>';
echo '<tr><td class="semi-bold" colspan="5">'.$vprasanje[4].'</td></tr>';
$prevstran = $vprasanje[4];
}
@ -6207,7 +6204,6 @@ class SurveyAdminSettings {
echo '<td><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td>';
echo '<td class="right">'.round($bruto, 1).'s</td>';
echo '<td class="center">'.round($verjetnost*100, 2).'%</td>';
echo '<td class="center">'.round($neto, 1).'s</td>';
echo '<td class="right time">';
echo round($neto, 1).'s / <span class="gray">'.round($bruto, 1).'s</span>';
@ -6227,7 +6223,7 @@ class SurveyAdminSettings {
}
}
echo '<tr class="bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td class="center">'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</td><td></td><td></td><tr>';
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right">'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</td><td></td><td></td><td></td></tr>';
echo '</table>';
echo '<div class="tabela_trajanje_legenda">';

29
public/css/admin_new.css
View File

@ -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;
}

7
resources/sass/admin_new/pages/my_surveys/testiranje.scss
View File

@ -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 {