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

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

Browse Source
This commit is contained in:
tejagerjovic 2022-03-03 20:49:11 +01:00
parent c3bd54a178
commit 1bf8c31d5c
3 changed files with 155 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
admin/survey/SurveyAdminSettings.php
View File

@ -6061,15 +6061,22 @@ class SurveyAdminSettings {
$prevstran = false; $prevstran = false;
echo '<br />';
echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_strani'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_strani'].'</legend>';
echo '<table style="width:100%">';
echo '<tr><td></td><th>'.$lang['srv_bruto_v_cas'].'</th><th>'.$lang['srv_verjetnost_pojavitve'].'</th><th>'.$lang['srv_neto_v_cas'].'</th></tr>'; echo '<table>';
echo '<tr>';
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) { foreach ($expected_vprasanja AS $vprasanje) {
if (!$prevstran || $prevstran != $vprasanje[3]) { if (!$prevstran || $prevstran != $vprasanje[3]) {
echo '<tr><th style="text-align:left; border-bottom:1px solid #E4E4F9; padding-top:10px" colspan="5">'.$vprasanje[3].'</th></tr>'; echo '<tr><td class="bold" colspan="6">'.$vprasanje[3].'</td></tr>';
$prevstran = $vprasanje[3]; $prevstran = $vprasanje[3];
} }
@ -6077,18 +6084,37 @@ class SurveyAdminSettings {
$verjetnost = $vprasanje[1]; $verjetnost = $vprasanje[1];
$neto = $bruto * $verjetnost; $neto = $bruto * $verjetnost;
echo '<tr><td align="left"><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td><td align="center">'.round($bruto, 1).'s</td><td align="center">'.round($verjetnost*100, 2).'%</td><td align="center">'.round($neto, 1).'s</td>'; echo '<tr>';
echo '<td style="width:50%">'; echo '<td><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td>';
echo ' <div class="graph_db" style="text-align: right; float: left; width: '.($neto/$max*85).'%">&nbsp;</div>'; echo '<td class="right">'.round($bruto, 1).'s</td>';
if (($bruto-$neto)/$max*85 > 0) echo '<td class="center">'.round($verjetnost*100, 2).'%</td>';
echo ' <div class="graph_lb" style="border-left:0; text-align: right; float: left; width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>'; echo '<td class="center">'.round($neto, 1).'s</td>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left; color: gray">'.round($neto, 1).'s / '.round($bruto, 1).'s</span>';
echo '<td class="right time">';
echo round($neto, 1).'s / <span class="gray">'.round($bruto, 1).'s</span>';
echo '</td>'; echo '</td>';
echo '<td class="graph_cell">';
echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width: '.($neto/$max*85).'%">&nbsp;</div>';
if (($bruto-$neto)/$max*85 > 0)
echo ' <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>';
echo '</div>';
echo '</td>';
echo '</tr>'; echo '</tr>';
} }
echo '<tr><th></th><th>'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</th><th></th><th>'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</th><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 '</table>'; echo '</table>';
echo '<div class="tabela_trajanje_legenda">';
echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_v_cas'].'</span>';
echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_v_cas_long'].'</span>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
//CASI PO BLOKIH //CASI PO BLOKIH
@ -6101,30 +6127,40 @@ class SurveyAdminSettings {
$totalb += $val[0]; $totalb += $val[0];
} }
echo '<br />';
echo '<fieldset><legend>'.$lang['srv_casi_po_blokih'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_casi_po_blokih'].'</legend>';
echo '<table style="width:100%">'; echo '<table>';
echo '<tr>';
echo '<th>'.$lang['srv_casi_po_blokih_blok'].'</th>';
echo '<th colspan="2">'.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'</th>';
echo '</tr>';
foreach ($expected_time_block AS $vrstni_red => $time) { foreach ($expected_time_block AS $vrstni_red => $time) {
echo '<tr>'; echo '<tr>';
echo '<th style="text-align:left; padding: 0 20px 0 0" nowrap>'.$block_labels_by_number[$vrstni_red+1].'</th>'; echo '<td class="nowrap">'.$block_labels_by_number[$vrstni_red+1].'</td>';
echo '<td style="width:100%">'; echo '<td class="right time">';
echo ' <div class="graph_db" style="text-align: right; float: left; width: '.($time[0]/$maxb*85).'%">&nbsp;</div>'; 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="graph_full" style="width: '.($time[0]/$maxb*85).'%">&nbsp;</div>';
if ((($time[1]-$time[0])/$maxb*85) > 0) if ((($time[1]-$time[0])/$maxb*85) > 0)
echo ' <div class="graph_lb" style="border-left: 0; text-align: right; float: left; width: '.(($time[1]-$time[0])/$maxb*85).'%">&nbsp;</div>'; echo ' <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$maxb*85).'%">&nbsp;</div>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'<span style="color:gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span></span>'; echo '</div>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }
echo '<tr><td colspan="3" style="border-bottom:1px solid #E4E4F9"></td></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><td></td><th style="text-align:left; padding-right: 20px" nowrap>'.$lang['srv_anl_suma1'].': '.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s</th></tr>';
echo '</table>'; echo '</table>';
echo '<p><div class="graph_db" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_neto_t_cas'].'</span>'; echo '<div class="tabela_trajanje_legenda">';
echo '<div class="graph_lb" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_bruto_t_cas'].'</span></p>'; echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_t_cas'].'</span>';
echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_t_cas'].'</span>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
@ -6143,12 +6179,20 @@ class SurveyAdminSettings {
$prevstran = false; $prevstran = false;
echo '<br />';
echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_bloki'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_casi_po_vprasanjih_bloki'].'</legend>';
echo '<table style="width:100%">';
echo '<tr><td></td><th>'.$lang['srv_bruto_v_cas'].'</th><th>'.$lang['srv_verjetnost_pojavitve'].'</th><th>'.$lang['srv_neto_v_cas'].'</th></tr>'; echo '<table>';
echo '<tr>';
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) { foreach ($expected_vprasanja AS $vprasanje) {
if($vprasanje[4]){ if($vprasanje[4]){
if (!$prevstran || $prevstran != $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><th style="text-align:left; border-bottom:1px solid #E4E4F9; padding-top:10px" colspan="5">'.$vprasanje[4].'</th></tr>';
@ -6159,18 +6203,38 @@ class SurveyAdminSettings {
$verjetnost = $vprasanje[1]; $verjetnost = $vprasanje[1];
$neto = $bruto * $verjetnost; $neto = $bruto * $verjetnost;
echo '<tr><td align="left"><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td><td align="center">'.round($bruto, 1).'s</td><td align="center">'.round($verjetnost*100, 2).'%</td><td align="center">'.round($neto, 1).'s</td>'; echo '<tr>';
echo '<td style="width:50%">'; echo '<td><span title="'.$vprasanje[2].'">'.skrajsaj($vprasanje[2], 30).'</span></td>';
echo ' <div class="graph_db" style="text-align: right; float: left; width: '.($neto/$max*85).'%">&nbsp;</div>'; echo '<td class="right">'.round($bruto, 1).'s</td>';
if (($bruto-$neto)/$max*85 > 0) echo '<td class="center">'.round($verjetnost*100, 2).'%</td>';
echo ' <div class="graph_lb" style="border-left:0; text-align: right; float: left; width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>'; echo '<td class="center">'.round($neto, 1).'s</td>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left; color: gray">'.round($neto, 1).'s / '.round($bruto, 1).'s</span>';
echo '<td class="right time">';
echo round($neto, 1).'s / <span class="gray">'.round($bruto, 1).'s</span>';
echo '</td>'; echo '</td>';
echo '<td class="graph_cell">';
echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width: '.($neto/$max*85).'%">&nbsp;</div>';
if (($bruto-$neto)/$max*85 > 0)
echo ' <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>';
echo '</div>';
echo '</td>';
echo '</tr>'; echo '</tr>';
} }
} }
echo '<tr><th></th><th>'.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s</th><th></th><th>'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s</th><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 '</table>'; echo '</table>';
echo '<div class="tabela_trajanje_legenda">';
echo '<div class="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_v_cas'].'</span>';
echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_bruto_v_cas_long'].'</span>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
} }
} }

4
lang/1.php
View File

@ -3960,6 +3960,7 @@ $lang = array (
"srv_bruto_cas" => "Bruto &#269;as", "srv_bruto_cas" => "Bruto &#269;as",
"srv_neto_cas" => "Neto &#269;as", "srv_neto_cas" => "Neto &#269;as",
"srv_bruto_v_cas" => "Brez pogojev", "srv_bruto_v_cas" => "Brez pogojev",
"srv_bruto_v_cas_long" => "Trajanje brez pogojev",
"srv_neto_v_cas" => "Dejansko trajanje", "srv_neto_v_cas" => "Dejansko trajanje",
"srv_bruto_t_cas" => "Trajanje z upoštevanjem vseh vprašanj (brez pogojev)", "srv_bruto_t_cas" => "Trajanje z upoštevanjem vseh vprašanj (brez pogojev)",
"srv_neto_t_cas" => "Dejansko trajanje", "srv_neto_t_cas" => "Dejansko trajanje",
@ -4001,6 +4002,9 @@ $lang = array (
"srv_casi_po_straneh" => "Časi po straneh", "srv_casi_po_straneh" => "Časi po straneh",
"srv_casi_po_straneh_stran" => "Stran", "srv_casi_po_straneh_stran" => "Stran",
"srv_casi_po_blokih" => "Časi po blokih", "srv_casi_po_blokih" => "Časi po blokih",
"srv_casi_po_blokih_blok" => "Blok",
"srv_casi_po_vprasanjih_vprasanje" => "Vprašanje",
"srv_casi_po_vprasanjih_skupaj" => "Skupaj",
"srv_casi_po_vprasanjih_strani" => "Časi po vprašanjih (Strani)", "srv_casi_po_vprasanjih_strani" => "Časi po vprašanjih (Strani)",
"srv_casi_po_vprasanjih_bloki" => "Časi po vprašanjih (Bloki)", "srv_casi_po_vprasanjih_bloki" => "Časi po vprašanjih (Bloki)",
"srv_frekvencna_porazdelitev" => "Frekven&#269;na porazdelitev trajanja", "srv_frekvencna_porazdelitev" => "Frekven&#269;na porazdelitev trajanja",

4
lang/2.php
View File

@ -3945,6 +3945,7 @@ $lang = array (
"srv_bruto_cas" => "Gross time", "srv_bruto_cas" => "Gross time",
"srv_neto_cas" => "Net time", "srv_neto_cas" => "Net time",
"srv_bruto_v_cas" => "Without conditions", "srv_bruto_v_cas" => "Without conditions",
"srv_bruto_v_cas_long" => "Duration without conditions",
"srv_neto_v_cas" => "Actual duration", "srv_neto_v_cas" => "Actual duration",
"srv_bruto_t_cas" => "Duration considering all questions (without conditions)", "srv_bruto_t_cas" => "Duration considering all questions (without conditions)",
"srv_neto_t_cas" => "Actual duration", "srv_neto_t_cas" => "Actual duration",
@ -3985,9 +3986,12 @@ $lang = array (
"srv_dejansko_trajanje" => "Estimated actual duration of survey", "srv_dejansko_trajanje" => "Estimated actual duration of survey",
"srv_casi_po_straneh" => "Times by pages", "srv_casi_po_straneh" => "Times by pages",
"srv_casi_po_straneh_stran" => "Page", "srv_casi_po_straneh_stran" => "Page",
"srv_casi_po_vprasanjih_vprasanje" => "Question",
"srv_casi_po_vprasanjih_skupaj" => "Total",
"srv_casi_po_blokih" => "Times by blocks", "srv_casi_po_blokih" => "Times by blocks",
"srv_casi_po_vprasanjih_strani" => "Times by questions (Pages)", "srv_casi_po_vprasanjih_strani" => "Times by questions (Pages)",
"srv_casi_po_vprasanjih_bloki" => "Times by questions (Blocks)", "srv_casi_po_vprasanjih_bloki" => "Times by questions (Blocks)",
"srv_casi_po_blokih_blok" => "Block",
"srv_frekvencna_porazdelitev" => "Frequency distribution", "srv_frekvencna_porazdelitev" => "Frequency distribution",
"srv_dejanski_casi" => "Actual duration of survey", "srv_dejanski_casi" => "Actual duration of survey",
"srv_testni_nagovor" => "Expected number of answers per question. Test data are distributed evenly for questions with several answer categories. <br /><br />A random 4-digit variable is generated for numeric questions and random text with 10 characters is generated for text questions.", "srv_testni_nagovor" => "Expected number of answers per question. Test data are distributed evenly for questions with several answer categories. <br /><br />A random 4-digit variable is generated for numeric questions and random text with 10 characters is generated for text questions.",