Popraveki modula volitve
This commit is contained in:
pero1203
parent
8d714b9ed3
commit
9c0b924f7c
@ -1843,13 +1843,15 @@ class SurveyAdmin
|
||||
echo '</li>';
|
||||
echo '<li class="space"></li>';
|
||||
|
||||
# parapodatki (browser, os, js...)
|
||||
echo '<li>';
|
||||
echo '<a class="no-img' . ($_GET['a'] == A_PARA_GRAPH ? ' active' : '') . '"'
|
||||
. ' href="index.php?anketa=' . $this->anketa . '&a=' . A_PARA_GRAPH . '" title="' . $lang['srv_metapodatki'] . '">';
|
||||
echo $lang['srv_metapodatki'] . '</a>';
|
||||
echo '</li>';
|
||||
echo '<li class="space"></li>';
|
||||
# parapodatki (browser, os, js...) - volitve imajo to ugasnjeno
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) {
|
||||
echo '<li>';
|
||||
echo '<a class="no-img' . ($_GET['a'] == A_PARA_GRAPH ? ' active' : '') . '"'
|
||||
. ' href="index.php?anketa=' . $this->anketa . '&a=' . A_PARA_GRAPH . '" title="' . $lang['srv_metapodatki'] . '">';
|
||||
echo $lang['srv_metapodatki'] . '</a>';
|
||||
echo '</li>';
|
||||
echo '<li class="space"></li>';
|
||||
}
|
||||
|
||||
# neodgovori in uporabnost enot
|
||||
//if ($admin_type === '0') {
|
||||
@ -1890,8 +1892,8 @@ class SurveyAdmin
|
||||
echo '<li class="space"></li>';
|
||||
}
|
||||
|
||||
# IP analiza lokacij - gorenje ima to ugasnjeno
|
||||
if (!Common::checkModule('gorenje')) {
|
||||
# IP analiza lokacij - gorenje ima to ugasnjeno, volitve imajo tudi ugasnjeno
|
||||
if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) {
|
||||
echo '<li>';
|
||||
echo '<a class="no-img' . ($_GET['a'] == A_GEOIP_LOCATION ? ' active' : '') . '"'
|
||||
. ' href="index.php?anketa=' . $this->anketa . '&a=' . A_GEOIP_LOCATION . '" title="' . $lang['srv_geoip_location'] . '">';
|
||||
@ -1944,17 +1946,21 @@ class SurveyAdmin
|
||||
}
|
||||
|
||||
# langStatistic
|
||||
#langStatistic naj bo viden samo če imamo različne jezike
|
||||
$qry_string = "SELECT language FROM srv_user WHERE ank_id = '" . $this->anketa . "' AND preview = '0' AND deleted='0' group by language";
|
||||
$qry = (sisplet_query($qry_string));
|
||||
$cntLang = mysqli_num_rows($qry);
|
||||
if ($cntLang > 1) {
|
||||
echo '<li>';
|
||||
echo '<a class="no-img' . ($_GET['a'] == 'langStatistic' ? ' active' : '') . '"'
|
||||
. ' href="index.php?anketa=' . $this->anketa . '&a=langStatistic" title="' . $lang['srv_languages_statistics'] . '">';
|
||||
echo $lang['srv_languages_statistics'] . '</a>';
|
||||
echo '</li>';
|
||||
echo '<li class="space"></li>';
|
||||
#langStatistic naj bo viden samo če imamo različne jezike in nimamo volitev
|
||||
if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) {
|
||||
|
||||
$qry_string = "SELECT language FROM srv_user WHERE ank_id = '" . $this->anketa . "' AND preview = '0' AND deleted='0' group by language";
|
||||
$qry = (sisplet_query($qry_string));
|
||||
$cntLang = mysqli_num_rows($qry);
|
||||
|
||||
if ($cntLang > 1) {
|
||||
echo '<li>';
|
||||
echo '<a class="no-img' . ($_GET['a'] == 'langStatistic' ? ' active' : '') . '"'
|
||||
. ' href="index.php?anketa=' . $this->anketa . '&a=langStatistic" title="' . $lang['srv_languages_statistics'] . '">';
|
||||
echo $lang['srv_languages_statistics'] . '</a>';
|
||||
echo '</li>';
|
||||
echo '<li class="space"></li>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</ul>';
|
||||
|
||||
@ -8705,7 +8705,7 @@ class SurveyAdminSettings {
|
||||
elseif ($_GET['a'] == 'voting'){
|
||||
|
||||
// Ce so vabila ze vklopljena ne pustimo vklopa
|
||||
if(!isset($modules['voting']) && SurveyInfo::getInstance()->checkSurveyModule('email')){
|
||||
if(isset($modules['voting']) || (!isset($modules['voting']) && SurveyInfo::getInstance()->checkSurveyModule('email'))){
|
||||
$disabled = ' disabled="disabled"';
|
||||
$css_disabled = ' gray';
|
||||
}
|
||||
@ -8713,6 +8713,7 @@ 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 '</fieldset>';
|
||||
|
||||
echo '<br />';
|
||||
|
||||
@ -1105,14 +1105,14 @@ class SurveyDataDisplay{
|
||||
echo ' <input type="checkbox" onclick="setDataView(\''.VAR_DATA.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_DATA] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="data" /><label for="data" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_data'].'</label>';
|
||||
echo '</li>';
|
||||
|
||||
// meta
|
||||
echo '<li>';
|
||||
echo ' <input type="checkbox" onclick="setDataView(\''.VAR_METAFULL.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_METAFULL] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="fullmeta" /><label for="fullmeta" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_meta'].'</label>';
|
||||
echo '</li>';
|
||||
|
||||
// Preverimo ce je vklopljen modul za volitve - potem nimamo identifikatorjev
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
|
||||
// Parapodatki
|
||||
echo '<li>';
|
||||
echo ' <input type="checkbox" onclick="setDataView(\''.VAR_METAFULL.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_METAFULL] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="fullmeta" /><label for="fullmeta" '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'>'.$lang['srv_displaydata_meta'].'</label>';
|
||||
echo '</li>';
|
||||
|
||||
// če imamo sistemske podatke katere moramo prikazovati ločeno - IDENTIFIKATORJI
|
||||
if(!isset(self::$_HEADERS['_settings']['count_system_data_variables']) || (isset(self::$_HEADERS['_settings']['count_system_data_variables']) && (int)self::$_HEADERS['_settings']['count_system_data_variables'] > 0)) {
|
||||
echo '<li>';
|
||||
@ -1125,12 +1125,12 @@ class SurveyDataDisplay{
|
||||
echo ' <label class="gray"><input type="checkbox" checked="checked" disabled="disabled" id="showsystem" />'.$lang['srv_displaydata_system_data'].'</label>';
|
||||
echo '</li>';
|
||||
}
|
||||
}
|
||||
|
||||
// datum
|
||||
echo '<li>';
|
||||
echo '<label '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'><input type="checkbox" onclick="setDataView(\''.VAR_SHOW_DATE.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_DATE] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="showdate" />'.$lang['srv_data_date'].'</label>';
|
||||
echo '</li>';
|
||||
// datum
|
||||
echo '<li>';
|
||||
echo '<label '.(self::$_VARS[VAR_SHOW_SYSTEM] ? ' class="gray"' : '').'><input type="checkbox" onclick="setDataView(\''.VAR_SHOW_DATE.'\',$(this).is(\':checked\'))" '.( self::$_VARS[VAR_SHOW_DATE] ? ' checked="checked"' : '').(self::$_VARS[VAR_SHOW_SYSTEM] ? ' disabled' : '').' id="showdate" />'.$lang['srv_data_date'].'</label>';
|
||||
echo '</li>';
|
||||
}
|
||||
|
||||
// zaporedna številka
|
||||
echo '<li>';
|
||||
@ -2752,7 +2752,7 @@ class SurveyDataDisplay{
|
||||
echo '</div>';
|
||||
|
||||
|
||||
//div na desni z metapodatki
|
||||
// Div na desni z metapodatki
|
||||
echo '<div id="quick_edit_meta">';
|
||||
self::displayQuickEditMeta();
|
||||
echo '</div>';
|
||||
@ -2993,21 +2993,25 @@ class SurveyDataDisplay{
|
||||
echo '<tr><td class="left">'.$lang['srv_recnum'].':</td>';
|
||||
echo '<td class="right">'.($rowu['recnum'] ? $rowu['recnum'] : ' ').'</td></tr>';
|
||||
|
||||
// browser
|
||||
echo '<tr><td class="left">'.$lang['browser'].':</td>';
|
||||
echo '<td class="right">'.($rowu['useragent'] ? $rowu['useragent'] : ' ').'</td></tr>';
|
||||
// Pri volitvah nimamo parapodatkov
|
||||
if (!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
|
||||
// javascript
|
||||
echo '<tr><td class="left">'.$lang['javascript'].':</td>';
|
||||
echo '<td class="right">'.(($rowu['javascript'] == 1) ? $lang['yes'] : $lang['no1']).'</td></tr>';
|
||||
// browser
|
||||
echo '<tr><td class="left">'.$lang['browser'].':</td>';
|
||||
echo '<td class="right">'.($rowu['useragent'] ? $rowu['useragent'] : ' ').'</td></tr>';
|
||||
|
||||
// jezik
|
||||
// Dobimo vse jezike za katere obstaja jezikovna datoteka
|
||||
include_once($site_path.'lang/jeziki.php');
|
||||
$jeziki = $lang_all_global['ime'];
|
||||
$jeziki['0'] = $lang['language'];
|
||||
echo '<tr><td class="left">'.$lang['lang'].':</td>';
|
||||
echo '<td class="right">'.$jeziki[$rowu['language']].'</td></tr>';
|
||||
// javascript
|
||||
echo '<tr><td class="left">'.$lang['javascript'].':</td>';
|
||||
echo '<td class="right">'.(($rowu['javascript'] == 1) ? $lang['yes'] : $lang['no1']).'</td></tr>';
|
||||
|
||||
// jezik
|
||||
// Dobimo vse jezike za katere obstaja jezikovna datoteka
|
||||
include_once($site_path.'lang/jeziki.php');
|
||||
$jeziki = $lang_all_global['ime'];
|
||||
$jeziki['0'] = $lang['language'];
|
||||
echo '<tr><td class="left">'.$lang['lang'].':</td>';
|
||||
echo '<td class="right">'.$jeziki[$rowu['language']].'</td></tr>';
|
||||
}
|
||||
|
||||
// status
|
||||
echo '<tr><td class="left">'.$lang['status'].':</td>';
|
||||
@ -3017,77 +3021,78 @@ class SurveyDataDisplay{
|
||||
echo '<tr><td class="left">'.$lang['srv_data_lurker'].':</td>';
|
||||
echo '<td class="right">'.(($rowu['lurker'] == 1) ? $lang['yes'] : $lang['no1']).'</td></tr>';
|
||||
|
||||
//referer
|
||||
echo '<tr><td class="left">'.$lang['referer'].':</td>';
|
||||
echo '<td class="right">'.($rowu['referer'] ? $rowu['referer'] : ' ').'</td></tr>';
|
||||
// Pri volitvah nimamo parapodatkov
|
||||
if (!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
|
||||
//email - samo forma
|
||||
if($rowa['survey_type'] == 1){
|
||||
echo '<tr><td class="left">'.$lang['email'].':</td>';
|
||||
echo '<td class="right">'.($rowu['email'] ? $rowu['email'] : ' ').'</td></tr>';
|
||||
}
|
||||
// referer
|
||||
echo '<tr><td class="left">'.$lang['referer'].':</td>';
|
||||
echo '<td class="right">'.($rowu['referer'] ? $rowu['referer'] : ' ').'</td></tr>';
|
||||
|
||||
// spreminjal
|
||||
$datetime = strtotime($rowu['time_insert']);
|
||||
$text = date("d.m.Y, H:i:s", $datetime);
|
||||
echo '<tr><td class="left">'.$lang['timeinsert'].':</td>';
|
||||
echo '<td class="right">'.$text.'</td></tr>';
|
||||
// email - samo forma
|
||||
if($rowa['survey_type'] == 1){
|
||||
echo '<tr><td class="left">'.$lang['email'].':</td>';
|
||||
echo '<td class="right">'.($rowu['email'] ? $rowu['email'] : ' ').'</td></tr>';
|
||||
}
|
||||
|
||||
$datetime = strtotime($rowu['time_edit']);
|
||||
$text = date("d.m.Y, H:i:s", $datetime);
|
||||
echo '<tr><td class="left">'.$lang['timeedit'].':</td>';
|
||||
echo '<td class="right">'.$text.'</td></tr>';
|
||||
// spreminjal
|
||||
$datetime = strtotime($rowu['time_insert']);
|
||||
$text = date("d.m.Y, H:i:s", $datetime);
|
||||
echo '<tr><td class="left">'.$lang['timeinsert'].':</td>';
|
||||
echo '<td class="right">'.$text.'</td></tr>';
|
||||
|
||||
// preberemo popravljanje po straneh
|
||||
$sqlG = sisplet_query("SELECT ug.time_edit, g.naslov FROM srv_user_grupa".self::$db_table." ug, srv_grupa g WHERE g.ank_id = '".self::$sid."' AND ug.usr_id = '".self::$usr_id."' AND g.id = ug.gru_id ORDER BY g.vrstni_red ASC");
|
||||
while($rowG = mysqli_fetch_array($sqlG)){
|
||||
$datetime = strtotime($rowu['time_edit']);
|
||||
$text = date("d.m.Y, H:i:s", $datetime);
|
||||
echo '<tr><td class="left">'.$lang['timeedit'].':</td>';
|
||||
echo '<td class="right">'.$text.'</td></tr>';
|
||||
|
||||
$datetime = strtotime($rowG['time_edit']);
|
||||
$text = date("d.m.Y, H:i:s", $datetime);
|
||||
// preberemo popravljanje po straneh
|
||||
$sqlG = sisplet_query("SELECT ug.time_edit, g.naslov FROM srv_user_grupa".self::$db_table." ug, srv_grupa g WHERE g.ank_id = '".self::$sid."' AND ug.usr_id = '".self::$usr_id."' AND g.id = ug.gru_id ORDER BY g.vrstni_red ASC");
|
||||
while($rowG = mysqli_fetch_array($sqlG)){
|
||||
|
||||
echo '<tr><td class="left">'.$rowG['naslov'].':</td>';
|
||||
echo '<td class="right">'.$text.'</td></tr>';
|
||||
}
|
||||
$datetime = strtotime($rowG['time_edit']);
|
||||
$text = date("d.m.Y, H:i:s", $datetime);
|
||||
|
||||
if ( $admin_type <= 1 /* && what more??? */ ) {
|
||||
echo '<tr><td class="left">'.$rowG['naslov'].':</td>';
|
||||
echo '<td class="right">'.$text.'</td></tr>';
|
||||
}
|
||||
|
||||
echo '<tr><td class="left">'.$lang['srv_sc_txt1'].':</td>';
|
||||
echo '<td class="right"><a href="#" onclick="sc_display(\''.self::$usr_id.'\'); return false;">'.$lang['srv_sc_txt2'].'</a></td></tr>';
|
||||
if ( $admin_type <= 1) {
|
||||
|
||||
}
|
||||
echo '<tr><td class="left">'.$lang['srv_sc_txt1'].':</td>';
|
||||
echo '<td class="right"><a href="#" onclick="sc_display(\''.self::$usr_id.'\'); return false;">'.$lang['srv_sc_txt2'].'</a></td></tr>';
|
||||
|
||||
# preberemo vklopljene module
|
||||
//potrebuje se za modul MAZA, da aplikacija izpolni te hidden inpute
|
||||
//rabi pa se to za povezavo respondenta med tebelama maza_app_users in srv_user
|
||||
if(SurveyInfo::checkSurveyModule('maza')){
|
||||
$maza_query = "SELECT mau.identifier, mau.deviceInfo, mau.tracking_log FROM maza_app_users as mau
|
||||
JOIN maza_srv_users AS msu ON mau.id = msu.maza_user_id
|
||||
JOIN srv_user AS su ON msu.srv_user_id = su.id
|
||||
WHERE su.id = '".self::$usr_id."';";
|
||||
}
|
||||
}
|
||||
|
||||
$sql = sisplet_query($maza_query, 'array');
|
||||
# preberemo vklopljene module
|
||||
//potrebuje se za modul MAZA, da aplikacija izpolni te hidden inpute
|
||||
//rabi pa se to za povezavo respondenta med tebelama maza_app_users in srv_user
|
||||
if(SurveyInfo::checkSurveyModule('maza')){
|
||||
$maza_query = "SELECT mau.identifier, mau.deviceInfo, mau.tracking_log FROM maza_app_users as mau
|
||||
JOIN maza_srv_users AS msu ON mau.id = msu.maza_user_id
|
||||
JOIN srv_user AS su ON msu.srv_user_id = su.id
|
||||
WHERE su.id = '".self::$usr_id."';";
|
||||
|
||||
//it is already there
|
||||
if(count($sql) > 0){
|
||||
//NextPin link
|
||||
echo '<tr><td class="left">'.$lang['srv_maza_nextpin_link'].':</td>';
|
||||
echo '<td class="right"><a href="http://traffic.ijs.si/NextPin/?user=1KAPanel_'.$sql[0]['identifier'].'">'
|
||||
. 'http://traffic.ijs.si/NextPin/?user=1KAPanel_'.$sql[0]['identifier'].'</a></td></tr>';
|
||||
//Device info
|
||||
echo '<tr><td class="left">'.$lang['srv_maza_device_info'].':</td>';
|
||||
echo '<td class="right">'.$sql[0]['deviceInfo'].'</td></tr>';
|
||||
//Tracking logs
|
||||
echo '<tr><td class="left">'.$lang['srv_maza_user_app_logs'].':</td>';
|
||||
echo '<td class="right">'.$sql[0]['tracking_log'].'</td></tr>';
|
||||
}
|
||||
}
|
||||
$sql = sisplet_query($maza_query, 'array');
|
||||
|
||||
//it is already there
|
||||
if(count($sql) > 0){
|
||||
//NextPin link
|
||||
echo '<tr><td class="left">'.$lang['srv_maza_nextpin_link'].':</td>';
|
||||
echo '<td class="right"><a href="http://traffic.ijs.si/NextPin/?user=1KAPanel_'.$sql[0]['identifier'].'">'
|
||||
. 'http://traffic.ijs.si/NextPin/?user=1KAPanel_'.$sql[0]['identifier'].'</a></td></tr>';
|
||||
//Device info
|
||||
echo '<tr><td class="left">'.$lang['srv_maza_device_info'].':</td>';
|
||||
echo '<td class="right">'.$sql[0]['deviceInfo'].'</td></tr>';
|
||||
//Tracking logs
|
||||
echo '<tr><td class="left">'.$lang['srv_maza_user_app_logs'].':</td>';
|
||||
echo '<td class="right">'.$sql[0]['tracking_log'].'</td></tr>';
|
||||
}
|
||||
}
|
||||
|
||||
echo '</table>';
|
||||
|
||||
|
||||
echo '<div id="survey-connect-disp" style="display:none"></div>';
|
||||
//echo '<script> sc_display(\''.self::$usr_id.'\'); </script>';
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1417,10 +1417,7 @@ class SurveyInvitationsNew {
|
||||
# Katera polja prikazujemo v seznamu prejemnikov
|
||||
$default_fields = array(
|
||||
'sent' => 1,
|
||||
'responded' => 1,
|
||||
'unsubscribed' => 1,
|
||||
'email' => 1,
|
||||
'password' => 1,
|
||||
'firstname' => 0,
|
||||
'lastname' => 0,
|
||||
'salutation' => 0,
|
||||
@ -1428,6 +1425,13 @@ class SurveyInvitationsNew {
|
||||
'custom' => 0,
|
||||
);
|
||||
|
||||
// Volitve nimajo nekaterih polj
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
$default_fields['responded'] = 1;
|
||||
$default_fields['unsubscribed'] = 1;
|
||||
$default_fields['password'] = 1;
|
||||
}
|
||||
|
||||
// Ce imamo modul 360 imamo tudi odnos
|
||||
if(SurveyInfo::getInstance()->checkSurveyModule('360_stopinj')){
|
||||
$default_fields['relation'] = 0;
|
||||
@ -1445,13 +1449,16 @@ class SurveyInvitationsNew {
|
||||
}
|
||||
}
|
||||
|
||||
# dodamo še ostala polja
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
// Dodamo še ostala polja
|
||||
// Volitve nimajo nekaterih polj
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
$fields['last_status'] = 1;
|
||||
$fields['date(date_expired)'] = 1;
|
||||
}
|
||||
|
||||
$sql_select_fields[] = 'i.last_status';
|
||||
$fields['date_inserted'] = 1;
|
||||
$fields['date(date_expired)'] = 1;
|
||||
|
||||
$fields['inserted_uid'] = 1;
|
||||
$sql_select_fields[] = 'i.inserted_uid';
|
||||
$sql_select_fields[] = 'i.date_inserted';
|
||||
@ -4563,30 +4570,53 @@ class SurveyInvitationsNew {
|
||||
echo '<table id="tbl_recipients_list">';
|
||||
|
||||
echo '<tr>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_sent'].'">'.$lang['srv_inv_recipients_sent'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_responded'].'">'.$lang['srv_inv_recipients_responded'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_unsubscribed'].'">'.$lang['srv_inv_recipients_unsubscribed'].'</th>';
|
||||
echo '<th class="tbl_inv_left">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_password'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_firstname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_lastname'].'</th>';
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
echo '<th>'.$lang['srv_inv_recipients_last_status'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_list_id'].'</th>';
|
||||
|
||||
// Pri volitvah ne prikazemo nekaterih stolpcev
|
||||
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_sent'].'">'.$lang['srv_inv_recipients_sent'].'</th>';
|
||||
echo '<th class="tbl_inv_left">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_firstname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_lastname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_list_id'].'</th>';
|
||||
}
|
||||
else{
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_sent'].'">'.$lang['srv_inv_recipients_sent'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_responded'].'">'.$lang['srv_inv_recipients_responded'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_unsubscribed'].'">'.$lang['srv_inv_recipients_unsubscribed'].'</th>';
|
||||
echo '<th class="tbl_inv_left">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_password'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_firstname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_lastname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_last_status'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_list_id'].'</th>';
|
||||
}
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
while ($sql_row = mysqli_fetch_assoc($sql_query)) {
|
||||
echo '<tr>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['sent'] == 1 ? 'email_sent.png' : 'email_open.png').'"></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/icons/icons/'.((int)$sql_row['responded'] == 1 ? 'star_on.png' : 'star_off.png').'"></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['unsubscribed'] == 1 ? 'opdedout_on.png' : 'opdedout_off.png').'"></td>';
|
||||
echo '<td class="tbl_inv_left">'.$sql_row['email'].'</td>';
|
||||
echo '<td>'.$sql_row['password'].'</td>';
|
||||
echo '<td>'.$sql_row['firstname'].'</td>';
|
||||
echo '<td>'.$sql_row['lastname'].'</td>';
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
echo '<td>'.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.'</td>';
|
||||
echo '<td>'.$lists[$sql_row['list_id']].'</td>';
|
||||
|
||||
// Pri volitvah ne prikazemo nekaterih stolpcev
|
||||
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['sent'] == 1 ? 'email_sent.png' : 'email_open.png').'"></td>';
|
||||
echo '<td class="tbl_inv_left">'.$sql_row['email'].'</td>';
|
||||
echo '<td>'.$sql_row['firstname'].'</td>';
|
||||
echo '<td>'.$sql_row['lastname'].'</td>';
|
||||
echo '<td>'.$lists[$sql_row['list_id']].'</td>';
|
||||
}
|
||||
else{
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['sent'] == 1 ? 'email_sent.png' : 'email_open.png').'"></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/icons/icons/'.((int)$sql_row['responded'] == 1 ? 'star_on.png' : 'star_off.png').'"></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['unsubscribed'] == 1 ? 'opdedout_on.png' : 'opdedout_off.png').'"></td>';
|
||||
echo '<td class="tbl_inv_left">'.$sql_row['email'].'</td>';
|
||||
echo '<td>'.$sql_row['password'].'</td>';
|
||||
echo '<td>'.$sql_row['firstname'].'</td>';
|
||||
echo '<td>'.$sql_row['lastname'].'</td>';
|
||||
echo '<td>'.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.'</td>';
|
||||
echo '<td>'.$lists[$sql_row['list_id']].'</td>';
|
||||
}
|
||||
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
@ -6571,12 +6601,20 @@ class SurveyInvitationsNew {
|
||||
echo ')';
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '<div style="margin-left:25px;margin-bottom:10px;">';
|
||||
|
||||
echo '<table id="tbl_respondentArchive">';
|
||||
echo '<th>'.$lang['srv_invitation_user_chronology_date'].'</th>';
|
||||
echo '<th>'.$lang['srv_invitation_user_chronology_status'].'</th>';
|
||||
|
||||
echo '<tr>';
|
||||
|
||||
echo '<th>'.$lang['srv_invitation_user_chronology_date'].'</th>';
|
||||
// Volitve nimajo nekaterih polj
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
echo '<th>'.$lang['srv_invitation_user_chronology_status'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_message_type'].'</th>';
|
||||
echo '</tr>';
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
$sql_string1 = "SELECT status, DATE_FORMAT(time_insert,'%d.%m.%Y, %T') AS status_time FROM srv_invitations_tracking WHERE res_id = '$_rec_id' AND inv_arch_id='".$sql_row['id']."' ORDER BY uniq ASC";
|
||||
$sql_query1 = sisplet_query($sql_string1);
|
||||
@ -6585,7 +6623,9 @@ class SurveyInvitationsNew {
|
||||
|
||||
echo '<td>'.$sql_row1['status_time'].'</td>';
|
||||
|
||||
echo '<td>('.$sql_row1['status'].') - '.$lang['srv_userstatus_'.$sql_row1['status']].'</td>';
|
||||
// Volitve nimajo nekaterih polj
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
echo '<td>('.$sql_row1['status'].') - '.$lang['srv_userstatus_'.$sql_row1['status']].'</td>';
|
||||
|
||||
echo '<td>';
|
||||
if ($sql_row['tip'] == '0')
|
||||
@ -6603,12 +6643,13 @@ class SurveyInvitationsNew {
|
||||
echo '</table>';
|
||||
echo '</div>';
|
||||
}
|
||||
echo '<div style="padding:5px 0px;">';
|
||||
echo '<span style="font-weight:600;">'.$lang['srv_inv_recipients_final_status'].'</span> ('.$lastStatus.') - '.$lang['srv_userstatus_'.$lastStatus];
|
||||
echo '</div>';
|
||||
|
||||
|
||||
|
||||
// Volitve nimajo nekaterih polj
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
echo '<div style="padding:5px 0px;">';
|
||||
echo '<span style="font-weight:600;">'.$lang['srv_inv_recipients_final_status'].'</span> ('.$lastStatus.') - '.$lang['srv_userstatus_'.$lastStatus];
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
echo '</div>'; // inv_select_mail_preview
|
||||
|
||||
@ -6731,33 +6772,55 @@ class SurveyInvitationsNew {
|
||||
echo '<table id="tbl_recipients_list">';
|
||||
|
||||
echo '<tr>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_sent'].'">'.$lang['srv_inv_recipients_sent'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_responded'].'">'.$lang['srv_inv_recipients_responded'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_unsubscribed'].'">'.$lang['srv_inv_recipients_unsubscribed'].'</th>';
|
||||
echo '<th class="tbl_inv_left">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_password'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_firstname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_lastname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_max_archive_status'].'</th>';
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
echo '<th>'.$lang['srv_inv_recipients_last_status'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_list_id'].'</th>';
|
||||
|
||||
// Pri volitvah ne prikazemo nekaterih stolpcev
|
||||
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_sent'].'">'.$lang['srv_inv_recipients_sent'].'</th>';
|
||||
echo '<th class="tbl_inv_left">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_firstname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_lastname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_list_id'].'</th>';
|
||||
}
|
||||
else{
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_sent'].'">'.$lang['srv_inv_recipients_sent'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_responded'].'">'.$lang['srv_inv_recipients_responded'].'</th>';
|
||||
echo '<th class="tbl_icon" title="'.$lang['srv_inv_recipients_unsubscribed'].'">'.$lang['srv_inv_recipients_unsubscribed'].'</th>';
|
||||
echo '<th class="tbl_inv_left">'.$lang['srv_inv_recipients_email'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_password'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_firstname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_lastname'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_max_archive_status'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_last_status'].'</th>';
|
||||
echo '<th>'.$lang['srv_inv_recipients_list_id'].'</th>';
|
||||
}
|
||||
|
||||
echo '</tr>';
|
||||
|
||||
while ($sql_row = mysqli_fetch_assoc($sql_query)) {
|
||||
echo '<tr>';
|
||||
echo '<td><span class="as_link" onclick="showRecipientTracking(\''.$sql_row['res_id'].'\'); return false;"><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['sent'] == 1 ? 'email_sent.png' : 'email_open.png').'"></span></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/icons/icons/'.((int)$sql_row['responded'] == 1 ? 'star_on.png' : 'star_off.png').'"></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['unsubscribed'] == 1 ? 'opdedout_on.png' : 'opdedout_off.png').'"></td>';
|
||||
echo '<td class="tbl_inv_left">'.$sql_row['email'].'</td>';
|
||||
echo '<td>'.$sql_row['password'].'</td>';
|
||||
echo '<td>'.$sql_row['firstname'].'</td>';
|
||||
echo '<td>'.$sql_row['lastname'].'</td>';
|
||||
$status = $arch_user_max_status[$sql_row['res_id']];
|
||||
echo '<td>'.$lang['srv_userstatus_'.$status].' ('.$status.')'.'</td>';
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting'))
|
||||
echo '<td>'.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.'</td>';
|
||||
echo '<td>'.$lists[$sql_row['list_id']].'</td>';
|
||||
|
||||
// Pri volitvah ne prikazemo nekaterih stolpcev
|
||||
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
echo '<td><span class="as_link" onclick="showRecipientTracking(\''.$sql_row['res_id'].'\'); return false;"><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['sent'] == 1 ? 'email_sent.png' : 'email_open.png').'"></span></td>';
|
||||
echo '<td class="tbl_inv_left">'.$sql_row['email'].'</td>';
|
||||
echo '<td>'.$sql_row['firstname'].'</td>';
|
||||
echo '<td>'.$sql_row['lastname'].'</td>';
|
||||
echo '<td>'.$lists[$sql_row['list_id']].'</td>';
|
||||
}
|
||||
else{
|
||||
echo '<td><span class="as_link" onclick="showRecipientTracking(\''.$sql_row['res_id'].'\'); return false;"><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['sent'] == 1 ? 'email_sent.png' : 'email_open.png').'"></span></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/icons/icons/'.((int)$sql_row['responded'] == 1 ? 'star_on.png' : 'star_off.png').'"></td>';
|
||||
echo '<td><img src="'.$site_url.'admin/survey/img_0/'.((int)$sql_row['unsubscribed'] == 1 ? 'opdedout_on.png' : 'opdedout_off.png').'"></td>';
|
||||
echo '<td class="tbl_inv_left">'.$sql_row['email'].'</td>';
|
||||
echo '<td>'.$sql_row['password'].'</td>';
|
||||
echo '<td>'.$sql_row['firstname'].'</td>';
|
||||
echo '<td>'.$sql_row['lastname'].'</td>';
|
||||
$status = $arch_user_max_status[$sql_row['res_id']];
|
||||
echo '<td>'.$lang['srv_userstatus_'.$status].' ('.$status.')'.'</td>';
|
||||
echo '<td>'.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.'</td>';
|
||||
echo '<td>'.$lists[$sql_row['list_id']].'</td>';
|
||||
}
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
|
||||
@ -7911,6 +7974,9 @@ class SurveyInvitationsNew {
|
||||
$voting_disabled = '';
|
||||
if(SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
$voting_disabled = ' disabled';
|
||||
|
||||
// Warning za volitve
|
||||
echo '<p class="red bold">'.$lang['srv_voting_warning'].'</p>';
|
||||
}
|
||||
|
||||
$individual = (int)$this->surveySettings['individual_invitation'];
|
||||
|
||||
@ -45,7 +45,13 @@ class SurveyVoting{
|
||||
echo '<fieldset><legend>'.$lang['settings'].'</legend>';
|
||||
|
||||
echo '<br>';
|
||||
echo ' <div class="buttonwrapper floatLeft"><a class="ovalbutton ovalbutton_orange" href="index.php?anketa='.$this->anketa.'&a='.A_INVITATIONS.'">'.$lang['srv_inv_nav_email'].'</a></div>';
|
||||
|
||||
echo $lang['srv_voting_edit1'].' <a href="index.php?anketa='.$this->anketa.'&a='.A_BRANCHING.'"><span class="bold">'.$lang['srv_voting_edit2'].'</span></a>.';
|
||||
|
||||
echo '<br><br>';
|
||||
|
||||
echo $lang['srv_voting_invitations1'].' <a href="index.php?anketa='.$this->anketa.'&a='.A_INVITATIONS.'"><span class="bold">'.$lang['srv_voting_invitations2'].'</span></a>.';
|
||||
|
||||
echo '<br><br>';
|
||||
|
||||
echo '</fieldset>';
|
||||
|
||||
@ -3110,6 +3110,12 @@ $lang = array (
|
||||
"srv_zakljucek_vprasalnika" => "Zaključek vprašalnika",
|
||||
"srv_kviz_konec_note" => "Č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_edit1" => "Vprašalnik urejate v zavihku",
|
||||
"srv_voting_edit2" => "Urejanje",
|
||||
"srv_voting_invitations1" => "Prejemnike vabil in sporočilo za vabilo k volitvam urejate v",
|
||||
"srv_voting_invitations2" => "vmesniku za pošiljanje vabil",
|
||||
"srv_voting_warning" => "Vabila so individualizirana zgolj za namen pošiljanja vabil.<br>Ko so vabila poslana, povezovanje med elektronskim naslovom in odgovori respondenta niso mogoči.",
|
||||
"srv_advanced_paradata" => "Napredni parapodatki",
|
||||
"srv_advanced_paradata_collect_post_time" => "Beleži \"post time\"",
|
||||
"srv_json_survey_export" => "JSON izvoz ankete",
|
||||
|
||||
@ -3082,6 +3082,12 @@ $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_edit1" => "You can edit the questionnaire in a tab",
|
||||
"srv_voting_edit2" => "Edit",
|
||||
"srv_voting_invitations1" => "Email invitations are edited in",
|
||||
"srv_voting_invitations2" => "Email invitations interface",
|
||||
"srv_voting_warning" => "Invitations are individualized for the purpose of sending invitations only. <br> Once the invitations are sent, the link between the e-mail address and the respondent's answers is not possible.",
|
||||
"srv_advanced_paradata" => "Advanced paradata",
|
||||
"srv_advanced_paradata_collect_post_time" => "Collect \"post time\"",
|
||||
"srv_json_survey_export" => "JSON survey export",
|
||||
|
||||
@ -19617,7 +19617,7 @@ and open the template in the editor.
|
||||
max-width: 700px;
|
||||
margin: 15px 10px 10px 5px;
|
||||
display: inline-block;
|
||||
padding: 10px 10px 10px 10px;
|
||||
padding: 0 10px 10px 10px;
|
||||
border: 1px solid #c8e3f8;
|
||||
background-color: #f5fafe;
|
||||
}
|
||||
|
||||
@ -136,7 +136,7 @@ and open the template in the editor.
|
||||
max-width:700px;
|
||||
margin: 15px 10px 10px 5px;
|
||||
display:inline-block;
|
||||
padding:10px 10px 10px 10px;
|
||||
padding: 0 10px 10px 10px;
|
||||
border: 1px solid $soft_blue;
|
||||
background-color: $soft_blue_very_lighten;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user