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

Modul volitve - popravki vklopa, besedilo, popravljeno obvestilo "v bazi ni enot"

Browse Source
This commit is contained in:
pero1203 2022-10-17 10:22:19 +02:00
parent 13bcb49620
commit fdadf91093
5 changed files with 37 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
admin/survey/SurveyAdminSettings.php
View File

@ -9591,8 +9591,8 @@ class SurveyAdminSettings {
echo '<p class="bottom16">'.$lang['srv_vrsta_survey_note_6_4'].'</p>';
echo '<div class="setting_holder">';
echo '<input type="checkbox" id="advanced_module_quiz" name="quiz" value="1" '. (isset($modules['quiz']) ? ' checked="checked"' : '').$disabled.' onChange="toggleAdvancedModule(\'quiz\');" />';
echo '<label for="advanced_module_quiz">'.$lang['srv_vrsta_survey_note_6_4a'].'</label>';
echo ' <input type="checkbox" id="advanced_module_quiz" name="quiz" value="1" '. (isset($modules['quiz']) ? ' checked="checked"' : '').$disabled.' onChange="toggleAdvancedModule(\'quiz\');" />';
echo ' <label for="advanced_module_quiz">'.$lang['srv_vrsta_survey_note_6_4a'].'</label>';
echo '</div>';
echo '</fieldset>';
@ -9614,19 +9614,22 @@ class SurveyAdminSettings {
echo '<fieldset><legend>'.$lang['srv_voting'].'</legend>';
echo '<label class="strong'.$css_disabled.'"><input type="checkbox" id="advanced_module_voting" name="voting" value="1" '. (isset($modules['voting']) ? ' checked="checked"' : '').$disabled.' onChange="toggleAdvancedModule(\'voting\');" />';
echo $lang['srv_vrsta_survey_type_18'] . '</label>';
echo '<br><i>'.$lang['srv_voting_info'].'</i>';
echo '<p class="bottom16">'.$lang['srv_voting_info'].'</p>';
echo '<p class="bottom16">'.$lang['srv_voting_info_link'].'</p>';
echo '<p class="bottom16">'.$lang['srv_voting_info_warning'].'</p>';
// Opozorilo, da so vabila ze vklopljena in zato modula ni mogoce vklopiti
if(!isset($modules['voting']) && SurveyInfo::getInstance()->checkSurveyModule('email')){
echo '<br><br><i class="red bold">'.$lang['srv_voting_info_error'].'</i><br>';
echo '<p class="bottom16"><i class="red bold">'.$lang['srv_voting_info_error'].'</i></p>';
}
echo '<div class="setting_holder '.$css_disabled.'">';
echo ' <input type="checkbox" id="advanced_module_voting" name="voting" value="1" '. (isset($modules['voting']) ? ' checked="checked"' : '').$disabled.' onChange="toggleAdvancedModule(\'voting\');" />';
echo ' <label for="advanced_module_voting">'.$lang['srv_voting_on'].'</label>';
echo '</div>';
echo '</fieldset>';
echo '<br />';
echo '<div id="globalSettingsInner">';
if(isset($modules['voting'])){
$sv = new SurveyVoting($this->anketa);
@ -9637,13 +9640,14 @@ class SurveyAdminSettings {
elseif ($_GET['a'] == 'advanced_paradata'){
echo '<fieldset><legend>'.$lang['srv_advanced_paradata'].'</legend>';
echo '<label class="strong'.$css_disabled.'"><input type="checkbox" id="advanced_module_advanced_paradata" name="advanced_paradata" value="1" '. (isset($modules['advanced_paradata']) ? ' checked="checked"' : '').$disabled.' onChange="toggleAdvancedModule(\'advanced_paradata\');" />';
echo $lang['srv_vrsta_survey_type_16'] . '</label>';
//echo '<br/><i class="'.$css_disabled.'">'.$lang['srv_vrsta_survey_note_6_4'].'</i>';
echo '</fieldset>';
echo '<br />';
echo '<div class="setting_holder '.$css_disabled.'">';
echo ' <input type="checkbox" id="advanced_module_advanced_paradata" name="advanced_paradata" value="1" '. (isset($modules['advanced_paradata']) ? ' checked="checked"' : '').$disabled.' onChange="toggleAdvancedModule(\'advanced_paradata\');" />';
echo ' <label for="advanced_module_advanced_paradata">'.$lang['srv_vrsta_survey_type_16_on'].'</label>';
echo '</div>';
echo '</fieldset>';
echo '<div id="globalSettingsInner">';
if(isset($modules['advanced_paradata'])){
$sap = new SurveyAdvancedParadata($this->anketa);

2
admin/survey/classes/class.SurveyStatistic.php
View File

@ -807,7 +807,7 @@ class SurveyStatistic {
echo '<div class="dashboard_boxes">';
// nimamo še vnosov
if ($allUserCount == 0 || $paradata_date == 1) {
if ($allUserCount == 0 || ($paradata_date == 1 && !SurveyInfo::getInstance()->checkSurveyModule('voting'))){
echo '<div class="dashboard_box" name="div_statistic_info" id="div_statistic_info">';
$this->DisplayInfoView();

14
admin/survey/modules/mod_voting/class.SurveyVoting.php
View File

@ -47,15 +47,13 @@ class SurveyVoting{
echo '<fieldset><legend>'.$lang['settings'].'</legend>';
echo '<br>';
echo $lang['srv_voting_edit1'].' <a href="index.php?anketa='.$this->anketa.'&amp;a='.A_BRANCHING.'"><span class="bold">'.$lang['srv_voting_edit2'].'</span></a>.';
echo ' <p class="bottom16">';
echo $lang['srv_voting_edit1'].' <a href="index.php?anketa='.$this->anketa.'&amp;a='.A_BRANCHING.'">'.$lang['srv_voting_edit2'].'</a>.';
echo ' </p>';
echo '<br><br>';
echo $lang['srv_voting_invitations1'].' <a href="index.php?anketa='.$this->anketa.'&amp;a='.A_INVITATIONS.'"><span class="bold">'.$lang['srv_voting_invitations2'].'</span></a>.';
echo '<br><br>';
echo ' <p>';
echo $lang['srv_voting_invitations1'].' <a href="index.php?anketa='.$this->anketa.'&amp;a='.A_INVITATIONS.'">'.$lang['srv_voting_invitations2'].'</a>.';
echo ' </p>';
echo '</fieldset>';
}

6
lang/1.php
View File

@ -3162,6 +3162,7 @@ $lang = array (
"srv_vrsta_survey_type_14" => "Klepet",
"srv_vrsta_survey_type_15" => "Panel",
"srv_vrsta_survey_type_16" => "Napredni parapodatki",
"srv_vrsta_survey_type_16_on" => "Vklopi modul 'Napredni parapodatki'",
"srv_vrsta_survey_type_17" => "JSON izvoz ankete",
"srv_vrsta_survey_type_18" => "Volitve",
"srv_vrsta_survey_with_pool" => "Dodajanje glasovanja",
@ -3244,7 +3245,10 @@ $lang = array (
"srv_zakljucek_vprasalnika" => "Zaklju&#269;ek vpra&#353;alnika",
"srv_kviz_konec_note" => "&#268;e ni izbrana nobena opcija, vidi rezultate samo administrator",
"srv_voting" => "Volitve",
"srv_voting_info" => "Modul volitve omogoča pošiljanje vabil z izklopom vseh parapodatkov in brez kakršnekoli možnosti povezovanja podatkov z elektronskimi naslovi in drugimi identifikatorji.<br>Po vklopu, izklop modula ni več mogoč!",
"srv_voting_on" => "Vklopi modul 'Volitve'",
"srv_voting_info" => "Modul volitve omogoča pošiljanje vabil z izklopom vseh parapodatkov in brez kakršnekoli možnosti povezovanja podatkov z elektronskimi naslovi in drugimi identifikatorji.",
"srv_voting_info_link" => "<a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/napredni-modul-volitve\" target=\"_blank\">Več informacij o modulu 'Volitve'</a>",
"srv_voting_info_warning" => "<b>Po vklopu, izklop modula na anketi ni več mogoč!</b>",
"srv_voting_info_error" => "V anketi so bila že vklopljena oziroma poslana email vabila, zato modula na tej anketi ni mogoče vklopiti.",
"srv_voting_edit1" => "Vprašalnik urejate v zavihku",
"srv_voting_edit2" => "Urejanje",

6
lang/2.php
View File

@ -3135,6 +3135,7 @@ $lang = array (
"srv_vrsta_survey_type_14" => "Chat",
"srv_vrsta_survey_type_15" => "Panel",
"srv_vrsta_survey_type_16" => "Advanced paradata",
"srv_vrsta_survey_type_16_on" => "Activate 'Advanced paradata' module",
"srv_vrsta_survey_type_17" => "JSON survey export",
"srv_vrsta_survey_type_18" => "Voting",
"srv_vrsta_survey_with_pool" => "Add vote",
@ -3215,7 +3216,10 @@ $lang = array (
"srv_zakljucek_vprasalnika" => "Survey end",
"srv_kviz_konec_note" => "If no option is selected, only administrator can view results",
"srv_voting" => "Voting",
"srv_voting_info" => "The Voting module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.<br>After switching on, switching off the module is no longer possible!",
"srv_voting_on" => "Activate the 'Voting' module",
"srv_voting_info" => "The Voting module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.",
"srv_voting_info_link" => "<a href=\"https://www.1ka.si/d/sl/pomoc/prirocniki/napredni-modul-volitve\" target=\"_blank\">More info about 'voting' module</a>",
"srv_voting_info_warning" => "<b>After switching on, switching off the module is no longer possible!</b>",
"srv_voting_info_error" => "Email invitations have already been activated or sent, so the module cannot be activated in this survey.",
"srv_voting_edit1" => "You can edit the questionnaire in a tab",
"srv_voting_edit2" => "Edit",