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
This commit is contained in:
tejagerjovic 2022-02-18 01:16:43 +01:00
commit 26e646f981
10 changed files with 989 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

294
admin/survey/classes/class.SurveyDataSettingProfiles.php
View File

@ -617,7 +617,7 @@ class SurveyDataSettingProfiles {
}
echo '<div clasS="popup_main">';
echo '<div class="popup_main with_menu">';
echo '<div id="dsp_profiles_left" class="popup_left">';
echo '<div id="dsp_profiles_holder">';
@ -647,16 +647,20 @@ class SurveyDataSettingProfiles {
}
echo '</div>'; # dataSetting_profile
// Gumb za dodajanje novega profila
echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">';
echo ' <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
echo '</button>';
echo '</div>'; # dsp_profiles_holder
echo '</div>'; # dsp_profiles_left
echo '<div id="dsp_profiles_right" class="popup_right">'."\n";
if ($current_pid == 0) {
echo '<div id="dsp_note">';
echo '<div id="dsp_note" class="popup_right_note">';
echo $lang['srv_change_default_profile'];
echo '</div>'; // dataSetting_profile_note
echo '<br class="clr" />'."\n";
}
echo '<div id="dsp_content">';
@ -671,7 +675,6 @@ class SurveyDataSettingProfiles {
echo '<div id="dsp_button_holder" class="button_holder">'."\n";
if ((int)$current_pid <= 0 ) {
echo '<button class="medium white-blue" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">'.$lang['srv_create_new_profile'] . '</button>';
echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
if ((int)$current_pid == 0) {
@ -683,7 +686,6 @@ class SurveyDataSettingProfiles {
}
}
else {
echo '<button class="medium white-blue" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">'.$lang['srv_create_new_profile'] . '</button>';
echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
}
@ -731,64 +733,64 @@ class SurveyDataSettingProfiles {
echo '<fieldset>';
echo '<legend>'.$lang['srv_results_filter_settings'].'</legend>';
echo '<label><input id="showCategories" name="showCategories" type="checkbox" ' .
(($cp['showCategories']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_analiza_kategorialneSpremenljivke'];
echo '</label>';
echo '<label><input id="showOther" name="showOther" type="checkbox" ' .
(($cp['showOther']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
#(($cp['showCategories']) ? '' : ' disabled="disabled" ')
echo $lang['srv_analiza_ShowOthersText'] ;
echo '</label>';
echo '<div class="setting_line">';
echo '<label><input id="showNumbers" name="showNumbers" type="checkbox" ' .
(($cp['showNumbers']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_analiza_numericneSpremenljivke'];
echo '</label>';
echo ' <input id="showCategories" name="showCategories" type="checkbox" '.(($cp['showCategories']) ? ' checked="checked" ' : '').' autocomplete="off" />';
echo ' <label for="showCategories">'.$lang['srv_analiza_kategorialneSpremenljivke'].'</label>';
echo '<label><input id="showText" name="showText" type="checkbox" ' .
(($cp['showText']) ? ' checked="checked" ' : ' ') . ' autocomplete="off"/>';
echo '</label>';
echo ' <input id="showOther" name="showOther" type="checkbox" '.(($cp['showOther']) ? ' checked="checked" ' : '').' autocomplete="off" />';
echo ' <label for="showOther">'.$lang['srv_analiza_ShowOthersText'].'</label>';
echo $lang['srv_analiza_textovneSpremenljivke'];
echo ' <input id="showNumbers" name="showNumbers" type="checkbox" '.(($cp['showNumbers']) ? ' checked="checked" ' : '').' autocomplete="off" />';
echo ' <label for="showNumbers">'.$lang['srv_analiza_numericneSpremenljivke'].'</label>';
echo '<br />'.$lang['srv_analiza_link'].': ';
echo ' <input id="showText" name="showText" type="checkbox" '.(($cp['showText']) ? ' checked="checked" ' : '').' autocomplete="off" />';
echo ' <label for="showText">'.$lang['srv_analiza_textovneSpremenljivke'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_analiza_link'].':<label>';
echo ' <select id="analysisGoTo">';
echo ' <option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
echo ' <option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
echo ' </select>';
echo '<br/>';
echo '</div>';
echo '<div class="setting_line">';
echo '<label>';
echo ' <input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off" />';
echo $lang['srv_analiza_showLegend'];
echo '</label>';
echo ' <label for="analiza_legenda">'.$lang['srv_analiza_showLegend'].'</label>';
echo '<br/>';
echo '</div>';
echo '<label>';
echo '<input id="hideEmpty" name="hideEmpty" type="checkbox" ' .
(($cp['hideEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_analiza_hideEmpty'] ;
echo '</label>';
echo '<br/>';
echo '<div class="setting_line">';
echo '<label>';
echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" ' .
(($cp['hideAllSystem']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_analiza_hideAllEmpty'] ;
echo '</label>';
echo ' <input id="hideEmpty" name="hideEmpty" type="checkbox" '.(($cp['hideEmpty']) ? ' checked="checked" ' : '').' autocomplete="off" />';
echo ' <label for="hideEmpty">'.$lang['srv_analiza_hideEmpty'].'</label>';
echo '<br/>';
echo '</div>';
echo '<label>';
echo $lang['srv_analiza_defAnsCnt'].": ";
echo '<div class="setting_line">';
echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" '.(($cp['hideAllSystem']) ? ' checked="checked" ' : '').' autocomplete="off" />';
echo '<label for="hideAllSystem">'.$lang['srv_analiza_hideAllEmpty'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo '<label>'.$lang['srv_analiza_defAnsCnt'].":</label>";
echo '<select id="numOpenAnswers" name="numOpenAnswers" autocomplete="off">';
$lastElement = end(self::$textAnswersMore);
foreach (self::$textAnswersMore AS $key => $values) {
echo '<option'.((int)$cp['numOpenAnswers'] == $values ? ' selected="selected"' : '').' value="'.$values.'">';
if ($values != $lastElement) {
@ -799,80 +801,100 @@ class SurveyDataSettingProfiles {
echo '</option>';
}
echo '</select>';
echo '</label>';
echo '</div>';
echo '</fieldset>';
echo '<fieldset>';
echo '<legend>'.$lang['srv_results_base_settings'].'</legend>';
echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
echo '&nbsp;&nbsp;<span clsss="dsp_sett_label">'.$lang['srv_results_for_percents'].':&nbsp;</span><input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
echo '&nbsp;&nbsp;<span class="dsp_sett_label">'.$lang['srv_results_for_average'].':&nbsp;</span><input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
echo '&nbsp;&nbsp;<span class="dsp_sett_label">'.$lang['srv_results_for_deviation'].':&nbsp;</span><input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
echo '<br/>'.$lang['srv_results_decimal_sign'].': ';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_results_num_digits'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <label for="dsp_ndp">'.$lang['srv_results_for_percents'].':</label>';
echo ' <input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
echo '</div>';
echo '<div class="setting_line">';
echo ' <label for="dsp_nda">'.$lang['srv_results_for_average'].':</label>';
echo ' <input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
echo '</div>';
echo '<div class="setting_line">';
echo ' <label for="dsp_ndd">'.$lang['srv_results_for_deviation'].':</label>';
echo ' <input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
echo '</div>';
echo '<div class="setting_line">';
echo '<label>'.$lang['srv_results_decimal_sign'].':</label>';
foreach (self::$seperators AS $skey => $seperators) {
echo '<label>';
echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
echo self::formatNumber('1234.56',2,$seperators);
echo '</label>';
echo '<label for="radio_dsp_sep_'.$skey.'">'.self::formatNumber('1234.56', 2, $seperators).'</label>';
}
echo '</div>';
echo '</fieldset>';
// Nastavitve za crosstabe - prikazemo samo v crosstabih
echo '<fieldset '.(isset($_POST['podstran']) && $_POST['podstran'] == 'crosstabs' ? '' : ' style="display:none;"').'>';
echo '<legend>'.$lang['srv_results_crostabs_settings'].'</legend>';
echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
echo '&nbsp;&nbsp;<span clsss="dsp_sett_label">'.$lang['srv_results_for_residual'].':&nbsp;</span><input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
echo '<div class="crossCheckHolder">' ;
echo '<div class="crossCheckHolder">' ;
// echo '<input id="crossCheck0" name="crossCheck0" type="checkbox" ' . ($cp['crossChk0'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span name="spn_residual" class="ctbChck_sp0">' . $lang['srv_analiza_crosstab_frekvence'] . '</span><br />';
echo '<label>';
echo '<input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp1" class="ctbChck_sp1">' . $lang['srv_analiza_crosstab_odstotek_vrstice'] . '</span><br />';
echo '</label>';
echo '<label>';
echo '<input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp2" class="ctbChck_sp2">' . $lang['srv_analiza_crosstab_odstotek_stolpci'] . '</span><br />';
echo '</label>';
echo '<label>';
echo '<input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp3" class="ctbChck_sp3">' . $lang['srv_analiza_crosstab_odstotek_skupni'] . '</span><br />';
echo '</label>';
echo '<div class="setting_line">';
echo ' <label for="dsp_res">'.$lang['srv_results_num_digits'].' '.$lang['srv_results_for_residual'].':</label>';
echo ' <input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
echo '</div>';
echo '<div class="crossCheckHolder">' ;
echo '<label>';
echo '<input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_EC" class="crossCheck_EC">' . $lang['srv_analiza_crosstab_expected_count'] . '</span><br />';
echo '</label>';
echo '<label>';
echo '<input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_RE" class="crossCheck_RE">' . $lang['srv_analiza_crosstab_residual'] . '</span><br />';
echo '</label>';
echo '<label>';
echo '<input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_SR" class="crossCheck_SR">' . $lang['srv_analiza_crosstab_stnd_residual'] . '</span><br />';
echo '</label>';
echo '<label>';
echo '<input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_AR" class="crossCheck_AR">' . $lang['srv_analiza_crosstab_adjs_residual'] . '</span><br />';
echo '</label>';
echo '<div class="setting_line">';
echo ' <input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheck1">'.$lang['srv_analiza_crosstab_odstotek_vrstice'].'</label>';
echo '</div>';
echo '<div class="crossCheckHolder">' ;
echo '<label>';
echo '<input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckColor">' . $lang['srv_analiza_crosstab_color_residual1'] . '</span><br />';
echo '</label>';
echo '<label>';
echo '<input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckValues">' . $lang['srv_analiza_crosstab_doValues'] . '</span>';
echo '</label>';
/*
echo '<table id="tbl_color_ersidual" class="residual">';
echo '<tr><td>'.$lang['srv_analiza_crosstab_value'].'</td><th>+</th><th>-</th></tr>';
echo '<tr><td>1.1 - 2.0</td><td class="rsdl_bck1">&nbsp;</td><td class="rsdl_bck4">&nbsp;</td></tr>';
echo '<tr><td>2.1 - 3.0</td><td class="rsdl_bck2">&nbsp;</td><td class="rsdl_bck5">&nbsp;</td></tr>';
echo '<tr><td>3.1 '.$lang['srv_analiza_crosstab_and_more'].'</td><td class="rsdl_bck3">&nbsp;</td><td class="rsdl_bck6">&nbsp;</td></tr>';
echo '</table>';
*/
echo '<div class="setting_line">';
echo ' <input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheck2">'.$lang['srv_analiza_crosstab_odstotek_stolpci'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheck3">'.$lang['srv_analiza_crosstab_odstotek_skupni'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheckEC">'.$lang['srv_analiza_crosstab_expected_count'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheckRE">'.$lang['srv_analiza_crosstab_residual'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheckSR">'.$lang['srv_analiza_crosstab_stnd_residual'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheckAR">'.$lang['srv_analiza_crosstab_adjs_residual'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheckColor">'.$lang['srv_analiza_crosstab_color_residual1'].'</label>';
echo '</div>';
echo '<div class="setting_line">';
echo ' <input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <label for="crossCheckValues">'.$lang['srv_analiza_crosstab_doValues'].'</label>';
echo '</div>';
echo '</fieldset>';
@ -880,16 +902,25 @@ class SurveyDataSettingProfiles {
echo '<fieldset>';
echo '<legend>'.$lang['srv_results_charts_settings'].'</legend>';
// default poravnava tabel
echo $lang['srv_chart_table_defAlign'].': ';
echo '<label>';
echo '<input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_0'];
echo '</label>';
echo '<label>';
echo '<input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_1'];
echo '</label>';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_chart_table_defAlign'].':</label>';
echo ' <input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">';
echo ' <label for="chartTableAlign_0">'.$lang['srv_chart_table_defAlign_0'].'</label>';
echo ' <input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">';
echo ' <label for="chartTableAlign_1">'.$lang['srv_chart_table_defAlign_1'].'</label>';
echo '</div>';
// velikost pisave v grafih
echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
echo '<div class="setting_line">';
echo '<label for="chartFontSize">'.$lang['srv_export_font'].':</label>';
echo '<select name="chartFontSize" id="chartFontSize">';
echo ' <option value="8"'.((int)$cp['chartFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
echo ' <option value="9"'.((int)$cp['chartFontSize'] == 9 ? ' selected="selected"' : '').'>9</option>';
@ -898,8 +929,13 @@ class SurveyDataSettingProfiles {
echo ' <option value="12"'.((int)$cp['chartFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
echo '</select>';
echo '</div>';
// prikaz texta ob numerusu
echo '<br /><label>' . $lang['srv_chart_numerusText'] . ': </label>';
echo '<div class="setting_line">';
echo '<label for="chartNumerusText">' . $lang['srv_chart_numerusText'] . ':</label>';
echo '<select name="chartNumerusText" id="chartNumerusText">';
echo ' <option value="0"'.((int)$cp['chartNumerusText'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_0'] . '</option>';
echo ' <option value="1"'.((int)$cp['chartNumerusText'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_1'] . '</option>';
@ -908,34 +944,48 @@ class SurveyDataSettingProfiles {
echo ' <option value="4"'.((int)$cp['chartNumerusText'] == 4 ? ' selected="selected"' : '').'>' . $lang['without'] . '</option>';
echo '</select>';
echo '</div>';
// prikaz povprecja
echo '<br /><label>' . $lang['srv_chart_showAvg_long'] . ': </label>';
echo '<div class="setting_line">';
echo '<label for="chartAvgText">' . $lang['srv_chart_showAvg_long'] . ':</label>';
echo '<select name="chartAvgText" id="chartAvgText">';
echo ' <option value="1"'.((int)$cp['chartAvgText'] == 1 ? ' selected="selected"' : '').'>' . $lang['yes'] . '</option>';
echo ' <option value="0"'.((int)$cp['chartAvgText'] == 0 ? ' selected="selected"' : '').'>' . $lang['no'] . '</option>';
echo '</select>';
echo '</div>';
// stevilcenje vprasanj
echo '<br />';
echo '<label>';
echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" ' .
(($cp['chartNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_nastavitveStevilcenje'];
echo '</label>';
echo '<div class="setting_line">';
echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" '.(($cp['chartNumbering']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
echo '<label for="chartNumbering">' . $lang['srv_nastavitveStevilcenje'] . ':</label>';
echo '</div>';
// uvodna stran v izvozu
echo '<br />';
echo '<label>';
echo '<input id="chartFP" name="chartFP" type="checkbox" ' .
(($cp['chartFP']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_chart_frontpage'] ;
echo '</label>';
echo '<div class="setting_line">';
echo '<input id="chartFP" name="chartFP" type="checkbox" '.(($cp['chartFP']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
echo '<label for="chartFP">' . $lang['srv_chart_frontpage'] . ':</label>';
echo '</div>';
// prikaz nicelnih vrednosti v kroznih grafih
echo '<br />';
echo '<label>';
echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" ' .
(($cp['chartPieZeros']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo $lang['srv_chart_pieZeros'] ;
echo '</label>';
echo '<div class="setting_line">';
echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" '.(($cp['chartPieZeros']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
echo '<label for="chartPieZeros">' . $lang['srv_chart_pieZeros'] . ':</label>';
echo '</div>';
echo '</fieldset>';
}

76
admin/survey/classes/class.SurveyInpect.php
View File

@ -542,50 +542,72 @@ class SurveyInspect {
echo '<h2>'.$lang['srv_inspect_setting'].'</h2>';
if ( $this->enableInspect != SI_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div><br class="clr displayNone">';
echo '</div>';
}
echo '<div class="popup_main">';
# Nastavitve za Inspect
echo '<p>'.$lang['srv_inspect_setting_link'].'</p>';
echo '<p>';
echo '<div class="setting_line">';
echo $lang['srv_inspect_setting_link'];
echo '</div>';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_inspect_setting_enabled'].'</label>';
echo '&nbsp;<input id="enableInspect0" name="enableInspect" type="radio" value="0"' .
(($this->enableInspect == false) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo ' <input id="enableInspect0" name="enableInspect" type="radio" value="0" '.(($this->enableInspect == false) ? ' checked="checked" ' : '').' autocomplete="off">';
echo ' <label for="enableInspect0">'.$lang['no'].'</label>';
echo '&nbsp;<input id="enableInspect1" name="enableInspect" type="radio" value="1"' .
(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
echo '<label for="enableInspect1">'.$lang['yes'].'</label>';
echo Help :: display('srv_crosstab_inspect');
echo '</p>';
echo '<p>';
echo '<div>';
echo '<span class="floatLeft">'.$lang['srv_inspect_goto_note'].'</span>&nbsp;';
echo '<span class="floatLeft">';
echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label><br/>';
echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label> <br/>';
echo '<label><input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off"/>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
echo '</span>';
echo ' <input id="enableInspect1" name="enableInspect" type="radio" value="1" '.(($this->enableInspect == true) ? ' checked="checked" ' : '') . ' autocomplete="off">';
echo ' <label for="enableInspect1">'.$lang['yes'].' '.Help :: display('srv_crosstab_inspect').'</label>';
echo '</div>';
echo'</p>';
echo'<br class="clr">';
echo '<p>';
echo '<div id="inspectListDiv" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
echo '<span>'.$lang['srv_inspect_setting_show_variables'].'</span>';
echo '<div class="setting_line">';
echo ' <label>'.$lang['srv_inspect_goto_note'].'</label>';
echo ' <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_ANALIZE.'" value="'.SI_GOTO_ANALIZE.'"'.($this->inspect_goto == SI_GOTO_ANALIZE ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
echo ' <label>'.$lang['srv_inspect_goto_'.SI_GOTO_ANALIZE].'</label>';
echo ' <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_VPOGLED.'" value="'.SI_GOTO_VPOGLED.'"'.($this->inspect_goto == SI_GOTO_VPOGLED ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
echo ' <label>'.$lang['srv_inspect_goto_'.SI_GOTO_VPOGLED].'</label>';
echo ' <input type="radio" name="inspectGoto" id="inspectGoto_'.SI_GOTO_PODATKI.'" value="'.SI_GOTO_PODATKI.'"'.($this->inspect_goto == SI_GOTO_PODATKI ? ' checked="checked"' : '').' onchange="inspectRadioChange();return false;" autocomplete="off">';
echo ' <label>'.$lang['srv_inspect_goto_'.SI_GOTO_PODATKI].'</label>';
echo '</div>';
echo '<div id="inspectListDiv" class="settings_block" '.($this->inspect_goto != SI_GOTO_PODATKI ? ' class="displayNone"' : '').'>';
echo ' <div class="setting_line">';
echo $lang['srv_inspect_setting_show_variables'];
echo ' <span id="inspectListSpr" class="as_link">';
$this->displayInspectVars();
echo ' </span>';
echo ' </div>';
echo '</p>';
echo '</div>';
echo '<span class="floatRight" title="'.$lang['srv_save_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inspectSaveSettings(); return false;"><span>'.$lang['srv_save_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inspectCloseSettings(); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
// cover Div
echo '<div id="inspect_cover_div"></div>'."\n";
echo '</div>';
// Gumbi
echo '<div class="button_holder">';
echo ' <button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="inspectCloseSettings(); return false;">'.$lang['srv_close_profile'] . '</button>';
echo ' <button class="medium blue" title="'.$lang['srv_save_profile'].'" onclick="inspectSaveSettings(); return false;">'.$lang['srv_save_profile'] . '</button>';
echo '</div>';
}
function displayInspectVars() {

93
admin/survey/classes/class.SurveyZoom.php
View File

@ -214,19 +214,24 @@ class SurveyZoom
$currentFilterProfile = self::$profiles[$current_pid];
if ( self::$currentProfileId != ZOOM_DEFAULT_PROFILE ) {
echo '<div id="not_default_setting">';
echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
echo '</div><br class="clr displayNone">';
echo '</div>';
}
echo '<div id="zoom_profiles_left">';
echo '<span id="zoom_profiles_holder">';
echo '<div class="popup_main with_menu">';
echo '<div id="zoom_profiles_left" class="popup_left">';
echo '<div id="zoom_profiles_holder">';
# zlistamo vse profile
echo '<span id="zoom_profiles" class="select">';
echo '<div id="zoom_profiles" class="list select">';
if (count(self::$profiles)) {
foreach (self::$profiles as $id => $profile) {
echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="zoom_profile_' . $id . '" value="'.$id.'" '.($current_pid == $id ? '' : ' onclick="zoomChangeProfile(\''.$id.'\')"').'>';
echo '<div class="list-item option' . ($current_pid == $id ? ' active' : '') . '" id="zoom_profile_' . $id . '" value="'.$id.'" '.($current_pid == $id ? '' : ' onclick="zoomChangeProfile(\''.$id.'\')"').'>';
echo $profile['name'];
@ -245,18 +250,22 @@ class SurveyZoom
echo '</div>';
}
}
echo '</span>'; # zoom_profilea
echo '</span>'; # zoom_profiles_holder
echo '</div>'; # zoom_profilea
// Gumb za dodajanje novega profila
echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="zoomProfileAction(\'newName\'); return false;">';
echo ' <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
echo '</button>';
echo '</div>'; # zoom_profiles_holder
echo '</div>'; # zoom_profiles_left
echo '<div id="zoom_profiles_right">'."\n";
echo '<div id="zoom_profiles_right" class="popup_right">'."\n";
if ($current_pid == 0) {
echo '<div id="zoom_note">';
echo '<div id="zoom_note" class="popup_right_note">';
echo $lang['srv_change_default_profile'];
echo '</div>'; // zoom_profile_note
echo '<br class="clr" />'."\n";
}
echo '<div id="zoom_content">';
@ -266,18 +275,21 @@ class SurveyZoom
echo '</div>'; // zoom_profile_right
echo '<div id="zoom_button_holder">'."\n";
if ((int)$current_pid <= 0 ) {
echo '<span class="floatRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
} else {
echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="zoomProfileAction(\'runProfile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'newName\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="zoomProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
echo '</div>';
echo '<div id="zoom_button_holder" class="button_holder">'."\n";
if ((int)$current_pid <= 0 ) {
echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="zoomProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="zoomProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
}
else {
echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="zoomProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="zoomProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="zoomProfileAction(\'runProfile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
}
echo '</div>'."\n"; // zoom_button_holder
@ -312,9 +324,11 @@ class SurveyZoom
*/
function DisplayProfileData($current_pid=null) {
global $lang;
if (isset($_POST['error'])) {
echo '<span class="red">* '.$lang[$_POST['error']].'</span><br/>';
}
# podatki profila
if ($current_pid == null) {
$current_pid = self::$currentProfileId;
@ -324,39 +338,44 @@ class SurveyZoom
$all_spr = Cache::cache_all_srv_spremenljivka(self::$sid,true);
echo '<span>'.$lang['srv_zoom_choose'].'</span>';
echo '<div class="setting_line">';
echo $lang['srv_zoom_choose'];
echo '</div>';
if (count($all_spr) > 0)
foreach ($all_spr AS $id => $spremenljivka) {
if ( in_array($spremenljivka['tip'], array(1,2,3) ) ) {
echo '<div class="zoom_var">';
echo '<div class="settings_block">';
echo '<label>';
echo '<input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox"'
.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
echo strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
echo ' <div class="setting_line">';
echo ' <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'" value="'.$spremenljivka['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'],$vars) ? ' checked' : '').'>';
echo ' <label for="zoom_var_'.$spremenljivka['id'].'">'.strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
echo ' </div>';
echo '</div>';
} else if ( in_array($spremenljivka['tip'], array(6,16,17))) {
echo '<div class="zoom_var">';
}
else if ( in_array($spremenljivka['tip'], array(6,16,17))) {
echo '<div class="settings_block">';
# izpišemo glavno spremenljivko
echo '<label style="margin-left:20px;">';
echo strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
echo ' <div class="setting_line">';
echo ' <label>'.strip_tags($spremenljivka['variable']).' - '.strip_tags($spremenljivka['naslov']).'</label>';
echo ' </div>';
# izpišemo gride (zamaknjeno)
$sql = sisplet_query("SELECT id, naslov, variable FROM srv_vrednost WHERE spr_id='$id' AND other = 0 ORDER BY vrstni_red");
while ($row = mysqli_fetch_assoc($sql)) {
echo '<label style="margin-left:25px; margin-top:5px;">';
echo '<input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox"'
.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
echo strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
echo ' <div class="setting_line indent">';
echo ' <input name="zoom_vars" id="zoom_var_'.$spremenljivka['id'].'_'.$row['id'].'" value="'.$spremenljivka['id'].'_'.$row['id'].'" type="checkbox" '.(is_array($vars) && in_array($spremenljivka['id'].'_'.$row['id'],$vars) ? ' checked' : '').'>';
echo ' <label for="">'.strip_tags($row['variable']).' - '.strip_tags($row['naslov']).'</label>';
echo ' </div>';
}
echo '</div>';
}
}
echo '<br class="clr"/>';
}
/* Shranimo izbrane variable in resetiramo if na 0, ter pobrišemo morebitni pogoj če obstaja

25
admin/survey/export/latexclasses/class.LatexSurveyElement.php
View File

@ -1057,29 +1057,48 @@ class LatexSurveyElement{
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa
$findAt = '@';
$numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu
$text=html_entity_decode($text);
$posAt = strpos($text, $findAt);
if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu
//echo "afna je: $posAt </br>";
//echo "Encoding: ".$text."</br>";
//najdi prvi presledek po afni
//echo substr($text, $posAt) ."</br>";
$posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu
$posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posSpace1Mail."</br>";
//najdi prvi <br /> po afni
$posBreakMail = strpos(substr($text, $posAt), "<br />"); //najdi pozicijo prvega break v besedilu po e-naslovu
$najdi = "&nbsp;";
$posBreakMail = $posBreakMail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posBreakMail."</br>";
//najdi prvi &nbsp; po afni
$posNbspMail = strpos(substr($text, $posAt), "&nbsp;"); //najdi pozicijo prvega &nbsp; v besedilu po e-naslovu
$najdi = "&nbsp;";
$posNbspMail = $posNbspMail+$posAt; //koncna pozicija, ce se gleda celotno besedilo
//echo $posNbspMail."</br>";
//najdi prvi presledek pred afno
$posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom
//echo $posSpace2Mail."</br>";
//dodaj po e-naslovu potrebno latex kodo za zakljucek url
$text = substr_replace($text, '}', $posSpace1Mail, 0);
//$text = substr_replace($text, '}', $posSpace1Mail, 0);
//$posEnd = min($posSpace1Mail, $posBreakMail, $posNbspMail);
$posEnd = min($posSpace1Mail, $posBreakMail);
//echo $posEnd."</br>";
$text = substr_replace($text, '}', $posEnd, 0);
//dodaj pred e-naslovom potrebno latex kodo za url
//substr_replace(string_name, replacement_string, start_pos, length)
$text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0);
//echo $text."</br>";
}
//detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec

1
admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls
View File

@ -98,3 +98,4 @@
\DeclareUnicodeCharacter{03B5}{$\epsilon$
\DeclareUnicodeCharacter{2003}{$\enspace$}}
\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
\DeclareUnicodeCharacter{0301}{$'$}

1
admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls
View File

@ -96,3 +96,4 @@
\DeclareUnicodeCharacter{03B5}{$\epsilon$}
\DeclareUnicodeCharacter{2003}{$\enspace$}
\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
\DeclareUnicodeCharacter{0301}{$'$}

2
admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls
View File

@ -27,6 +27,7 @@
\usepackage[utf8]{inputenc} % za uporabo utf8
\usepackage{amssymb} %za unicode simbole
%\usepackage[T1]{fontenc}
%DEFINIRANJE NADOMESTIL NEIZPISLJIVIH UNICODE CHARACTER-JEV
\DeclareUnicodeCharacter{200B}{{\hskip 0pt}}
@ -35,6 +36,7 @@
\DeclareUnicodeCharacter{03B5}{$\epsilon$}
\DeclareUnicodeCharacter{2003}{$\enspace$}
\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja
\DeclareUnicodeCharacter{0301}{$'$}
%Emoji - izpis urejen s slikicami emoji-jev
\DeclareUnicodeCharacter{1F600}{\includegraphics[height=1em]{1F600.png}}

628
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

57
resources/sass/admin_new/components/popup/basic.scss
View File

@ -109,13 +109,18 @@
.popup_main{
display: flex;
flex-direction: column;
border-bottom: 1px $dark-gray solid;
&.with_menu{
flex-direction: row;
}
.popup_left{
box-sizing: border-box;
width: 232px;
width: 216px;
padding-right: 16px;
margin-right: 16px;
@ -146,12 +151,38 @@
}
}
}
button{
display: flex;
align-items: center;
width: 100%;
font-weight: 400;
.faicon{
font-size: 12px;
line-height: 14px;
&::before{
margin-right: 8px;
font-size: 14px;
color: $blue;
}
}
}
}
.popup_right{
overflow-y: auto;
max-height: 70vh;
.popup_right_note{
margin-bottom: 16px;
font-size: 16px;
}
}
fieldset{
display: flex;
flex-direction: column;
@ -166,10 +197,32 @@
padding: 0 8px 0 0;
font-size: 14px;
}
}
.setting_line{
margin-bottom: 16px;
margin-bottom: 8px;
font-size: 14px;
&:last-of-type{
margin-bottom: 0;
}
label,
span{
font-size: 14px;
}
}
.settings_block{
display: flex;
flex-direction: column;
margin-bottom: 16px;
label,
span{
font-size: 14px;
}
}
}

13
resources/sass/admin_new/pages/survey_analysis/popups/profiles.scss
View File

@ -8,6 +8,19 @@ and open the template in the editor.
Author : podkrizniku
*/
#zoom_profiles_right{
.settings_block{
.setting_line.indent{
padding-left: 16px;
}
}
}
.condition_profile_holder {
float: left;
width: 190px;