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

[Redizajn 1KA] Urejanje --> Nastavitve --> Obveščanje --> O izbrisu ankete - v3

Browse Source
This commit is contained in:
tejagerjovic 2021-12-24 00:52:31 +01:00
parent 439506e994
commit 6d4012f6a9
6 changed files with 58 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
admin/survey/SurveyAdminSettings.php
View File

@ -3574,8 +3574,10 @@ class SurveyAdminSettings {
//Navodila na desni
echo '<div id="obvescanje_sidebyside_right">';
echo '<div class="message_instructions">';
echo $lang['srv_alert_instruction1'];
echo $lang['srv_alert_instruction5'];
echo '<p class="bold caps bottom16">'.$lang['srv_alert_instruction1'].'</p>';
echo '<p class="bold bottom16">'.$lang['srv_alert_instruction1a'].':</p>';
echo '<p class="bottom16">'.$lang['srv_alert_instruction5'].':</p>';
echo '<p class="bold">'.$lang['srv_alert_instruction1b'].'</p>'; //@TG7
echo '</div>';
echo '</div>';
@ -5132,12 +5134,29 @@ class SurveyAdminSettings {
case 'active_author': // obveščanje ob aktivaciji/deaktivaciej ankete
case 'delete_author': // obveščanje ob izbrisu ankete
// avtor ankete
if($forma)
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author2'].'</label>';
else
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author'].'</label>';
// preberemo nastavitve alertov
$sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'");
if (!$sqlAlert)
echo mysqli_error($GLOBALS['connect_db']);
if (mysqli_num_rows($sqlAlert) > 0) {
$rowAlert = mysqli_fetch_array($sqlAlert);
}
else {
SurveyAlert::getInstance()->Init($anketa, $global_user_id);
$rowAlert = SurveyAlert::setDefaultAlertBeforeExpire();
}
// avtor ankete
if($forma) {
echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '>';
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author2'].'</label>';
}
else {
//echo $rowAlert['delete_author']; //@TG6
echo '<input type="checkbox" name="alert_delete_author" id="alert_delete_author" value="1" onChange="change_alert_respondent(\'delete_author\', $(this));return false;"' . ($rowAlert['delete_author'] == 1 ? ' checked' : '') . '>';
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_author'].'</label>';
}
if ($isChecked) {
//$sql = sisplet_query("SELECT insert_uid, edit_uid FROM srv_anketa WHERE id='$this->anketa'");
//$row = mysqli_fetch_assoc($sql);
@ -5145,8 +5164,6 @@ class SurveyAdminSettings {
$row = SurveyInfo::getInstance()->getSurveyRow();
echo '<br/>';
if ($what == 'finish_author')
$db_field = 'alert_complete';
else if ($what == 'expire_author')
@ -5171,14 +5188,18 @@ class SurveyAdminSettings {
$checked = ($row1[$db_field] == '1') ? ' checked="checked" ' : '';
}
echo '<span class="alert_authors"><input type="checkbox" name="alert_'.$what.'_uid[]" value="' . $row['insert_uid'] . '" id="alert_'.$what.'_uid_' . $row['insert_uid'] . '"' . $checked . ' autocomplete="off"/>' . "\n\r";
echo '<label for="alert_'.$what.'_uid_' . $row['insert_uid'] . '" title="' . $rowAuthor['email'] . '">' . $rowAuthor['name'] . ' (' . $lang['author'] . ': '.$rowAuthor['email']. ')' . '</label>' . "\n\r";
echo '<div class="alert_authors">';
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 ' <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>' . "\n\r";
echo '</div>';
}
// polovimo avtorja pri ostalih obvestilih
else{
@ -5187,14 +5208,18 @@ class SurveyAdminSettings {
$sql1 = sisplet_query("SELECT *, uid AS id FROM srv_dostop WHERE ank_id='$this->anketa' AND uid='".$row['insert_uid']."'");
$row1 = mysqli_fetch_array($sql1);
echo '<span class="alert_authors"><input type="checkbox" name="alert_'.$what.'_uid[]" value="' . $row['insert_uid'] . '" id="alert_'.$what.'_uid_' . $row['insert_uid'] . '" checked="checked" disabled="disabled" autocomplete="off"/>' . "\n\r";
echo '<label for="alert_'.$what.'_uid_' . $row['insert_uid'] . '" title="' . $rowAuthor['email'] . '">' . $rowAuthor['name'] . ' (' . $lang['author'] . ': '.$rowAuthor['email']. ')' . '</label>' . "\n\r";
echo '<div class="alert_authors">';
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 ' <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>' . "\n\r";
echo '</div>';
}
@ -5205,14 +5230,17 @@ class SurveyAdminSettings {
if ($row1['id']) { // se zgodi da je prazno za metauserje
// avtor je vedno chekiran
$checked = ( $row1[$db_field] == '1') ? ' checked="checked"' : '';
echo '<span class="alert_authors"><input type="checkbox" name="alert_'.$what.'_uid[]" value="' . $row1['id'] . '" id="alert_'.$what.'_uid_' . $row1['id'] . '"' . $checked . ' autocomplete="off"/>' . "\n\r";
echo '<label for="alert_'.$what.'_uid_' . $row1['id'] . '" title="' . $row1['email'] . '">' . $row1['name'] . ' ('.$row1['email'].')</label>' . "\n\r";
if ($what == 'finish_author') {
echo '<div class="alert_authors">';
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 ' <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>' . "\n\r";
echo '</div>';
}
}
}

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

@ -517,7 +517,7 @@ class CrossRoad {
# NASTAVITVE
case 'nastavitve':
$layout_width = 'wide';
$layout_width = 'narrow';
break;
@ -534,7 +534,7 @@ class CrossRoad {
if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requestsall')
$layout_width = 'wide';
else
$layout_width = 'narrow';
$layout_width = 'narrow';
break;

6
lang/1.php
View File

@ -3607,7 +3607,9 @@ $lang = array (
"srv_alert_expire_days2" => " dni pred potekom ankete. Vrednost 0 pomeni, da bo obvestilo bo poslano isti dan.<br/>",
"srv_alert_expire_expire_at" => " Anketa poteče: ",
"srv_alert_expire_note_at" => " Obvestilo bo poslano: ",
"srv_alert_instruction1" => "<span class=\"red bold\">Navodila oblikovanja sporo&#269;il za obve&#353;&#269;anje!</span><br/><p class=\"bold\">Uporabite lahko naslednje spremenljivke iz baze:</p>",
"srv_alert_instruction1" => "Navodila za oblikovanje sporočil",
"srv_alert_instruction1a" => "Legenda spremenljivk iz baze",
"srv_alert_instruction1b" => "V sporočilu lahko uporabite tudi sistemske spremenljivke, ki jih trenutno ni v anketi",
"srv_alert_instruction2" => " [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime<br/> ",
"srv_alert_instruction_name" => " [NAME] => ime uporabnika (iz baze (CMS)) oziroma sistemska spremenljivka ime",
"srv_alert_instruction_survey" => "[SURVEY] => ime ankete",
@ -3622,7 +3624,7 @@ $lang = array (
"srv_alert_instruction_available" => "<p class=\"bold\">Sistemske spremenljivke, ki so v anketi &#382;e na voljo:</p>",
"srv_alert_instruction3" => "[SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL 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/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/> [DAYS] => &#353;tevilo dni nastavljeno v intervalu<br/><br/></p>",
"srv_alert_instruction5" => "<p> [SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete<br/><br/></p>",
"srv_alert_instruction5" => "[SURVEY] => ime ankete<br/> [DATE] => datum<br/> [SITE] => URL do ankete<br/> [URL] => URL do urejanja ankete",
"versions" => "Verzije",
"ip_browser_login" => "Prijava glede na IP in brskalnik:",
"select_user" => "Izberite Uporabnika",

4
lang/2.php
View File

@ -3577,7 +3577,9 @@ $lang = array (
"srv_alert_expire_days2" => "days before the survey expires. Value 0 means that the notification will be sent on the same day.<br/>",
"srv_alert_expire_expire_at" => " Survey expire: ",
"srv_alert_expire_note_at" => " Notification will be sent: ",
"srv_alert_instruction1" => "<span class=\"red bold\">Instructions for email notification design!</span><p class=\"bold\">You can use the following variables from the database:</p><p>",
"srv_alert_instruction1" => "Instructions for message formatting",
"srv_alert_instruction1a" => "Legend of database variables",
"srv_alert_instruction1b" => "You can also use system variables in the message which are currently not in the survey",
"srv_alert_instruction2" => " [NAME] => user name (from the database (CMS)) or system variable \"name\" <br/> ",
"srv_alert_instruction_name" => " [NAME] => user name (from the database (CMS)) or system variable \"name\"",
"srv_alert_instruction_survey" => "[SURVEY] => survey name",

2
public/css/admin_new.css
View File

@ -7731,7 +7731,7 @@ span.active-editors {
.alert_authors {
display: block;
text-indent: 30px;
text-indent: 12px;
}
.alert_textarea {

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

@ -89,7 +89,7 @@ span.active-editors {
}
.alert_authors {
display: block;
text-indent: 30px;
text-indent: 12px;
}
.alert_textarea {
border: 1px solid silver;