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

Redesign - popravki napak - obvescanje

Browse Source
This commit is contained in:
pero1203 2022-05-13 12:22:28 +02:00
parent aaa4bbb509
commit bd87dbcd47
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
admin/survey/SurveyAdminSettings.php
View File

@ -3117,8 +3117,10 @@ class SurveyAdminSettings {
// respondent - ne prikazemo ce gre za glasovanje oz. volitve // respondent - ne prikazemo ce gre za glasovanje oz. volitve
if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){ if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){
echo '<div class="setting_item" id="label_alert_finish_respondent">'; echo '<div class="setting_item" id="label_alert_finish_respondent">';
echo '<input type="checkbox" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="change_alert_respondent(\'finish_respondent\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
//echo '<input type="checkbox" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="change_alert_respondent(\'finish_respondent\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
$this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1)); $this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1));
echo '</div>'; echo '</div>';
// Ce imamo vec prevodov omogocimo za vsak prevod svoj email // Ce imamo vec prevodov omogocimo za vsak prevod svoj email
@ -3130,11 +3132,12 @@ class SurveyAdminSettings {
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
echo '<div class="setting_item" id="label_alert_finish_respondent_cms">'; echo '<div class="setting_item" id="label_alert_finish_respondent_cms">';
echo '<input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>'; //echo '<input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
$this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1)); $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1));
echo '</div>';
echo '</div>';
} }
//Avtor ankete oz. souredniki //Avtor ankete oz. souredniki
echo '<div class="setting_item" id="label_alert_finish_author">'; echo '<div class="setting_item" id="label_alert_finish_author">';
echo '<input type="checkbox" name="alert_finish_author" id="alert_finish_author" value="1" onChange="change_alert_respondent(\'finish_author\', $(this));return false;"' . ($rowAlert['finish_author'] == 1 ? ' checked' : '') . '>'; echo '<input type="checkbox" name="alert_finish_author" id="alert_finish_author" value="1" onChange="change_alert_respondent(\'finish_author\', $(this));return false;"' . ($rowAlert['finish_author'] == 1 ? ' checked' : '') . '>';
@ -3153,7 +3156,7 @@ class SurveyAdminSettings {
echo '<div class="setting_holder alert_other_emails '.($rowAlert['finish_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_finish_other_emails">'; echo '<div class="setting_holder alert_other_emails '.($rowAlert['finish_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_finish_other_emails">';
echo '<label for="alert_finish_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>'; echo '<label for="alert_finish_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>';
echo '<textarea class="alert_other_emails" name="alert_finish_other_emails" id="alert_finish_other_emails">' . $rowAlert['delete_other_emails'] . '</textarea>'; echo '<textarea class="alert_other_emails" name="alert_finish_other_emails" id="alert_finish_other_emails">' . $rowAlert['finish_other_emails'] . '</textarea>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
@ -5068,7 +5071,7 @@ class SurveyAdminSettings {
case 'finish_respondent_language': // respondent ki je zakljucil anketo v drugem jeziku (mu omogocimo nastavljanje custom maila za obvescanje) case 'finish_respondent_language': // respondent ki je zakljucil anketo v drugem jeziku (mu omogocimo nastavljanje custom maila za obvescanje)
if ($isChecked) { if ($isChecked) {
$p = new Prevajanje($anketa); $p = new Prevajanje($this->anketa);
$p->dostop(); $p->dostop();
$jeziki = $p->get_all_translation_langs(); $jeziki = $p->get_all_translation_langs();
if(!empty($jeziki)){ if(!empty($jeziki)){
@ -5128,7 +5131,7 @@ class SurveyAdminSettings {
$ime_ok = true; $ime_ok = true;
} }
} }
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>'; echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>'; echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
if ($email_ok && $ime_ok) { if ($email_ok && $ime_ok) {
@ -5164,7 +5167,7 @@ class SurveyAdminSettings {
// preverimo sistemske nastavitve in spremenljivke ime // preverimo sistemske nastavitve in spremenljivke ime
} else { } else {
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>'; echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>'; echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
} }
break; break;
@ -5172,7 +5175,7 @@ class SurveyAdminSettings {
case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo
//respondent iz cms //respondent iz cms
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . (($isChecked) ? ' checked' : '') . '>'; echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;" ' . (($isChecked) ? ' checked' : '') . '>';
echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>'; echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>';
if ($isChecked) { if ($isChecked) {
@ -5203,7 +5206,7 @@ class SurveyAdminSettings {
case 'delete_author': // obveščanje o izbrisu ankete case 'delete_author': // obveščanje o izbrisu ankete
// preberemo nastavitve alertov // preberemo nastavitve alertov
$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'"); $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$this->anketa'");
if (!$sqlAlert) if (!$sqlAlert)
echo mysqli_error($GLOBALS['connect_db']); echo mysqli_error($GLOBALS['connect_db']);
@ -5211,7 +5214,7 @@ class SurveyAdminSettings {
$rowAlert = mysqli_fetch_array($sqlAlert); $rowAlert = mysqli_fetch_array($sqlAlert);
} }
else { else {
SurveyAlert::getInstance()->Init($anketa, $global_user_id); SurveyAlert::getInstance()->Init($this->anketa, $global_user_id);
$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire(); $rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
} }