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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source 
# Conflicts:
#	admin/survey/script/script.js
#	resources/sass/admin_new/basic/icons/standard.scss
This commit is contained in:
pero1203 2022-03-10 11:27:43 +01:00
commit 29c1fc69a8
16 changed files with 1742 additions and 1492 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/SurveyAdmin.php
View File

@ -5728,12 +5728,16 @@ class SurveyAdmin
/** prikaze div da so nastavitve shranjene in ga nato skrije /** prikaze div da so nastavitve shranjene in ga nato skrije
* *
*/ */
function displaySuccessSave() function displaySuccessSave(){
{
global $lang; global $lang;
echo $lang['srv_success_save']; echo $lang['srv_success_save'];
} }
function displaySuccessCopy() {
global $lang;
echo $lang['srv_diagnostika_testiranje_copied'];
}
/** pravilno redirekta admin url ankete /** pravilno redirekta admin url ankete
* če je anketa aktivna gre na dashboard * če je anketa aktivna gre na dashboard

2
admin/survey/SurveyAdminAjax.php
View File

@ -4557,6 +4557,8 @@ class SurveyAdminAjax {
UserSetting::getInstance()->saveUserSetting(); UserSetting::getInstance()->saveUserSetting();
} elseif ($_GET['a'] == 'display_success_save') { } elseif ($_GET['a'] == 'display_success_save') {
$this->SurveyAdmin->displaySuccessSave(); $this->SurveyAdmin->displaySuccessSave();
} elseif ($_GET['a'] == 'display_success_copy') {
$this->SurveyAdmin->displaySuccessCopy();
} elseif ($_GET['a'] == 'vnosi_show_status_casi') { } elseif ($_GET['a'] == 'vnosi_show_status_casi') {
SurveyStatusCasi :: Init($anketa); SurveyStatusCasi :: Init($anketa);
if (isset($pid) && $pid > 0) { if (isset($pid) && $pid > 0) {

146
admin/survey/SurveyAdminSettings.php
View File

@ -5869,6 +5869,11 @@ class SurveyAdminSettings {
echo $lang['srv_success_save']; echo $lang['srv_success_save'];
} }
function displaySuccessCopy() {
global $lang;
echo $lang['srv_diagnostika_testiranje_copied'];
}
function tabTestiranje () { function tabTestiranje () {
global $lang; global $lang;
@ -6031,9 +6036,9 @@ class SurveyAdminSettings {
echo '<td class="graph_cell">'; echo '<td class="graph_cell">';
echo '<div class="graph_cell">'; echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width: '.($time[0]/$max*85).'%">&nbsp;</div>'; echo '<div class="graph_full" style="width: '.($time[0]/$max*85).'%"></div>';
if ((($time[1]-$time[0])/$max*85) > 0) if ((($time[1]-$time[0])/$max*85) > 0)
echo ' <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$max*85).'%">&nbsp;</div>'; echo ' <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$max*85).'%"></div>';
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';
@ -6096,9 +6101,9 @@ class SurveyAdminSettings {
echo '<td class="graph_cell">'; echo '<td class="graph_cell">';
echo '<div class="graph_cell">'; echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width: '.($neto/$max*85).'%">&nbsp;</div>'; echo '<div class="graph_full" style="width: '.($neto/$max*85).'%"></div>';
if (($bruto-$neto)/$max*85 > 0) if (($bruto-$neto)/$max*85 > 0)
echo ' <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>'; echo ' <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%"></div>';
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';
@ -6144,9 +6149,9 @@ class SurveyAdminSettings {
echo '<td class="graph_cell">'; echo '<td class="graph_cell">';
echo '<div class="graph_cell">'; echo '<div class="graph_cell">';
echo ' <div class="graph_full" style="width: '.($time[0]/$maxb*85).'%">&nbsp;</div>'; echo ' <div class="graph_full" style="width: '.($time[0]/$maxb*85).'%"></div>';
if ((($time[1]-$time[0])/$maxb*85) > 0) if ((($time[1]-$time[0])/$maxb*85) > 0)
echo ' <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$maxb*85).'%">&nbsp;</div>'; echo ' <div class="graph_empty" style="width: '.(($time[1]-$time[0])/$maxb*85).'%"></div>';
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';
@ -6213,9 +6218,9 @@ class SurveyAdminSettings {
echo '<td class="graph_cell">'; echo '<td class="graph_cell">';
echo '<div class="graph_cell">'; echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width: '.($neto/$max*85).'%">&nbsp;</div>'; echo '<div class="graph_full" style="width: '.($neto/$max*85).'%"></div>';
if (($bruto-$neto)/$max*85 > 0) if (($bruto-$neto)/$max*85 > 0)
echo ' <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%">&nbsp;</div>'; echo ' <div class="graph_empty" style="width: '.(($bruto-$neto)/$max*85).'%"></div>';
echo '</div>'; echo '</div>';
echo '</td>'; echo '</td>';
@ -6721,11 +6726,28 @@ class SurveyAdminSettings {
// izpis // 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 '<fieldset><legend>'.$lang['srv_total_trajanje'].'</legend>';
echo '<p class="semi-bold">'.$lang['srv_dejansko_trajanje_real'].':</p>';
echo '<p>'.$skupni_cas.'</p>';
echo '</fieldset>';
echo '<fieldset><legend>'.$lang['srv_dejanski_casi'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_dejanski_casi'].'</legend>';
echo '<table style="width:100%" >';
echo '<tr><td></td><td>'; echo '<p class="bottom16"><input type="checkbox" name="predvideni" id="predvideni" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.($_GET['predvideni']==1?'0':'1').'&pages='.$_GET['pages'].'&prikazi01='.$_GET['prikazi01'].'\');" '.($_GET['predvideni']==1?'checked':'').' /><label for="predvideni">'.$lang['srv_vkljuci_predvidene'].'</label></p>';
echo '<input type="checkbox" name="predvideni" id="predvideni" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.($_GET['predvideni']==1?'0':'1').'&pages='.$_GET['pages'].'&prikazi01='.$_GET['prikazi01'].'\');" '.($_GET['predvideni']==1?'checked':'').' /><label for="predvideni">'.$lang['srv_vkljuci_predvidene'].'</label>';
echo '</td><td nowrap>'.$lang['srv_stevilo_enot'].'</td></tr>'; echo '<table>';
echo '<tr>';
echo '<th>'.$lang['srv_casi_po_straneh_stran'].'</th>';
echo '<th colspan="2">'.$lang['srv_neto_v_cas'];
if ($_GET['predvideni'] == 1) {
echo ' / '.$lang['srv_testiranje_predvidenicas_1'];
}
echo '</th>';
echo '<th>'.$lang['srv_stevilo_enot'].'</th>';
echo '</tr>';
foreach ($povprecni_casi AS $vrstni_red => $time) { foreach ($povprecni_casi AS $vrstni_red => $time) {
@ -6735,49 +6757,58 @@ class SurveyAdminSettings {
$bruto = $povprecni_casi_bruto[$vrstni_red]; $bruto = $povprecni_casi_bruto[$vrstni_red];
echo '<tr>'; echo '<tr>';
echo '<th style="text-align:left; padding-right:20px" nowrap>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</th>'; echo '<td>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</td>';
echo '<td class="right time">'.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ');
echo '<td style="width:100%">';
echo ' <div class="graph_db" style="text-align: right; float: left; width: '.($time/$max*85).'%">&nbsp;</div>';
//if ($bruto-$time > 0)
//echo ' <div class="graph_lb" style="text-align: right; float: left; width: '.(($bruto-$time)/$max*85).'%; border-left:0px">&nbsp;</div>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.($time<60?round($time,1).'s ':round($time/60,1).'min ')./*'<span style="color:gray">/ '.($bruto<60?round($bruto,1).'s ':round($bruto/60,1).'min ').'</span>'.*/'</span>';
echo '</td>';
echo '<td style="text-align:center" nowrap>'.$count[$vrstni_red]./*' <span style="color:gray">/ '.$count_bruto[$vrstni_red].'</span>'.*/'</td>';
echo '</tr>';
if ($_GET['predvideni'] == 1) { if ($_GET['predvideni'] == 1) {
if ($rezanje_preskocene == 1) if ($rezanje_preskocene == 1)
$time = $expected_time[$vrstni_red][0]; $time = $expected_time[$vrstni_red][0];
else else
$time = $expected_time[$vrstni_red][1]; $time = $expected_time[$vrstni_red][1];
echo '<tr>';
echo '<th style="text-align:left; padding-right: 20px; color:gray" nowrap>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</th>';
echo '<td style="width:100%">'; echo '<span class="gray"> / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').'</span>';
echo ' <div class="graph_'.($rezanje_preskocene==1?'lb':'lr').'" style="text-align: right; float: left; width: '.($time/$max*85).'%">&nbsp;</div>'; }
//if ((($time[1]-$time[0])/$max*85) > 0)
// echo ' <div class="graph_lb" style="border-left: 0; text-align: right; float: left; width: '.(($time[1]-$time[0])/$max*85).'%">&nbsp;</div>';
echo ' <span style="display: block; margin: auto auto auto 5px; float: left">'.($time<60?round($time,1).'s ':round($time/60,1).'min ')./*'<span style="color:gray">/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').'</span>'.*/'</span>';
echo '</td>'; echo '</td>';
echo '<td class="graph_cell">';
echo '<div class="graph_cell">';
echo '<div class="graph_full" style="width: '.($time/$max*85).'%"></div>';
if ($_GET['predvideni'] == 1) {
if ($rezanje_preskocene == 1)
$time = $expected_time[$vrstni_red][0];
else
$time = $expected_time[$vrstni_red][1];
echo '<div class="graph_'.($rezanje_preskocene==1?'empty':'red').'" style="width: '.($time/$max*85).'%"></div>';
}
echo '</div>';
echo '</td>';
echo '<td class="right">'.$count[$vrstni_red].'</td>';
echo '</tr>'; echo '</tr>';
echo '<tr><td colspan="3" style="border-bottom:1px solid #E4E4F9"></td></tr>';
} }
echo '<tr class="semi-bold"><td>'.$lang['srv_anl_suma1'].'<td class="right time">'.$skupni_cas;
if ($_GET['predvideni'] == 1) {
if ($rezanje_preskocene == 1)
$time = $expected_time[$vrstni_red][0];
else
$time = $expected_time[$vrstni_red][1];
echo '<span class="gray"> / '.$predviden_cas.'</span>';
} }
if ($_GET['predvideni'] != 1) echo '</td><td></td><td></td>';
echo '<tr><td colspan="3" style="border-bottom:1px solid #E4E4F9"></td></tr>';
echo '<tr><td></td><th style="text-align:left">'.$lang['srv_anl_suma1'].': '.(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; echo '</td></tr>';
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 '</th></tr>';
echo '</table>'; echo '</table>';
if ($_GET['predvideni'] == 1) { echo '<div class="tabela_trajanje_legenda">';
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="graph_full legend"></div><span class="legend"> '.$lang['srv_neto_t_cas'].'</span>';
echo '<div class="graph_'.($rezanje_preskocene==1?'lb':'lr').'" style="float: left; width: 11px">&nbsp;</div><span style="float:left; margin:0 10px 0 5px"> - '.$lang['srv_testiranje_predvidenicas'].'</span></p>'; if ($_GET['predvideni'] == 1)
} echo '<div class="graph_empty legend"></div><span class="legend"> '.$lang['srv_testiranje_predvidenicas_1'].'</span>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
@ -6790,17 +6821,21 @@ class SurveyAdminSettings {
// izpis histograma casov za vsako stran // izpis histograma casov za vsako stran
echo '<br /><fieldset><legend>'.$lang['srv_frekvencna_porazdelitev'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_frekvencna_porazdelitev'].'</legend>';
echo '<p>'; echo '<div class="setting_holder bottom16">';
echo '<div class="setting_item">';
echo '<input type="checkbox" name="pages" id="pages" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.$_GET['predvideni'].'&prikazi01='.$_GET['prikazi01'].'&pages='.($_GET['pages']==1?'0':'1').'\');" '.($_GET['pages']==1?'checked':'').' /><label for="pages">'.$lang['srv_show_pages'].'</label>'; echo '<input type="checkbox" name="pages" id="pages" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.$_GET['predvideni'].'&prikazi01='.$_GET['prikazi01'].'&pages='.($_GET['pages']==1?'0':'1').'\');" '.($_GET['pages']==1?'checked':'').' /><label for="pages">'.$lang['srv_show_pages'].'</label>';
echo '</p>'; echo '</div>';
if ($rezanje_preskocene == 1) { if ($rezanje_preskocene == 1) {
echo '<p>'; echo '<div class="setting_item">';
echo ' <input type="checkbox" name="prikazi01" id="prikazi01" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.$_GET['predvideni'].'&pages='.$_GET['pages'].'&prikazi01='.($_GET['prikazi01']==1?'0':'1').'\');" '.($_GET['prikazi01']==1?'checked':'').' /><label for="prikazi01">'.$lang['srv_prikazi01'].'</label>'; echo ' <input type="checkbox" name="prikazi01" id="prikazi01" value="1" onclick="vnos_redirect(\'index.php?anketa='.$this->anketa.'&a=testiranje&m=cas&predvideni='.$_GET['predvideni'].'&pages='.$_GET['pages'].'&prikazi01='.($_GET['prikazi01']==1?'0':'1').'\');" '.($_GET['prikazi01']==1?'checked':'').' /><label for="prikazi01">'.$lang['srv_prikazi01'].'</label>';
echo '</p>'; echo '</div>';
} }
echo '</div>';
// zdruzimo vse case po straneh na en graf // zdruzimo vse case po straneh na en graf
if ($_GET['pages'] != '1') { if ($_GET['pages'] != '1') {
$casi2 = array(); $casi2 = array();
@ -6835,10 +6870,10 @@ class SurveyAdminSettings {
if ($_GET['pages'] == '1') { if ($_GET['pages'] == '1') {
$sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'"); $sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'");
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
echo '<h2>'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</h2>'; echo '<p class="bold blue bottom16">'.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'</p>';
} }
echo '<table style="width:100%; padding:0; margin: 0"><tr>'; echo '<table id="casi_histogram"><tr>';
$histogram = array(); $histogram = array();
for ($t=0; $t<=$max_time; $t++) $histogram[$t] = 0; for ($t=0; $t<=$max_time; $t++) $histogram[$t] = 0;
@ -6857,10 +6892,9 @@ class SurveyAdminSettings {
for ($t=$t_min; $t<=$max_time; $t++) { for ($t=$t_min; $t<=$max_time; $t++) {
echo '<td style="vertical-align:bottom; margin:0; padding:0; border:0">'; echo '<td class="histogram">';
echo ' <div style="background-color:#D8DFEA; border:1px solid transparent; text-align: right; height: '.($histogram[$t]/$max_stran*150).'px; width: 100%; margin:0; padding:0; min-height:1px" title="'.$t.($minute?'min':'s').': '.$histogram[$t].'"></div>'; echo '<div class="histogram" style="height: '.($histogram[$t]/$max_stran*150).'px;" title="'.$t.($minute?'min':'s').': '.$histogram[$t].'"></div>';
//echo '<span style="display:block; width: 100%; text-align:center">'.$t.'</span>';
echo '</td>'; echo '</td>';
} }
} }
@ -6870,16 +6904,16 @@ class SurveyAdminSettings {
if ($max_time <= 20) { if ($max_time <= 20) {
for ($t=$t_min; $t<=$max_time; $t++) { for ($t=$t_min; $t<=$max_time; $t++) {
echo '<td>'.$t.($minute?'min':'s').'</td>'; echo '<td class="histogram_time">'.$t.($minute?'min':'s').'</td>';
} }
} else { } else {
if ($t_min == 0) if ($t_min == 0)
echo '<td colspan="10">0'.($minute?'min':'s').'</td>'; echo '<td class="histogram_time" colspan="10">0'.($minute?'min':'s').'</td>';
else else
echo '<td colspan="8">2'.($minute?'min':'s').'</td>'; echo '<td class="histogram_time" colspan="8">2'.($minute?'min':'s').'</td>';
for ($t=10; $t<=$max_time; $t+=10) { for ($t=10; $t<=$max_time; $t+=10) {
echo '<td colspan="10">'.$t.'</td>'; echo '<td class="histogram_time" colspan="10">'.$t.'</td>';
} }
} }

32
admin/survey/classes/class.SurveyDiagnostics.php
View File

@ -168,10 +168,15 @@ class SurveyDiagnostics
echo '<p class="bottom16">'.$lang['srv_diagnostika_testiranje_notea'].'<a href="index.php?anketa=' . $this->anketa . '&a=testiranje&m=testnipodatki">'.$lang['srv_diagnostika_testiranje_noteb'].'</a>'.$lang['srv_diagnostika_testiranje_notec'].'</p>'; echo '<p class="bottom16">'.$lang['srv_diagnostika_testiranje_notea'].'<a href="index.php?anketa=' . $this->anketa . '&a=testiranje&m=testnipodatki">'.$lang['srv_diagnostika_testiranje_noteb'].'</a>'.$lang['srv_diagnostika_testiranje_notec'].'</p>';
echo '<div class="button_holder inline center bottom0">'; echo '<div class="button_holder inline vertical_center bottom0">';
echo '<span class="faicon link-chain link-right blue"></span><span class="italic">'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'</span>'; echo '<div class="input_box">';
echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\');" return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>'; echo '<span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
echo '</div>'; echo '</div>';
echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); show_success_copy();">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
echo '</div>';
echo '<div id="success_copy"></div>';
/*Nastavitve testnega vnosa - popup /*Nastavitve testnega vnosa - popup
echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>'; echo ' - <a href="#" id="popup-open" onclick="javascript:testiranje_preview_settings(); return false;" title="'.$lang['settings'].'"><span class="sprites settings"></span> '.$lang['srv_uredniske_nastavitve'].'</a>';
@ -246,7 +251,7 @@ class SurveyDiagnostics
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
@ -272,10 +277,11 @@ class SurveyDiagnostics
if (in_array(DIAG_INVALID_VARIABLENAMES,$this->diagnostic_note)) { if (in_array(DIAG_INVALID_VARIABLENAMES,$this->diagnostic_note)) {
$color_status = 'notok'; $color_status = 'notok';
$msg_status = '<a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1" title="'.$lang['srv_check_pogoji'].'">'.$lang['srv_diagnostic_neustreza'].'</a>'; $msg_status = '<a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1" title="'.$lang['srv_check_pogoji'].'">'.$lang['srv_diagnostic_neustreza'].'</a>';
$link_status = 'href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&checkDuplicate=1"';
} }
else { else {
$color_status = 'ok'; $color_status = 'ok';
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = '<a class="noline" '.$link_status.' >'.$lang['srv_diagnostic_ustreza'].'<a/>';
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>';
@ -301,7 +307,7 @@ class SurveyDiagnostics
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
@ -322,7 +328,7 @@ class SurveyDiagnostics
$color_status = 'ok'; $color_status = 'ok';
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
@ -344,7 +350,7 @@ class SurveyDiagnostics
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -367,7 +373,7 @@ class SurveyDiagnostics
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
@ -384,7 +390,7 @@ class SurveyDiagnostics
$color_status = 'rec'; $color_status = 'rec';
$msg_status = $lang['srv_diagnostic_rec']; $msg_status = $lang['srv_diagnostic_rec'];
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
} }
@ -408,7 +414,7 @@ class SurveyDiagnostics
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
@ -424,7 +430,7 @@ class SurveyDiagnostics
$msg_status = $lang['srv_diagnostic_ustreza']; $msg_status = $lang['srv_diagnostic_ustreza'];
} }
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline '.$color_status.' faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
@ -441,7 +447,7 @@ class SurveyDiagnostics
$color_status = 'rec'; $color_status = 'rec';
$msg_status = $lang['srv_diagnostic_rec']; $msg_status = $lang['srv_diagnostic_rec'];
echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'">'.$msg_status.'</div></div></td>'; echo '<td class="center"><div class="status_wrapper"><div class="status '.$color_status.'"><a class="noline" '.$link_status.'>'.$msg_status.'</a></div></div></td>';
echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>'; echo '<td class="center"><a class="noline faicon open_icon" '.$link_status.'></a></td>';
echo '</tr>'; echo '</tr>';
} }

5
admin/survey/classes/tracking/CrossRoad.php
View File

@ -108,6 +108,11 @@ class CrossRoad {
$layout_width = 'narrow'; $layout_width = 'narrow';
if ($_GET['m'] == 'cas' || $_GET['m'] == 'predvidenicas') {
$layout_width = 'wide';
}
$status = 4; $status = 4;
break; break;

2
admin/survey/index.php
View File

@ -137,7 +137,7 @@
} }
// Fonts // Fonts
echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext" rel="stylesheet">'; echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,500,500i,600,600i,700,700i&subset=latin-ext" rel="stylesheet">';
//echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext" rel="stylesheet" />'; //echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,500,500i,600,600i,700,700i&amp;subset=latin-ext" rel="stylesheet" />';

17
admin/survey/script/script.js
View File

@ -3700,10 +3700,11 @@ function updateManual1() {
$("#radioManual1").attr("checked", "checked"); $("#radioManual1").attr("checked", "checked");
} }
// SE POBRIŠE IN UPORABI "actionNotePopup"!!
function show_success_save(timeout){ function show_success_save(timeout){
if (timeout == undefined) if (timeout == undefined)
timeout = 2500; timeout = 10000;
$(".btn_savesettings").addClass('ovalbutton_orange').removeClass('ovalbutton_orange'); $(".btn_savesettings").addClass('ovalbutton_orange').removeClass('ovalbutton_orange');
$('#success_save').load('ajax.php?a=display_success_save', {anketa: srv_meta_anketa_id}).show(); $('#success_save').load('ajax.php?a=display_success_save', {anketa: srv_meta_anketa_id}).show();
@ -5529,13 +5530,25 @@ function actionNotePopup(name, type){
setTimeout(function(){ setTimeout(function(){
actionNotePopupClose(); actionNotePopupClose();
}, 5000); }, 10000);
}); });
} }
// Zapri note popup spodaj levo
function actionNotePopupClose(){ function actionNotePopupClose(){
$('.action_note_box').fadeOut(function(){ $('.action_note_box').fadeOut(function(){
$('#action_note_holder').html(''); $('#action_note_holder').html('');
}); });
} }
// SE POBRIŠE IN UPORABI "actionNotePopup"!!
function show_success_copy(timeout){
if (timeout == undefined)
timeout = 10000;
$('#success_copy').load('ajax.php?a=display_success_copy').show();
setTimeout(function() {$('#success_copy').animate({opacity:0})}, timeout);
}

6
lang/1.php
View File

@ -4014,10 +4014,11 @@ $lang = array (
"srv_tip_standard_993" => "Upload datoteke", "srv_tip_standard_993" => "Upload datoteke",
"srv_tip_standard_994" => "Ime priimek", "srv_tip_standard_994" => "Ime priimek",
"srv_tip_standard_996" => "Podpis", "srv_tip_standard_996" => "Podpis",
"srv_vkljuci_predvidene" => "Prika&#382;i tudi predvidene &#269;ase", "srv_vkljuci_predvidene" => "V tabeli prikaži tudi predvidene čase",
"srv_vkljuci_preskocene" => "Prika&#382;i tudi &#269;ase za presko&#269;ene strani", "srv_vkljuci_preskocene" => "Prikaži tudi čase za preskočene strani",
"srv_total_trajanje" => "Celoten čas trajanja ankete", "srv_total_trajanje" => "Celoten čas trajanja ankete",
"srv_dejansko_trajanje" => "Predvideno dejansko trajanje 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" => "Č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",
@ -5523,6 +5524,7 @@ $lang = array (
"srv_diagnostika_testiranje_noteb" => '\'TESTIRANJE\' - \'Avtomatski vnosi\'', "srv_diagnostika_testiranje_noteb" => '\'TESTIRANJE\' - \'Avtomatski vnosi\'',
"srv_diagnostika_testiranje_notec" => ' lahko testne podatke vnesete tudi avtomatsko.', "srv_diagnostika_testiranje_notec" => ' lahko testne podatke vnesete tudi avtomatsko.',
"srv_diagnostika_testiranje_copy" => 'Kopiraj', "srv_diagnostika_testiranje_copy" => 'Kopiraj',
"srv_diagnostika_testiranje_copied" => 'Povezava je bila kopirana',
"srv_diagnostika_table_title" => 'Status', "srv_diagnostika_table_title" => 'Status',
"srv_diagnostika_table_title1" => 'Kriterij', "srv_diagnostika_table_title1" => 'Kriterij',
"srv_diagnostika_table_title2" => 'Podrobnosti', "srv_diagnostika_table_title2" => 'Podrobnosti',

4
lang/2.php
View File

@ -3995,10 +3995,11 @@ $lang = array (
"srv_tip_standard_993" => "File upload", "srv_tip_standard_993" => "File upload",
"srv_tip_standard_994" => "First Name Last name", "srv_tip_standard_994" => "First Name Last name",
"srv_tip_standard_996" => "Signature", "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_vkljuci_preskocene" => "Also show time for skipped pages",
"srv_total_trajanje" => "Total survey duration", "srv_total_trajanje" => "Total survey duration",
"srv_dejansko_trajanje" => "Estimated actual duration of survey", "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" => "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_vprasanje" => "Question",
@ -5483,6 +5484,7 @@ $lang = array (
"srv_diagnostika_testiranje_noteb" => '\'TEST\' - \'Test responses\'', "srv_diagnostika_testiranje_noteb" => '\'TEST\' - \'Test responses\'',
"srv_diagnostika_testiranje_notec" => ' tab, you can also enter the test data automatically.', "srv_diagnostika_testiranje_notec" => ' tab, you can also enter the test data automatically.',
"srv_diagnostika_testiranje_copy" => 'Copy', "srv_diagnostika_testiranje_copy" => 'Copy',
"srv_diagnostika_testiranje_copied" => 'The link has been copied',
"srv_diagnostika_table_title" => 'Status', "srv_diagnostika_table_title" => 'Status',
"srv_diagnostika_table_title1" => 'Criteria', "srv_diagnostika_table_title1" => 'Criteria',
"srv_diagnostika_table_title2" => 'Details', "srv_diagnostika_table_title2" => 'Details',

2896
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

3
resources/sass/admin_new/basic/icons/standard.scss
View File

@ -18,7 +18,8 @@ span.faicon.minus::before{
} }
// Kljukica // Kljukica
span.faicon.success::before{ span.faicon.success::before,
span.circle-check::before{
content: "\f058"; content: "\f058";
} }
span.faicon.close::before{ span.faicon.close::before{

2
resources/sass/admin_new/components/form/button.scss
View File

@ -135,7 +135,7 @@ div.button_holder {
&.inline { &.inline {
align-items: flex-end; align-items: flex-end;
&.center { &.vertical_center {
align-items: center; align-items: center;
} }

1
resources/sass/admin_new/components/popup/popup.scss
View File

@ -11,3 +11,4 @@
@import "loader"; @import "loader";
@import "alert"; @import "alert";
@import "error"; @import "error";
@import "success_save";

20
resources/sass/admin_new/components/popup/success_save.scss Normal file
View File

@ -0,0 +1,20 @@
div#success_save{
border: 1px solid $blue;
border-radius: 2px;
background-color: $white;
width: fit-content;
padding: 10px 16px 10px 16px;
z-index: 900;
position: fixed;
bottom: 16px;
left: 16px;
-moz-box-shadow: 0 0 5px $gray;
-webkit-box-shadow: 0 0 5px $gray;
box-shadow: 0 0 5px $gray;
display: none;
}

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

@ -71,6 +71,40 @@ div#srv_diagnostic {
} }
} }
div.input_box {
border: 1px solid $dark-gray;
width: 300px;
padding: 10px 0 10px 8px;
input {
border: none;
margin: 0;
padding: 0;
font-size: 16px;
width: 90%
}
}
//Copy link popup
div#success_copy {
border: 1px solid $blue;
border-radius: 2px;
background-color: $white;
width: fit-content;
padding: 10px 16px 10px 16px;
z-index: 900;
position: fixed;
bottom: 16px;
left: 16px;
-moz-box-shadow: 0 0 5px $gray;
-webkit-box-shadow: 0 0 5px $gray;
box-shadow: 0 0 5px $gray;
display: none;
}
} }
//OCENJEVANJE TRAJANJA, DEJANSKI ČASI //OCENJEVANJE TRAJANJA, DEJANSKI ČASI
@ -94,6 +128,41 @@ div.subpage_cas {
td.time { td.time {
padding-right: 0; padding-right: 0;
} }
td.predvideni {
color: $dark-gray;
}
&#casi_histogram {
padding: 0;
margin: 0;
td.histogram {
vertical-align: bottom;
margin: 0;
padding: 0;
border: none;
div.histogram {
background-color: $gray;
border: 1px solid transparent;
text-align: right;
width: 100%;
margin: 0;
padding: 0;
min-height: 1px;
}
}
td.histogram_time {
padding: 0;
text-align: left;
vertical-align: top;
color: $very-dark-gray;
border: none;
}
}
} }
div.graph_full { div.graph_full {
@ -107,6 +176,11 @@ div.subpage_cas {
height: 24px; height: 24px;
} }
div.graph_red {
background-color: $status-red;
height: 24px;
}
div.tabela_trajanje_legenda { div.tabela_trajanje_legenda {
display: flex; display: flex;
flex-direction: row; flex-direction: row;