diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 79792948e..51b6eaadb 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -6031,9 +6031,9 @@ class SurveyAdminSettings { echo ''; echo '
'; - echo '
 
'; + echo '
'; if ((($time[1]-$time[0])/$max*85) > 0) - echo '
 
'; + echo '
'; echo '
'; echo ''; @@ -6096,9 +6096,9 @@ class SurveyAdminSettings { echo ''; echo '
'; - echo '
 
'; + echo '
'; if (($bruto-$neto)/$max*85 > 0) - echo '
 
'; + echo '
'; echo '
'; echo ''; @@ -6144,9 +6144,9 @@ class SurveyAdminSettings { echo ''; echo '
'; - echo '
 
'; + echo '
'; if ((($time[1]-$time[0])/$maxb*85) > 0) - echo '
 
'; + echo '
'; echo '
'; echo ''; @@ -6213,9 +6213,9 @@ class SurveyAdminSettings { echo ''; echo '
'; - echo '
 
'; + echo '
'; if (($bruto-$neto)/$max*85 > 0) - echo '
 
'; + echo '
'; echo '
'; echo ''; @@ -6721,11 +6721,28 @@ class SurveyAdminSettings { // izpis + $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + $predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0); + + echo '
'.$lang['srv_total_trajanje'].''; + echo '

'.$lang['srv_dejansko_trajanje_real'].':

'; + echo '

'.$skupni_cas.'

'; + echo '
'; + echo '
'.$lang['srv_dejanski_casi'].''; - echo ''; - echo ''; + + echo '

'; + + echo '
'; - echo ''; - echo ''.$lang['srv_stevilo_enot'].'
'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; foreach ($povprecni_casi AS $vrstni_red => $time) { @@ -6735,49 +6752,58 @@ class SurveyAdminSettings { $bruto = $povprecni_casi_bruto[$vrstni_red]; echo ''; - echo ''; - - echo ''; + echo ''; - echo ''; - - echo ''; - + echo ''; - echo ''; - - echo ''; - echo ''; - echo ''; + + echo '
'; } + + echo ''; + echo ''; + + echo ''; + + echo ''; } - if ($_GET['predvideni'] != 1) - echo ''; - echo ''; + + echo ''; + + echo ''; echo '
'.$lang['srv_casi_po_straneh_stran'].''.$lang['srv_neto_v_cas']; + if ($_GET['predvideni'] == 1) { + echo ' / '.$lang['srv_testiranje_predvidenicas_1']; + } + echo ''.$lang['srv_stevilo_enot'].'
'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; - echo '
 
'; - //if ($bruto-$time > 0) - //echo '
 
'; - echo ' '.($time<60?round($time,1).'s ':round($time/60,1).'min ')./*'/ '.($bruto<60?round($bruto,1).'s ':round($bruto/60,1).'min ').''.*/''; + echo '
'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''.($time<60 ? round($time,1).'s ' : round($time/60,1).'min '); + if ($_GET['predvideni'] == 1) { + if ($rezanje_preskocene == 1) + $time = $expected_time[$vrstni_red][0]; + else + $time = $expected_time[$vrstni_red][1]; + + echo ' / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').''; + } echo ''.$count[$vrstni_red]./*' / '.$count_bruto[$vrstni_red].''.*/'
'; + echo '
'; + echo '
'; if ($_GET['predvideni'] == 1) { if ($rezanje_preskocene == 1) $time = $expected_time[$vrstni_red][0]; else $time = $expected_time[$vrstni_red][1]; - echo '
'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; - echo '
 
'; - //if ((($time[1]-$time[0])/$max*85) > 0) - // echo '
 
'; - echo ' '.($time<60?round($time,1).'s ':round($time/60,1).'min ')./*'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''.*/''; - echo '
'.$count[$vrstni_red].'
'.$lang['srv_anl_suma1'].': '.(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; - if ($_GET['predvideni'] == 1) echo ' / '.$lang['srv_skupaj_predvideni'].': '.(bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0).'s'; - echo '
'.$lang['srv_anl_suma1'].''.$skupni_cas; + if ($_GET['predvideni'] == 1) { + if ($rezanje_preskocene == 1) + $time = $expected_time[$vrstni_red][0]; + else + $time = $expected_time[$vrstni_red][1]; + + echo ' / '.$predviden_cas.''; + } + echo '
'; - - if ($_GET['predvideni'] == 1) { - echo '

 
- '.$lang['srv_neto_t_cas'].''; - echo '
 
- '.$lang['srv_testiranje_predvidenicas'].'

'; - } + + echo '
'; + echo '
'.$lang['srv_neto_t_cas'].''; + if ($_GET['predvideni'] == 1) + echo '
'.$lang['srv_testiranje_predvidenicas_1'].''; + echo '
'; echo '
'; @@ -6790,16 +6816,20 @@ class SurveyAdminSettings { // izpis histograma casov za vsako stran - echo '
'.$lang['srv_frekvencna_porazdelitev'].''; - - echo '

'; - echo ' '; - echo '

'; + echo '
'.$lang['srv_frekvencna_porazdelitev'].''; + + echo '
'; + + echo '
'; + echo ''; + echo '
'; if ($rezanje_preskocene == 1) { - echo '

'; + echo '

'; echo ' '; - echo '

'; + echo '
'; } + + echo '
'; // zdruzimo vse case po straneh na en graf if ($_GET['pages'] != '1') { @@ -6835,7 +6865,7 @@ class SurveyAdminSettings { if ($_GET['pages'] == '1') { $sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'"); $row = mysqli_fetch_array($sql); - echo '

'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'

'; + echo '

'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'

'; } echo ''; diff --git a/lang/1.php b/lang/1.php index baf1a2065..9a3461771 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4014,10 +4014,11 @@ $lang = array ( "srv_tip_standard_993" => "Upload datoteke", "srv_tip_standard_994" => "Ime priimek", "srv_tip_standard_996" => "Podpis", - "srv_vkljuci_predvidene" => "Prikaži tudi predvidene čase", - "srv_vkljuci_preskocene" => "Prikaži tudi čase za preskočene strani", + "srv_vkljuci_predvidene" => "V tabeli prikaži tudi predvidene čase", + "srv_vkljuci_preskocene" => "Prikaži tudi čase za preskočene strani", "srv_total_trajanje" => "Celoten čas trajanja ankete", "srv_dejansko_trajanje" => "Predvideno dejansko trajanje ankete", + "srv_dejansko_trajanje_real" => "Dejansko trajanje ankete", "srv_casi_po_straneh" => "Časi po straneh", "srv_casi_po_straneh_stran" => "Stran", "srv_casi_po_blokih" => "Časi po blokih", diff --git a/lang/2.php b/lang/2.php index ef5535580..3e8e37eb2 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3995,10 +3995,11 @@ $lang = array ( "srv_tip_standard_993" => "File upload", "srv_tip_standard_994" => "First Name Last name", "srv_tip_standard_996" => "Signature", - "srv_vkljuci_predvidene" => "Show estimated time", + "srv_vkljuci_predvidene" => "Include estimated times in the table", "srv_vkljuci_preskocene" => "Also show time for skipped pages", "srv_total_trajanje" => "Total survey duration", "srv_dejansko_trajanje" => "Estimated actual duration of survey", + "srv_dejansko_trajanje_real" => "Actual duration of survey", "srv_casi_po_straneh" => "Times by pages", "srv_casi_po_straneh_stran" => "Page", "srv_casi_po_vprasanjih_vprasanje" => "Question", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index a5f0c95c1..457c43ad5 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10092,6 +10092,10 @@ div.subpage_predvidenicas table td.time, div.subpage_cas table td.time { padding-right: 0; } +div.subpage_predvidenicas table td.predvideni, +div.subpage_cas table td.predvideni { + color: #C4C4C4; +} div.subpage_predvidenicas div.graph_full, div.subpage_cas div.graph_full { background-color: #1E88E5; @@ -10103,6 +10107,11 @@ div.subpage_cas div.graph_empty { background-color: #E5E5E5; height: 24px; } +div.subpage_predvidenicas div.graph_red, +div.subpage_cas div.graph_red { + background-color: #FFE3E3; + height: 24px; +} div.subpage_predvidenicas div.tabela_trajanje_legenda, div.subpage_cas div.tabela_trajanje_legenda { display: flex; diff --git a/resources/sass/admin_new/pages/my_surveys/testiranje.scss b/resources/sass/admin_new/pages/my_surveys/testiranje.scss index deaf7c641..26caafcde 100644 --- a/resources/sass/admin_new/pages/my_surveys/testiranje.scss +++ b/resources/sass/admin_new/pages/my_surveys/testiranje.scss @@ -107,6 +107,10 @@ div.subpage_cas { td.time { padding-right: 0; } + + td.predvideni { + color: $dark-gray; + } } div.graph_full { @@ -120,6 +124,11 @@ div.subpage_cas { height: 24px; } + div.graph_red { + background-color: $status-red; + height: 24px; + } + div.tabela_trajanje_legenda { display: flex; flex-direction: row;