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

[Redizajn 1KA] - Urejanje --> Nastavitve --> Obveščanje o izpolnjeni anketi - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-01-05 17:46:49 +01:00
parent 0d590792a7
commit 5d2f540cb2
12 changed files with 260 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/Branching.php
View File

@ -6869,7 +6869,7 @@ class Branching {
} else {
if ($condition_check != 0)
echo ' <span class="faicon warning icon-orange"></span> <span class="red">'.$lang['srv_if_error'].'</span>';
echo ' <span class="faicon warning red"></span> <span class="red">'.$lang['srv_if_error'].'</span>';
}

24
admin/survey/SurveyAdminAjax.php
View File

@ -5595,17 +5595,23 @@ class SurveyAdminAjax {
echo '<input type="hidden" name="type" value="'.$type.'">';
echo '<input type="hidden" name="uid" value="'.$uid.'">';
echo '<p><label for="subject">' . $lang['subject'] . ': </label><input type="text" id="subject" name="subject" value="' . $subject . '" size="90"/></p>';
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo ' <p><label for="text">' . $lang['text'] . ':</label>';
echo ' <textarea name="text" id="text" rows="3" >' . $text . '</textarea>';
echo ' </p>';
echo '<div class="setting_holder">';
echo '<label for="subject">' . $lang['subject'] . ': </label>';
echo '<input type="text" class="large wauto" id="subject" name="subject" value="' . $subject . '"/>';
echo '</div>';
echo '<div class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_orange" onclick="$(\'form[name=alert_custom]\').submit(); return false;" href="#"><span>'.$lang['save'].'</span></a></div>';
echo '<div class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" onclick="remove_editor(\'text\'); $(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').hide().html(\'\'); return false;" href="#"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></div>';
// prikaze editor za ne-spremenljivko (za karkoli druzga pac)
echo '<div class="setting_holder">';
echo '<label class="bottom4" for="text">' . $lang['message'] . ':</label>';
echo '<textarea name="text" id="text">' . $text . '</textarea>';
echo '</div>';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="remove_editor(\'text\'); $(\'#fade\').fadeOut(\'slow\'); $(\'#vrednost_edit\').hide().html(\'\'); return false;">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onclick="$(\'form[name=alert_custom]\').submit(); return false;">'.$lang['edit1337'].'</button>';
echo '</div>';
echo '</form>';

125
admin/survey/SurveyAdminSettings.php
View File

@ -3247,18 +3247,17 @@ class SurveyAdminSettings {
echo ' <fieldset>';
echo ' <legend>' . $lang['srv_alert_completed_2'] . '</legend>';
echo '<div class="setting_holder">';
echo '<div class="setting_holder alert_prejemniki">';
echo '<span class="setting_title">'.$lang['srv_alert_completed_prejemniki'].'</span>';
// respondent - ne prikazemo ce gre za glasovanje oz. volitve
if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){
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' : '') . '>';
$this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1));
echo '</div>';
// Ce imamo vec prevodov omogocimo za vsak prevod svoj email - v delu @TG
// Ce imamo vec prevodov omogocimo za vsak prevod svoj email
$this->display_alert_label('finish_respondent_language',($rowAlert['finish_respondent'] == 1));
}
@ -3267,7 +3266,7 @@ class SurveyAdminSettings {
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
echo '<div class="setting_item" id="label_alert_finish_respondent_cms">';
echo '<p><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));
echo '</div>';
@ -3281,7 +3280,7 @@ class SurveyAdminSettings {
//Posebej navedeni maili
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_finish_other" id="alert_finish_other" value="1"' . (($rowAlert['finish_other'] == 1 || ($rowAlert['finish_other_emails'] && $rowAlert['finish_other'] != 0)) ? ' checked' : '') . ' onchange="toggleStatusAlertOtherCheckbox(\'finish_other\'); if ( ! $(this).attr(\'checked\') ) { $(\'form[name=alertanketa_' . $anketa . ']\').submit(); }"><label for="alert_finish_other">' . $lang['email_prejemniki'] .'</label>';
echo ' <a href="#" onclick="alert_custom(\'other\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo ' <a href="#" onclick="alert_custom(\'other\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
echo ' <a href="#" onclick="alert_edit_if(\'4\'); return false;"><span class="faicon if_add" '.($rowAlert['finish_other_if']==0?'style=""':'').'></span></a> ';
if ($rowAlert['finish_other_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($rowAlert['finish_other_if']); }
echo '</div>';
@ -3355,18 +3354,20 @@ class SurveyAdminSettings {
echo '<div class="izpolnjena_spremenljivke">';
echo '<p>'.$lang['srv_alert_instruction_system'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_sample'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_available'].'</p>';
$sqlSistemske = sisplet_query("SELECT s.id, s.naslov, s.variable FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.gru_id=g.id AND g.ank_id='$anketa' ORDER BY g.vrstni_red, s.vrstni_red");
$prefix = "";
while ($rowSistemske = mysqli_fetch_assoc($sqlSistemske)) {
echo $prefix . '#' . $rowSistemske['variable'] . '#';
$prefix = ", ";
$prefix = $prefix . $rowSistemske['variable'] . ', ';
}
if ($prefix == "") { // ni sistemskih spremenljivk
echo '<p class="red">'.$lang['srv_alert_no_sys_var'].'</p>';
if($prefix != "") {
echo '<p class="bold bottom16">'.$lang['srv_alert_instruction_available'].'</p>';
echo '<p class="bottom16">'.rtrim($prefix, ", ").'</p>';
echo '<p class="bold bottom16">'.$lang['srv_alert_instruction_system'].'</p>';
echo '<p>'.$lang['srv_alert_instruction_sample'].'</p>';
}
else{ // ni sistemskih spremenljivk
echo '<p class="bold">'.$lang['srv_alert_no_sys_var'].'</p>';
}
echo '</div>';
@ -3609,7 +3610,7 @@ class SurveyAdminSettings {
echo ' <input type="hidden" name="location" value="' . $_GET['a'] . '" />' . "\n";
echo ' <input type="hidden" name="m" value="' . $_GET['m'] . '" />' . "\n";
//Obveščanje ob izbrisu ankete
//Obveščanje o izbrisu ankete
echo '<fieldset>';
echo '<legend>' . $lang['srv_alert_surveydelete'] . '</legend>';
@ -5100,12 +5101,12 @@ class SurveyAdminSettings {
if(!empty($jeziki)){
$row = SurveyInfo::getInstance()->getSurveyRow();
echo '<br />';
foreach($jeziki as $key => $jezik){
echo '<span class="clr" style="padding-left:20px; line-height:22px;">'.$lang['srv_alert_respondent'].' - '.$jezik;
echo ' <a href="#" onclick="alert_custom(\'respondent_lang_'.$key.'\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo '</span>';
echo '<div class="setting_item respondent_jeziki">';
echo '<label>'.$lang['srv_alert_respondent'].' - '.$jezik.'</label>';
echo '<a href="#" onclick="alert_custom(\'respondent_lang_'.$key.'\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
echo '</div>';
}
}
}
@ -5114,14 +5115,15 @@ class SurveyAdminSettings {
case 'finish_respondent': // respondent ki je zakljucil anketo
if ($isChecked) {
// preverimo ali obszaja sistemska spremenljivka email če ne jo dodamo
// preverimo, ali obstaja sistemska spremenljivka email, če ne jo dodamo
$sqlEmail = sisplet_query("SELECT s.sistem, s.variable, s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.variable='email' AND s.gru_id=g.id AND g.ank_id='$this->anketa'");
$sqlIme = sisplet_query("SELECT s.sistem, s.variable, s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.variable='ime' AND s.gru_id=g.id AND g.ank_id='$this->anketa'");
// ce sta dodani obe sistemski spremenljivki je fse ok
// ce sta dodani obe sistemski spremenljivki, je vse ok
$email_ok = $ime_ok = false;
if ( mysqli_num_rows($sqlEmail) > 0 && mysqli_num_rows($sqlIme) > 0) {
$email_ok = $ime_ok = true;
} else {
}
else {
// manjka ena ali obe potrebni sistemski spremenljivki
// email je nujen, zato ga dodamo avtomatsko
@ -5131,7 +5133,7 @@ class SurveyAdminSettings {
if (in_array('email',$sa->alert_add_necessary_sysvar( array('email') , false))) {
$email_ok = true;
}
// email v tem primeru spremenimo da je viden, ker gre za alert
// email v tem primeru spremenimo, da je viden, ker gre za alert
$sqlEmail = sisplet_query("SELECT s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.sistem='1' AND s.variable='email' AND s.gru_id=g.id AND g.ank_id='$this->anketa'");
$rowEmail = mysqli_fetch_array($sqlEmail);
sisplet_query("UPDATE srv_spremenljivka SET visible='1' WHERE id = '$rowEmail[id]'");
@ -5140,48 +5142,48 @@ class SurveyAdminSettings {
$v->spremenljivka = $rowEmail['id'];
$v->set_email($reminder=1);
} else {
// email je ze dodan damo tekst za ok
}
else {
// email je ze dodan, damo tekst za ok
$email_ok = true;
}
// preverimo še za ime
if ( mysqli_num_rows($sqlIme) == 0 ) {
} else{
}
else{
$ime_ok = true;
}
}
echo '<label for="alert_finish_respondent">'.$lang['srv_alert_respondent'].'</label>';
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 '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
if ($email_ok && $ime_ok) {
echo $lang['srv_alert_respondent_note_ok_email_ime'];
echo ' <img src="icons/icons/accept.png" alt="" vartical-align="middle" />' . "\n\r";
echo ' <a href="#" onclick="alert_custom(\'respondent\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo ' <a href="#" onclick="alert_custom(\'respondent\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
$sql1 = sisplet_query("SELECT finish_respondent_if FROM srv_alert WHERE ank_id='$this->anketa'");
$row1 = mysqli_fetch_array($sql1);
echo ' <a href="#" onclick="alert_edit_if(\'2\'); return false;"><span class="faicon if_add" '.($row1['finish_respondent_if']==0?'style=""':'').'></span></a> ';
if ($row1['finish_respondent_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_if']); }
echo '<span class="gray">'.$lang['srv_alert_respondent_note_ok_email_ime'].'&nbsp<span class="faicon fa-check-circle"></span></span>';
} else {
if ($ime_ok) {
// pomeni da email ni ok! napaka
echo $lang['srv_alert_respondent_note_notok_email'];
echo '<span class="red">'.$lang['srv_alert_respondent_note_notok_email'].'</span>';
} else {
// email je ok, ime ni, uporabnika fprasamo ali hoce se ime
echo $lang['srv_alert_respondent_note_ok_email'];
echo ' <a href="#" onclick="alert_custom(\'respondent\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
// email je ok, ime ni, uporabnika vprasamo, ali hoce se ime
echo '<a href="#" onclick="alert_custom(\'respondent\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
$sql1 = sisplet_query("SELECT finish_respondent_if FROM srv_alert WHERE ank_id='$this->anketa'");
$row1 = mysqli_fetch_array($sql1);
echo ' <a href="#" onclick="alert_edit_if(\'2\'); return false;"><span class="faicon if_add" '.($row1['finish_respondent_if']==0?'style=""':'').'></span></a>';
if ($row1['finish_respondent_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_if']); }
echo '<p class="gray top8">'.$lang['srv_alert_respondent_note_ok_email'].'</p>';
if(!$forma){
echo $lang['srv_alert_respondent_note_ime'];
echo ' &nbsp;<a href="#" onClick="alert_add_necessary_sysvar(\'finish_respondent\', $(this)); return false;"><span class="faicon add icon-blue"></span> '.$lang['srv_alert_respondent_note_link'].'</a>' . "\n\r";
echo '<p class="top8"><span class="gray">'.$lang['srv_alert_respondent_note_ime'].'</span>';
echo '<a class="noline" href="#" onClick="alert_add_necessary_sysvar(\'finish_respondent\', $(this)); return false;"><span class="faicon add respondent_iconwithlink"></span> '.$lang['srv_alert_respondent_note_link'].'</a></p>';
}
}
}
@ -5189,13 +5191,15 @@ class SurveyAdminSettings {
// preverimo sistemske nastavitve in spremenljivke ime
} else {
echo '<label for="alert_finish_respondent">'.$lang['srv_alert_respondent'].'</label>';
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 '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
}
break;
case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo
//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 '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>';
if ($isChecked) {
@ -5204,27 +5208,26 @@ class SurveyAdminSettings {
//$rowCMS = mysqli_fetch_assoc($sqlCMS);
$rowCMS = SurveyInfo::getInstance()->getSurveyRow();
if ($rowCMS['user_from_cms'] > 0) {
echo $lang['srv_alert_respondent_cms_note_ok'];
echo ' <img src="icons/icons/accept.png" alt="" vartical-align="middle" />' . "\n\r";
echo ' <a href="#" onclick="alert_custom(\'respondent_cms\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo ' <a href="#" onclick="alert_custom(\'respondent_cms\', \'0\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
$sql1 = sisplet_query("SELECT finish_respondent_cms_if FROM srv_alert WHERE ank_id='$this->anketa'");
$row1 = mysqli_fetch_array($sql1);
echo ' <a href="#" onclick="alert_edit_if(\'3\'); return false;"><span class="faicon if_add" '.($row1['finish_respondent_cms_if']==0?'style=""':'').'></span></a> ';
if ($row1['finish_respondent_cms_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_cms_if']); }
echo '<span class="gray">'.$lang['srv_alert_respondent_cms_note_ok'].'&nbsp<span class="faicon fa-check-circle"></span></span>';
} else {
echo $lang['srv_alert_respondent_cms_note'];
echo ' &nbsp;<a href="#" onClick="alert_change_user_from_cms(\'finish_respondent_cms\', $(this)); return false;"><span class="faicon add icon-blue"></span> '.$lang['srv_alert_respondent_cms_note_link'].'</a>' . "\n\r";
echo '<p class="top8"><span class="red">'.$lang['srv_alert_respondent_cms_note'].'</spam>';
echo '<a class="noline" href="#" onClick="alert_change_user_from_cms(\'finish_respondent_cms\', $(this)); return false;"><span class="faicon add respondent_iconwithlink"></span> '.$lang['srv_alert_respondent_cms_note_link'].'</a></p>';
}
}
break;
case 'finish_author': // obveščanje ob izpolnjeni anketi
case 'expire_author': // obveščanje ob poteku ankete
case 'active_author': // obveščanje ob aktivaciji/deaktivaciej ankete
case 'delete_author': // obveščanje ob izbrisu ankete
case 'finish_author': // obveščanje o izpolnjeni anketi
case 'expire_author': // obveščanje o poteku ankete
case 'active_author': // obveščanje o aktivaciji/deaktivaciej ankete
case 'delete_author': // obveščanje o izbrisu ankete
// preberemo nastavitve alertov
$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'");
@ -5283,14 +5286,17 @@ class SurveyAdminSettings {
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_'.$what.'_uid[]" value="' . $row['insert_uid'] . '" id="alert_'.$what.'_uid_' . $row['insert_uid'] . '"' . $checked . ' autocomplete="off"/>';
echo '<label for="alert_'.$what.'_uid_' . $row['insert_uid'] . '" title="' . $rowAuthor['email'] . '">' . $rowAuthor['name'] . ' (' . $lang['author'] . ': '.$rowAuthor['email']. ')' . '</label>';
echo '</div>';
if ($what == 'finish_author') {
echo ' <a href="#" onclick="alert_custom(\'author\', \''.$row['insert_uid'].'\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo '<span>';
echo ' <a href="#" onclick="alert_custom(\'author\', \''.$row['insert_uid'].'\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
echo ' <a href="#" onclick="alert_edit_if(\'1\', \''.$row1['id'].'\'); return false;"><span class="faicon if_add" '.($row1['alert_complete_if']==0?'style=""':'').'></span></a> ';
if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); }
echo '</span>';
}
echo '</div>';
echo '</div>';
}
// polovimo avtorja pri ostalih obvestilih
else{
@ -5303,14 +5309,17 @@ class SurveyAdminSettings {
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_'.$what.'_uid[]" value="' . $row['insert_uid'] . '" id="alert_'.$what.'_uid_' . $row['insert_uid'] . '" checked="checked" disabled="disabled" autocomplete="off"/>';
echo '<label for="alert_'.$what.'_uid_' . $row['insert_uid'] . '" title="' . $rowAuthor['email'] . '">' . $rowAuthor['name'] . ' (' . $lang['author'] . ': '.$rowAuthor['email']. ')' . '</label>';
echo '</div>';
if ($what == 'finish_author') {
echo ' <a href="#" onclick="alert_custom(\'author\', \''.$row['insert_uid'].'\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo '<span>';
echo ' <a href="#" onclick="alert_custom(\'author\', \''.$row['insert_uid'].'\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
echo ' <a href="#" onclick="alert_edit_if(\'1\', \''.$row1['id'].'\'); return false;"><span class="faicon if_add" '.($row1['alert_complete_if']==0?'style=""':'').'></span></a> ';
if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); }
echo '</span>';
}
echo '</div>';
echo '</div>';
}
@ -5325,13 +5334,17 @@ class SurveyAdminSettings {
echo '<div class="setting_item">';
echo '<input type="checkbox" name="alert_'.$what.'_uid[]" value="' . $row1['id'] . '" id="alert_'.$what.'_uid_' . $row1['id'] . '"' . $checked . ' autocomplete="off"/>';
echo '<label for="alert_'.$what.'_uid_' . $row1['id'] . '" title="' . $row1['email'] . '">' . $row1['name'] . ' ('.$row1['email'].')</label>';
echo '</div>';
if ($what == 'finish_author') {
echo ' <a href="#" onclick="alert_custom(\'author\', \''.$row1['id'].'\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file_small"></span></a>';
echo '<span>';
echo ' <a href="#" onclick="alert_custom(\'author\', \''.$row1['id'].'\'); return false;" title="'.$lang['srv_alert_custom'].'"><span class="faicon text_file empty"></span></a>';
echo ' <a href="#" onclick="alert_edit_if(\'1\', \''.$row1['id'].'\'); return false;"><span class="faicon if_add" '.($row1['alert_complete_if']==0?'style=""':'').'></span></a> ';
if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); }
echo '</span>';
}
echo '</div>';
echo '</div>';
}
}
}

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

@ -3229,10 +3229,10 @@ function change_alert_instruction(el) {
function alert_add_necessary_sysvar(what,el) {
var id = el.attr("id");
var checked = $("#alert_"+what).is(':checked');
$("span#label_alert_"+what).load('ajax.php?a=alert_add_necessary_sysvar', {anketa: srv_meta_anketa_id, checked: checked, what:what});
$("div#label_alert_"+what).load('ajax.php?a=alert_add_necessary_sysvar', {anketa: srv_meta_anketa_id, checked: checked, what:what});
}
function alert_change_user_from_cms(what, el) {
$("span#label_alert_"+what).load('ajax.php?a=alert_change_user_from_cms', {anketa: srv_meta_anketa_id});
$("div#label_alert_"+what).load('ajax.php?a=alert_change_user_from_cms', {anketa: srv_meta_anketa_id});
}
function alert_edit_if (type, uid) {

22
lang/1.php
View File

@ -2241,16 +2241,16 @@ $lang = array (
"srv_alert_title" => "Obve&#353;&#269;anje o vsaki izpolnjeni anketi:",
"srv_alert_expired_title" => "Obve&#353;&#269;anje pred iztekom ankete:",
"srv_alert_expired_time_title" => "Datum - interval obve&#353;&#269;anja:",
"srv_alert_no_sys_var" => "V anketi ni sistemskih spremenljivk.",
"srv_alert_no_sys_var" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi.",
"srv_alert_respondent" => "Respondent",
"srv_alert_respondent_note_ok_email_ime" => "&nbsp;<span class=\"gray\">(Dodani sta sistemski spremenljivki \"email\" in \"ime\")</span>",
"srv_alert_respondent_note_ime" => "&nbsp;<span class=\"red\">&#381;elite dodati tudi sistemsko spremenljivko \"ime\"</span>",
"srv_alert_respondent_note_ok_email" => "&nbsp;<span class=\"gray\">(Dodana je sistemska spremenljivka \"email\")</span>",
"srv_alert_respondent_note_notok_email" => "&nbsp;<span class=\"red\">(Sistemske spremenljivke \"email\" ne morem dodati!)</span>",
"srv_alert_respondent_note_link" => "Dodaj potrebne sistemske spremenljivke!",
"srv_alert_respondent_note_ok_email_ime" => "(Dodani sta sistemski spremenljivki \"email\" in \"ime\")",
"srv_alert_respondent_note_ime" => "Želite dodati tudi sistemsko spremenljivko \"ime\"?",
"srv_alert_respondent_note_ok_email" => "(Dodana je sistemska spremenljivka \"email\")",
"srv_alert_respondent_note_notok_email" => "(Sistemske spremenljivke \"email\" ni bilo mogoče dodati!)",
"srv_alert_respondent_note_link" => "Dodaj potrebne sistemske spremenljivke",
"srv_alert_respondent_cms" => "Respondent, registriran v CMS",
"srv_alert_respondent_cms_note" => "&nbsp;<span class=\"red\">(V nastavitah mora biti ozna&#269;eno, da prepozna uporabnika iz CMS!)</span>",
"srv_alert_respondent_cms_note_ok" => "&nbsp;<span class=\"gray\">(Uporabnik bo prepoznan iz sisplet CMS)</span>",
"srv_alert_respondent_cms_note" => "(V nastavitah mora biti označeno, da prepozna uporabnika iz CMS!)",
"srv_alert_respondent_cms_note_ok" => "(Uporabnik bo prepoznan iz sisplet CMS)",
"srv_alert_respondent_cms_note_link" => "Dodaj nastavitev!",
"srv_alert_author" => "Avtor ankete oziroma souredniki",
"srv_alert_msg" => "je izpolnil formo/anketo",
@ -3623,9 +3623,9 @@ $lang = array (
"srv_alert_instruction_pdf" => "[PDF] - povezava do PDF datoteke z odgovori respondenta ",
"srv_alert_instruction_rtf" => "[RTF] - povezava do RTF datoteke z odgovori respondenta",
"srv_alert_instruction_meta_referer_url" => "[META_REFERER_URL] - Referer URL",
"srv_alert_instruction_system" => "<p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p>",
"srv_alert_instruction_sample" => "<p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#</p>",
"srv_alert_instruction_available" => "<p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p>",
"srv_alert_instruction_system" => "Sistemske spremenljivke navedite med dva znaka #.",
"srv_alert_instruction_sample" => "Primer: Če želimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vprašanju email, bomo uporabili #email#",
"srv_alert_instruction_available" => "Sistemske spremenljivke v anketi:",
"srv_alert_instruction3" => "[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - povezava do ankete<br/> [URL] -> povezava do urejanja ankete<br/><br/></p><p class=\"bold\">Dodatne sistemske spremenljivke iz ankete navedite med dva znaka #. </p><p>Primer:</p><p> &#269;e &#382;elimo izpisati odgovor, ki ga je uporabnik vnesel pri sistemskem vpra&#353;anju email, bomo uporabili #email#<br/></p><p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p><p>",
"srv_alert_instruction4" => "<p> [SURVEY] - ime ankete<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete<br/> [DAYS] - število dni pred potekom ankete <br/> [DURATION] - čas aktivnosti ankete</p>",
"srv_alert_instruction5" => "[SURVEY] - ime ankete<br/> [DATE] - datum<br/> [SITE] - povezava do ankete<br/> [URL] - povezava do urejanja ankete",

16
lang/2.php
View File

@ -2227,13 +2227,13 @@ $lang = array (
"srv_alert_title" => "Notification about each completed questionnaire:",
"srv_alert_expired_title" => "Notification before survey expiration:",
"srv_alert_expired_time_title" => "Date - notification interval:",
"srv_alert_no_sys_var" => "There are no system variables in the survey.",
"srv_alert_no_sys_var" => "You can also use system variables in your message, which are currently not in the survey.",
"srv_alert_respondent" => "Respondent",
"srv_alert_respondent_note_ok_email_ime" => "&nbsp;<span class=\"gray\">(System variables \"email\" and \"name\" were added)</span>",
"srv_alert_respondent_note_ime" => "&nbsp;<span class=\"red\">Do you want to add a system variable \"name\"</span>",
"srv_alert_respondent_note_ok_email" => "&nbsp;<span class=\"gray\">(System variable \"email\" were added)</span>",
"srv_alert_respondent_note_notok_email" => "&nbsp;<span class=\"red\">(System variable \"email\" could not be added!)</span>",
"srv_alert_respondent_note_link" => "Add the necessary system variables!",
"srv_alert_respondent_note_ime" => "Do you want to add a system variable \"name\"?",
"srv_alert_respondent_note_ok_email" => "(System variable \"email\" was added)",
"srv_alert_respondent_note_notok_email" => "(System variable \"email\" could not be added!)",
"srv_alert_respondent_note_link" => "Add the necessary system variables",
"srv_alert_respondent_cms" => "Respondent, registered to Sisplet CMS",
"srv_alert_respondent_cms_note" => "&nbsp;<span class=\"red\">(The seting should be marked to identify the user of CMS!)</span>",
"srv_alert_respondent_cms_note_ok" => "&nbsp;<span class=\"gray\">(The user will be identify from CMS)</span>",
@ -3593,9 +3593,9 @@ $lang = array (
"srv_alert_instruction_pdf" => "[PDF] => link to PDF file with respondent answers",
"srv_alert_instruction_rtf" => "[RTF] => link to RTF file with respondent answers",
"srv_alert_instruction_meta_referer_url" => "[META_REFERER_URL] => Referer URL",
"srv_alert_instruction_system" => "<p class=\"bold\"> Additional system variables from the survey should be placed between two # characters.</p>",
"srv_alert_instruction_sample" => "<p>Example:</p><p> If you wish to use the answer which the user entered in the system question email, you simply write #email#. </p>",
"srv_alert_instruction_available" => "<p class=\"bold\">System variables that are already available in the survey:</p>",
"srv_alert_instruction_system" => "System variables need to be placed between two # signs.",
"srv_alert_instruction_sample" => "Example: If you wish to use the answer which the user entered in the system question email, you simply write #email#",
"srv_alert_instruction_available" => "System variables available in the survey:",
"srv_alert_instruction3" => "[SURVEY] - survey name<br/> [DATE] - date<br/> [SITE] - link to survey<br/><br/></p><p class=\"bold\">Additional system variables from the survey indicate between the two characters #. </p><p>Example:</p><p> if we want to display the answer which the user entered for the system question about email, we will use the #email# <br/></p><p class=\"bold\">System variables that are already available in the survey: </p><p>",
"srv_alert_instruction4" => "<p> [SURVEY] - survey name<br/> [SITE] - link to survey<br/> [URL] - link to editing of survey<br/> [DAYS] - number of days before expiration <br/> [DURATION] - survey duration</p>",
"srv_alert_instruction5" => "[SURVEY] - survey name<br/> [DATE] - date<br/> [SITE] - link to survey<br/> [URL] - link to editing of survey",

76
public/css/admin_new.css
View File

@ -5067,6 +5067,10 @@ p, span {
color: #1E88E5;
}
.gray {
color: #C4C4C4;
}
.italic {
font-style: italic;
}
@ -5169,6 +5173,10 @@ span.faicon.blue,
a.faicon.blue {
color: #1E88E5;
}
span.faicon.red,
a.faicon.red {
color: #FF0000;
}
span.faicon.fa-stack,
a.faicon.fa-stack {
height: 1em;
@ -5646,7 +5654,7 @@ span.faicon.test::before {
}
a.faicon.if_add {
font-size: 12px;
font-size: 10px;
font-family: Source Sans Pro, sans-serif;
font-weight: 400;
}
@ -5662,7 +5670,7 @@ a.faicon.if_add:hover:before {
}
span.faicon.if_add {
font-size: 12px;
font-size: 10px;
font-family: Source Sans Pro, sans-serif;
font-weight: 400;
}
@ -5678,8 +5686,6 @@ span.faicon.if_add:hover:before {
}
span.faicon.text_file::before {
font-size: 24px;
font-weight: 400;
content: "\f15c";
}
@ -7953,11 +7959,6 @@ span.active-editors {
margin-right: 5px;
}
.alert_authors {
display: block;
text-indent: 12px;
}
.alert_textarea {
border: 1px solid silver;
background-color: #E5E5E5;
@ -13965,19 +13966,64 @@ fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_
fieldset #obvescanje_sidebyside_holder #obvescanje_sidebyside_right div.message_instructions div.izpolnjena_spremenljivke {
margin-bottom: 16px;
}
fieldset #obvescanje_sidebyside_holder label {
cursor: default;
}
fieldset #obvescanje_sidebyside_holder label.bottom4 {
margin-bottom: 4px;
}
fieldset .setting_holder.alert_prejemniki .alert_authors {
display: block;
text-indent: 12px;
}
fieldset .setting_holder.alert_prejemniki .setting_item label {
margin-right: 8px;
}
fieldset .setting_holder.alert_prejemniki .setting_item.respondent_jeziki {
margin-left: 24px;
}
fieldset .setting_holder.alert_prejemniki span.faicon {
vertical-align: middle;
text-indent: 0;
}
fieldset .setting_holder .alert_other_emails {
margin-left: 24px;
}
fieldset textarea.alert_other_emails {
width: 538px;
height: 100px;
}
fieldset label {
fieldset .setting_holder .alert_other_emails label {
cursor: default;
}
fieldset label.bottom4 {
fieldset .setting_holder textarea.alert_other_emails {
width: 538px;
height: 100px;
margin-left: 0;
}
span.faicon.respondent_iconwithlink {
margin-left: 16px;
margin-right: 4px;
}
#vrednost_edit label {
cursor: default;
}
#vrednost_edit label.bottom4 {
margin-bottom: 4px;
}
#vrednost_edit .setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
width: 565px;
}
#vrednost_edit .setting_holder:first-of-type {
margin-top: 0;
}
#vrednost_edit .setting_holder:last-of-type {
margin-bottom: 0;
}
#vrednost_edit .button_holder {
justify-content: start;
}
button.ui-datepicker-trigger {
cursor: pointer;

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

@ -41,6 +41,9 @@ a.faicon{
&.blue {
color: $blue;
}
&.red {
color: $red;
}
//STACKING
&.fa-stack {

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

@ -356,7 +356,7 @@ span.faicon.test::before{
content: "\f492";
}
@mixin icon_if_add() {
font-size: 12px;
font-size: 10px;
font-family: $font_family;
font-weight: 400;
&:before{
@ -379,8 +379,6 @@ span.faicon.if_add{
@include icon_if_add();
}
span.faicon.text_file::before{
font-size: 24px;
font-weight: 400;
content: "\f15c";
}
span.faicon.text_file_small {

4
resources/sass/admin_new/basic/typography.scss
View File

@ -14,6 +14,10 @@ p,span {
color: $blue;
}
.gray {
color: $dark-gray;
}
.italic {
font-style: italic;
}

5
resources/sass/admin_new/components/popup/other.scss
View File

@ -87,10 +87,7 @@ span.active-editors {
margin-right: 5px;
}
}
.alert_authors {
display: block;
text-indent: 12px;
}
.alert_textarea {
border: 1px solid silver;
background-color: $gray;

92
resources/sass/admin_new/pages/survey_edit/survey_settings/obvescanje.scss
View File

@ -27,18 +27,6 @@ fieldset{
}
}
}
//Box z emaili za dodatne prejemnike - spremeniti v class, ko se redizajna ostale strani za obveščanje @TG
.setting_holder.alert_other_emails {
margin-left: 24px;
}
textarea.alert_other_emails{
width: 538px;
height: 100px;
}
label{
cursor: default;
@ -49,3 +37,83 @@ fieldset{
}
}
.setting_holder{
//Manjši margin za note/IF ikone ob prejemnikih
&.alert_prejemniki{
.alert_authors {
display: block;
text-indent: 12px;
}
.setting_item {
label{
margin-right: 8px;
}
&.respondent_jeziki {
margin-left: 24px;
}
}
span.faicon {
vertical-align: middle;
text-indent: 0;
}
}
//Box z emaili za dodatne prejemnike
.alert_other_emails {
margin-left: 24px;
label{
cursor: default;
}
}
textarea.alert_other_emails{
width: 538px;
height: 100px;
margin-left: 0;
}
}
}
span.faicon.respondent_iconwithlink{
margin-left: 16px;
margin-right: 4px;
}
//Popup za custom message
#vrednost_edit {
label{
cursor: default;
//Label nad editorjem besedila
&.bottom4 {
margin-bottom: 4px;
}
}
.setting_holder {
margin-bottom: 16px;
display: flex;
flex-direction: column;
width: 565px;
&:first-of-type{
margin-top: 0;
}
&:last-of-type {
margin-bottom: 0;
}
}
.button_holder {
justify-content: start;
}
}