From 75160b12821f7f4299cce7f0b69c83c1502ae071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= Date: Mon, 27 May 2024 13:08:29 +0200 Subject: 2024-02-19 upstream --- .../survey/classes/class.SurveyStatusProfiles.php | 412 +++++++++++---------- 1 file changed, 220 insertions(+), 192 deletions(-) (limited to 'admin/survey/classes/class.SurveyStatusProfiles.php') diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php index 11946a3..1563ddd 100644 --- a/admin/survey/classes/class.SurveyStatusProfiles.php +++ b/admin/survey/classes/class.SurveyStatusProfiles.php @@ -7,7 +7,8 @@ */ session_start(); -DEFINE (STR_DLMT, "|"); +if (!defined(STR_DLMT)) define(STR_DLMT, "|"); + class SurveyStatusProfiles { @@ -133,16 +134,18 @@ class SurveyStatusProfiles } # če smo v vpogledu pohandlammo posebej - if (($_podstran == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') { + if (($_podstran == A_COLLECT_DATA && isset($_GET['m']) && $_GET['m'] == 'quick_edit') || (isset($_POST['podstran']) && $_POST['podstran'] == 'quick_edit')) { $_podstran = 'vpogled'; } + + self::$currentProfileId = SurveyUserSetting :: getInstance()->getSettings('default_status_profile_'.$_podstran); if (!self::$currentProfileId) { - #self::$currentProfileId = 2; self::$currentProfileId = self::$survayDefaultUstrezni; # je lahko 2 ali 3 } + # ustrezni je lahko samo če so kakšni ustrezni zapisi v bazi ob pogoju da pa neustrezni obstajajao if (self::$allValidCount == 0 && self::$allUserCount > 0) { if (self::$currentProfileId == 2 || self::$currentProfileId == 3 ) { @@ -153,16 +156,18 @@ class SurveyStatusProfiles # ce imamo nastavljen curent pid in profil z tem pid ne obstaja nastavomo na privzet profil if (self::$currentProfileId != 1) { + if (!isset(self::$profiles[self::$currentProfileId])) { self::$currentProfileId = 1; - } + } } # ce ne obstajajo podatki za cpid damo error if (!isset(self::$profiles[self::$currentProfileId])) { die("Profile data is missing!"); return false; - } else { + } + else { return true; } } @@ -186,7 +191,7 @@ class SurveyStatusProfiles static function DisplayProfile( $pid = null) { global $lang; - + if ($pid == null ) { $pid = self::$currentProfileId; } @@ -197,29 +202,46 @@ class SurveyStatusProfiles #vsebino shranimo v buffer ob_start(); - if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) { - echo '
'; + + echo '
✕
'; + + + if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) { + echo '
'; + echo '
'; } - echo '
✕
'; - echo '
'; + echo '
'; + + echo ' '; - echo '
'; + echo ' '; - + + echo '
'; + + // cover Div echo '
'; // div za shranjevanje novega profila - echo '
'.$lang['srv_missing_profile_name'].': '; - echo ''; + echo '
'; + + echo '
'; + + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + + echo '
'; + $button = new PopUpButton($lang['srv_save_profile']); echo $button -> setFloat('right') ->setButtonColor('orange') @@ -227,12 +249,26 @@ class SurveyStatusProfiles $button = new PopUpButton($lang['srv_cancel']); echo $button -> setFloat('right') -> addAction('onClick','statusProfileAction(\'newCancel\'); return false;'); + + echo '
'; + echo '
'; // div za preimenovanje - echo '
'.$lang['srv_missing_profile_name'].': '; - echo ''; + echo '
'; + + echo '
'; + + echo '
'; + echo ''; + echo ''; echo ''; + echo '
'; + echo '
'; + + echo '
'; + + $button = new PopUpButton($lang['srv_rename_profile_yes']); echo $button -> setFloat('right') ->setButtonColor('orange') @@ -242,20 +278,25 @@ class SurveyStatusProfiles echo $button -> setFloat('right') -> addAction('onClick','statusProfileAction(\'renameCancel\'); return false;'); echo '
'; + echo '
'; // div za brisanje - echo '
'.$lang['srv_missing_profile_delete_confirm'].': ' . self::$profiles[$pid]['name'] . '?'; - echo ''; + echo '
'; + + echo $lang['srv_missing_profile_delete_confirm'].': ' . self::$profiles[$pid]['name'] . '?'; + + echo ''; + + echo '
'; $button = new PopUpButton($lang['srv_delete_profile_yes']); - echo $button -> setFloat('right') - ->setButtonColor('orange') + echo $button -> setButtonColor('orange') -> addAction('onClick','statusProfileAction(\'deleteConfirm\'); return false;'); $button = new PopUpButton($lang['srv_cancel']); - echo $button -> setFloat('right') - -> addAction('onClick','statusProfileAction(\'deleteCancel\'); return false;'); + echo $button -> addAction('onClick','statusProfileAction(\'deleteCancel\'); return false;'); + echo '
'; echo '
'; $content = ob_get_clean(); @@ -263,44 +304,28 @@ class SurveyStatusProfiles #dodamo vsebino $popUp->setContent($content); - /* - if ($pid < 0) { #Imamo sejo, lahko poženemo samo kot sejo - $run_lbl = $lang['srv_run_as_session_profile']; - echo ''.$run_lbl.''; - } else { - # shrani - pozeni - $run_lbl = $lang['srv_run_profile']; - echo ''.$run_lbl.''; - $run_lbl = $lang['srv_run_as_session_profile']; - echo ''.$run_lbl.''; - - } - */ - $button = new PopUpButton($lang['srv_choose_profile']); - $button -> setFloat('right') - ->setButtonColor('orange') - -> addAction('onClick','statusProfileAction(\'choose\'); return false;'); + + # dodamo gumb Prekliči + $button = new PopUpCancelButton(); $popUp->addButton($button); #dodamo gumb shrani - if (self::$profiles[$pid]['system'] != 1 && $pid != -1) - { + if (self::$profiles[$pid]['system'] != 1 && $pid != -1){ $button = new PopUpButton($lang['srv_save_profile']); - $button -> setFloat('right') - -> addAction('onClick','statusProfileAction(\'save\'); return false;'); + $button -> addAction('onClick','statusProfileAction(\'save\'); return false;'); $popUp->addButton($button); } $button = new PopUpButton($lang['srv_new_profile_name']); - $button -> setFloat('right') - -> addAction('onClick','statusProfileAction(\'newName\'); return false;'); + $button -> addAction('onClick','statusProfileAction(\'newName\'); return false;'); $popUp->addButton($button); - - # dodamo gumb Prekliči - $button = new PopUpCancelButton(); - $button -> setFloat('right'); + + $button = new PopUpButton($lang['srv_choose_profile']); + $button ->setButtonColor('orange') + -> addAction('onClick','statusProfileAction(\'choose\'); return false;'); $popUp->addButton($button); + echo $popUp; } @@ -321,56 +346,50 @@ class SurveyStatusProfiles # preverimo kaere statuse disejblamo na podlagi izbire načina kreiranja datoteke (samo 5,6 / vsi satusi) list($collect_all_status) = mysqli_fetch_row(sisplet_query("SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'")); - echo ''; + + echo '
'; + // dodamo veljavne foreach (self::$appropriateStatus as $index) { - if ($cnt&1) { - echo '
'; - } - echo ''; - $cnt++; + echo ''; } + // dodamo neveljavne foreach (self::$unAppropriateStatus as $index) { - if ($cnt&1) - echo ''; - echo ''; - $cnt++; + echo ''; } + // dodamo null foreach (self::$unKnownStatus as $index) { - - if ($cnt&1) - echo ''; - echo ''; - $cnt++; + echo ''; } - echo '
'; - echo '
'; - echo '
'; - echo '
'; + echo '
'; #valid_units_wrap echo ''; - + $html_disabled = ''; + $css_disabled = ''; if ($disabled ) { $html_disabled = ' disabled="true"'; - $css_disabled = ' class="gray"'; + $css_disabled = ' disabled'; } @@ -379,19 +398,51 @@ class SurveyStatusProfiles // lurkerji # lurker = 0 - obveezno ni lurker, lurker = 1 - obvezno je lurker, lurker = 2 - je ali ni lurker - #echo '
'; - echo ''.$lang['srv_lurkers'].''; - echo ' '.$lang['no'].''; - echo ' '.$lang['srv_only_empty'].''; - echo ' '.$lang['srv_also'].''; - echo '
'; + #echo '
'; + + echo '
'; + echo '

'.$lang['srv_lurkers']; + echo '
'.$lang['srv_lurkers_subnote'].'

'; + + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + + echo '
'; + echo '
'; // testni vnosi # testni = 0 - obveezno ni testni, testni = 1 - obvezno je tesni, testni = 2 - je ali ni testni - echo '

'.$lang['srv_testni_vnos'].''; - echo ' '.$lang['no'].''; - echo ' '.$lang['srv_only_test'].''; - echo ' '.$lang['srv_also'].''; + + echo '
'; + echo '

'.$lang['srv_testni_vnos'].'

'; + + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + + echo '
'; + echo '
'; echo ''; @@ -401,10 +452,25 @@ class SurveyStatusProfiles echo '' . $lang['srv_usableResp_usable_unit'] . ''; // 2->uporabni, 1->delno uporabni, 0->neuporabni - echo ' '.$lang['srv_usableResp_unusable'].''; - echo ''.$lang['srv_usableResp_partusable'].''; - echo ''.$lang['srv_usableResp_usable'].''; + + echo '
'; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + echo '
'; + echo ''; + echo ''; + echo '
'; + + echo '
'; + echo '
'; echo ''; echo ''; @@ -418,15 +484,18 @@ class SurveyStatusProfiles $_sql_qry = sisplet_query($_sql_string); $_sql_row = mysqli_fetch_assoc($_sql_qry); - echo '
'; + echo '
'; + foreach ( self::$profiles as $key => $profile ) { if ($key != 1 || ($key == 1 && (int)$_sql_row['collect_all_status'] > 0 )) { - echo '
'; + echo '
'; echo $profile['name']; if($profile['id'] == $pid){ + echo '
'; + #dodamo gumb izbriši if (self::$profiles[$pid]['system'] != 1 ){ echo ' '."\n"; @@ -435,6 +504,8 @@ class SurveyStatusProfiles if (self::$profiles[$pid]['system'] != 1 && $pid != -1){ echo ' '."\n"; } + + echo '
'; } echo '
'; @@ -443,9 +514,7 @@ class SurveyStatusProfiles echo '
'; echo ''; } @@ -453,8 +522,11 @@ class SurveyStatusProfiles * */ static function ajax() { - $pid = $_POST['pid']; + + $pid = isset($_POST['pid']) ? $_POST['pid'] : null; + switch ($_GET['a']) { + case 'displayProfile' : if (isset($pid) && $pid != null) { @@ -462,34 +534,42 @@ class SurveyStatusProfiles } self :: DisplayProfile($pid); break; + case 'chooseProfile' : self :: setDefaultProfileId($pid); break; + case 'saveProfile': self :: saveProfile($pid); break; + case 'run_status_profile': self :: saveProfile($pid); self :: setDefaultProfileId($pid); break; + case 'save_status_profile': $new_id = self :: saveNewProfile($pid); self :: setDefaultProfileId($new_id); echo $new_id; break; + case 'deleteProfile': self :: DeleteProfile($pid); break; + case 'renameProfile': self :: renameProfile($pid); - break; - case 'showColectDataSetting': - self :: showColectDataSetting(); + + case 'showInvalidResponsesWarning': + self :: showInvalidResponsesWarning(); break; + case 'saveCollectDataSetting': self :: saveCollectDataSetting(); break; + case 'changeOnlyValidRadio': self :: changeOnlyValidRadio(); break; @@ -568,12 +648,14 @@ class SurveyStatusProfiles } static function setDefaultProfileId($pid=null, $podstran = null) { + # ce je seja, preverimo ali obstaja cene nardimo privzetega 1 if ($pid == -1) { if (!(isset($_SESSION['statusProfile']))) { $pid = null; } } + if ($podstran == null ) { if ( isset($_POST['meta_akcija']) ) { $_action = $_POST['meta_akcija']; @@ -596,7 +678,7 @@ class SurveyStatusProfiles } # če smo v vpogledu pohandlammo posebej - if (($_action == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') { + if (($_action == A_COLLECT_DATA && isset($_GET['m']) && $_GET['m'] == 'quick_edit') || $_POST['podstran'] == 'quick_edit') { $_action = 'vpogled'; } @@ -684,7 +766,7 @@ class SurveyStatusProfiles $mpds = self::getStatusArray((int)$pid); } $result = ''; - + $prefix = ''; if ($mpds) { $result .= ' AND last_status IN ('; foreach ( self::$appropriateStatus as $index) { @@ -727,11 +809,15 @@ class SurveyStatusProfiles return $result; } + static function getStatusArray($pid=null) { + if ($pid == null) { $pid = self::$currentProfileId; } - $mpd = self::$profiles[$pid]; + + $mpd = isset(self::$profiles[$pid]) ? self::$profiles[$pid] : null; + return $mpd; } @@ -953,96 +1039,35 @@ class SurveyStatusProfiles static function DisplayLink($hideAdvanced = true, $hideSeperator = false) { global $lang; + // profili statusov $statusProfiles = self :: getProfiles(); $izbranStatusProfile = self :: getCurentProfileId(); $css = ($izbranStatusProfile == SSP_DEFAULT_PROFILE ? ' gray' : ''); if ($hideAdvanced == false || $izbranStatusProfile != SSP_DEFAULT_PROFILE) { - if ($hideSeperator == false) { - echo '
  •  
    • '; - } + echo '
  • '; - echo '' . $lang['srv_statusi'] . ''; - echo '
    • '; - + echo ' ' . $lang['srv_statusi'] . ''; + echo ''; } } - public static function FileGeneratingSetting($hideAdvanced = true) { + static function showInvalidResponsesWarning() { global $lang, $admin_type; - - $_sql_string = "SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'"; - $_sql_qry = sisplet_query($_sql_string); - $_sql_row = mysqli_fetch_assoc($_sql_qry); - echo '
  •  
    • '; - echo '
  • '; - $css = ((int)$_sql_row['collect_all_status'] > 0 ? ' gray' : ''); - echo '' . $lang['srv_collect_data_setting_note'] . ''; - echo '
    • '; - - return; - } - - static function showColectDataSetting() { - global $lang, $admin_type; + echo '

    '.$lang['srv_invalid_units_warning_title'].'

    '; + echo '
    ✕
    '; - $_sql_string = "SELECT collect_all_status FROM srv_data_files WHERE sid = '".self::$sid."'"; - $_sql_qry = sisplet_query($_sql_string); - list($collect_all_status) = mysqli_fetch_row($_sql_qry); - - $str_qry_cnt_user = "SELECT count(*) FROM srv_user AS u WHERE u.ank_id = '".self::$sid."'"; - $_qry_cnt_user = sisplet_query($str_qry_cnt_user); - list($all_user_cnt) = mysqli_fetch_row($_qry_cnt_user); - #vsebino shranimo v buffer - $content = ''; - - # kadar imamo uporabnikov več kakor ONLY_VALID_LIMIT (5000) ne dovolimo nastaviti na vse statuse, zato dodamo obvestilo - # le admin lahko nastavi da generira tudi nad 5000 takrat nastavimo collect_all_status = 2 - if ($all_user_cnt > ONLY_VALID_LIMIT && (int)$admin_type > 1) - { - $content .= ''; - $content .= 'Anketa vsebuje več kakor '.ONLY_VALID_LIMIT.' respondentov, zato je dovoljen prikaz le ustreznih!'; - $content .= '

    '; - $content .= ''.$lang['srv_collect_data_setting_note'] . Help :: display('srv_collect_data_setting').''; - $content .= ''; - } - else - { - $content .= ''.$lang['srv_collect_data_setting_note'] . Help :: display('srv_collect_data_setting').''; - $content .= ''; - $content .= ' 0 ? '' : ' checked').' autocomplete="off"'.($admin_type <= 1 ? '' : ' disabled="disabled"').'>'; - $content .= $lang['srv_collect_all_status_0'].''; - } - $content .= '
    '; - $content .= '
    '; - $content .= ''.$lang['srv_deleteSurveyDataFile_link'].''; - - - $popUp = new PopUp(); - $popUp->setId('div_data_file'); - $popUp -> setHeaderText($lang['srv_file_settings']); - - #dodamo vsebino - $popUp -> setContent($content); - - #dodamo gumb izberi profil - $button = new PopUpButton($lang['srv_save_profile']); - $button -> setFloat('right') - -> setButtonColor('orange') - -> addAction('onClick','changeColectDataStatus(); return false;'); - $popUp->addButton($button); - - # dodamo gumb Prekliči - $button = new PopUpCancelButton(); - $button -> setFloat('right'); - $popUp->addButton($button); + echo '
    '; + echo '

    '.$lang['srv_invalid_units_warning_text'].'

    '; + echo '
    '; - echo $popUp; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; } @@ -1112,10 +1137,14 @@ class SurveyStatusProfiles $values = self::getProfilesValues(); $collect_all_status = $values['all_status']; + + $disabledValid = ''; + $disabledGray = ''; + $disabledAll = ''; + $disabledAllGray = ''; // če ni ustreznih uporabnikov je privzeto vsi if (self::$allValidCount == 0) { - $pid = 1; $disabledValid = ' disabled="disabled"'; $disabledGray = ' gray'; @@ -1133,36 +1162,35 @@ class SurveyStatusProfiles } } - echo ''; - echo ' '; + echo ''; if (self::$survayDefaultUstrezni == 2) { - echo ''; + echo ''; } else { - echo '