diff --git a/.gitignore b/.gitignore index 0d614e8dc..5af547d65 100644 --- a/.gitignore +++ b/.gitignore @@ -48,4 +48,5 @@ docker /composer.bat /composer.phar /composer.lock -/.favorites.json \ No newline at end of file +/.favorites.json +main/survey/skins/1045_test.css diff --git a/admin/survey/Branching.php b/admin/survey/Branching.php index 99ba3e8bb..afbef747a 100644 --- a/admin/survey/Branching.php +++ b/admin/survey/Branching.php @@ -5,22 +5,8 @@ class Branching { var $anketa; // trenutna anketa var $grupa; // trenutna grupa var $spremenljivka; // trenutna spremenljivka - //var $SurveyAdmin = null; // globalna spremenljivka za SurveyAdmin // SurveyAdmin se nikjer vec ne klice iz Branchinga - - //var $sidebar; // ali prikazemo sidebar: 0-ne, 1-vprasanja, 2-library // sidebara nimamo vec - //var $collapsed_content; // ali prikazujemo vseibno IFa (ce ne se poklice z ajaxom) // to se bo pa mogoce se uporabil, pri skrivanju ifov, zaenkrat se pa ne var $skin = 0; - - // teh nastavitev se ne uporablja vec - // tele nastavitve so tudi v BranchingAjax in jih je treba tudi tam popravit! - - //var $maxIfCount = 0; // koliko ifov je meja za prikaz. Če je 0 prikeže vse - //var $autoRecount = 0; // ce je vec kot 50 spremenljivk nimamo avtomatskega prestevilcevanja - - //var $new = true; // spremenljivka za nov nacin prikaza ifov (s checkboxi), ker bo zihr treba se nazaj dajat... (v Branching.php in branching.js) - //var $full_screen_edit = false; // Ali editiramo v full screen nacinu - var $expanded = false; // ali prikazujemo anketo razsirjeno (prikazan predogled vprasanja) ali skrceno (samo 1 vrstica za vprasanje) var $db_table = ''; @@ -34,7 +20,7 @@ class Branching { var $prevajanje = false; var $imageadded = array(); - //$imageadded[$spremenljivka] = false; + /** * @desc konstruktor @@ -146,44 +132,39 @@ class Branching { $gl = new Glasovanje($this->anketa); - //div z nastavitvami za glasovanje - echo '
'; - //$this->display_glasovanje_settings(); + // div z nastavitvami za glasovanje + echo '
'; + echo '
'; $gl->display_glasovanje_settings(); - echo '
'; + echo '
'; + echo '
'; echo '
'; - echo '
'; - - //$this->branching_struktura(); + echo '
'; $gl = new Glasovanje($this->anketa); $gl->vprasanja(); + echo '
'; // #branching - echo '
'; // #branching - - //$this->vprasanje_float_editing(); - echo '
'; + echo '
'; echo '
'; // #placeholder - - $this->toolbox(); } // Navadna anketa ali forma else{ + + Common::Init($this->anketa); + echo '
'; - echo '
'; - - Common::Init($this->anketa); + echo '
'; echo Common::checkStruktura(); $this->branching_struktura(); + echo '
'; - echo '
'; // #branching - - $this->vprasanje_float_editing(); + echo '
'; echo '
'; // #placeholder @@ -191,11 +172,11 @@ class Branching { } // forma in glasovanje - hitre nastavitve na desni - ce imamo odprto knjiznico ne prikazemo zaradi prekrivanja - if ( ($this->survey_type == 1 || $this->survey_type == 0) && ($row['toolbox'] < 3) ) { + if ( $this->survey_type == 1 || $this->survey_type == 0 ) { echo '
survey_type==0 ? ' class="glas_quick_settings"':'').'>'; - echo '
survey_type==0 ? ' class="glas_quick_settings"':'').'>'; + echo '
survey_type==0 ? ' class="glas_quick_settings"':'').'>'; $this->toolbox_settings(); - echo '
'; + echo '
'; echo '
'; } @@ -207,33 +188,9 @@ class Branching { } ?>'; - echo 'alert(document.getElementsByTagName("*").length);'; - echo '';*/ - } - function vprasanje_float_editing () { - - echo '
'; - - } - - /** - * prikaze zgornji toolbox z nastavitvami - * - */ - /*function toolbox_nastavitve () { - - $row = SurveyInfo::getInstance()->getSurveyRow(); - - echo '
=3?' class="library"':'').'>'; - $this->display_toolbox_nastavitve(); - echo '
'; - }*/ - /** * prikaze zgornji toolbox z nastavitvami * @@ -335,20 +292,20 @@ class Branching { * */ function toolbox () { - + $row = SurveyInfo::getInstance()->getSurveyRow(); - if($this->survey_type != 0) - $this->toolbox_basic2(); + echo '
'; + + $this->toolbox_basic2(); + + echo ''; - if ($row['toolbox'] >= 3) - $this->toolbox_library(); + // Predpregled tipa vprašanj + $this->getTipPreviewHtml(); + + echo '
'; - ?>anketa); @@ -369,17 +326,19 @@ class Branching { // Toolbox napredne nastavitve (prestevilci, dodaj prelome, debug...) if($this->survey_type > 1 && !SurveyInfo::getInstance()->checkSurveyModule('hierarhija') ){ - echo '
'; + echo '
'; - echo ''; + echo '
'.$lang['srv_advanced_settings_title'].'
'; $this->toolbox_add_advanced_settings(); echo '
'; + + echo '
'; } - echo '
survey_type==1?' class="forma"':'').($hierarhija ? ' class="toolbox-hierarhija"' : '').'>'; + echo '
'; if ($row['locked'] == 1) { @@ -387,74 +346,109 @@ class Branching { $d = new Dostop(); if(($hierarhija && SurveyInfo::getSurveyModules('hierarhija') == 2) || $d->checkDostopSub('lock') && ($admin_type != 0 && $admin_type != 1)){ echo '
'; - echo ''; + echo ' '; echo '
'; } else{ - //echo '

'; echo '
'; - echo ''; + echo ' '; echo '
'; } if(!$hierarhija) { - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_radio'].'
'; + echo '
'; + + echo '
'.$lang['srv_vprasanje_checkbox'].'
'; + echo '
'; } - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_multigrid'].'
'; + echo '
'; - if(!$hierarhija) - echo '

'; + echo '
'.$lang['srv_vprasanje_text'].'
'; + echo '
'; - echo '

'; + if(!$hierarhija){ + echo '
'.$lang['srv_vprasanje_number'].'
'; + echo '
'; + } + + echo '
'.$lang['srv_vprasanje_label'].'
'; + echo '
'; if(!$hierarhija) { - echo '
'; + echo '
'.$lang['srv_mobile_add_question'].''; $this->toolbox_add_advanced(); echo '
'; + + echo '
'; } + // Knjiznica + echo '
'.$lang['srv_library'].'
'; + echo '
'; + // normalna anketa if ($this->survey_type != 1){ // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); - echo '

'; - echo '

'; + echo '
'.$lang['srv_condition'].'
'; + echo '
'; + + echo '
'.$lang['srv_block_random_blocks'].'
'; + //echo '
'; } } else { if(!$hierarhija) { - echo '

'; - echo '

'; + echo '
'.$lang['srv_vprasanje_radio'].'
'; + echo '
'; + + echo '
'.$lang['srv_vprasanje_checkbox'].'
'; + echo '
'; } - echo '

'; - echo '

'; - - if(!$hierarhija) - echo '

'; + echo '
'.$lang['srv_vprasanje_multigrid'].'
'; + echo '
'; - echo '

'; + echo '
'.$lang['srv_vprasanje_text'].'
'; + echo '
'; + + if(!$hierarhija){ + echo '
'.$lang['srv_vprasanje_number'].'
'; + echo '
'; + } + + echo '
'.$lang['srv_vprasanje_label'].'
'; + echo '
'; if(!$hierarhija) { - echo '
'; + echo '
'.$lang['srv_mobile_add_question'].''; $this->toolbox_add_advanced(); echo '
'; + + echo '
'; } + // Knjiznica + echo '
'.$lang['srv_library'].'
'; + echo '
'; + // normalna anketa if ($this->survey_type != 1){ // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); - echo '

'; - echo '

'; + echo '
'.$lang['srv_condition'].'
'; + echo '
'; + + echo '
'.$lang['srv_block_random_blocks'].'
'; + //echo '
'; } } @@ -465,156 +459,139 @@ class Branching { * prikaze popup z vsemi tipi vprasanj * */ - function toolbox_add_advanced() { + function toolbox_add_advanced($popup=false) { global $lang; global $site_url; global $admin_type; global $global_user_id; - $spr = $_POST['spr']; - $if = $_POST['if']; - $endif = $_POST['endif']; - + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); - echo '
'; - echo '

'.$lang['srv_add_question_type'].' '.Help::display('srv_toolbox_add_advanced').'

'; - echo '

'.$lang['srv_new_question_text'].'

'; - - echo ''; - echo ''; - echo ''; - - echo '
'; - - echo '

'.$lang['srv_sklop_osnovna2'].'

'; - echo '
'; - - echo '

'.$lang['srv_vprasanje_tip_1'].'

'; - echo '

'.$lang['srv_vprasanje_tip_1'].' - '.$lang['srv_dropdown'].'

'; - echo '

'.$lang['srv_vprasanje_tip_2'].'

'; - - echo '
'; - echo '

'.$lang['srv_vprasanje_tables'].'

'; - echo '
'; - - echo '

'.$lang['srv_classic'].'

'; - echo '

'.$lang['srv_diferencial2'].'

'; - echo '

'.$lang['srv_table_dropdown'].'

'; - echo '

'.$lang['srv_double_grid'].'

'; - - echo '
'; - echo '

'.$lang['srv_sklop_posebna'].'

'; - echo '
'; - - echo '

'.$lang['srv_vprasanje_tip_5'].'

'; - - echo '

'.$lang['srv_vprasanje_tip_26'].'

'; - - echo '

'.$lang['srv_vprasanje_heatmap'].'

'; - - echo '

'.$lang['srv_vprasanje_tip_8'].'

'; - echo '

'.$lang['srv_vprasanje_tip_17'].'

'; - echo '

'.$lang['srv_vprasanje_tip_18'].'

'; + echo '
'; + // Naslov v oknu + echo '
'; + echo $lang['srv_add_question_type'].' '.Help::display('srv_toolbox_add_advanced'); + echo ''.$lang['srv_new_question_text'].''; echo '
'; - echo '
'; - echo '

'.$lang['srv_sklop_osnovna_vnos2'].'

'; - echo '
'; - echo '

'.$lang['srv_vprasanje_tip_7'].'

'; - echo '

'.$lang['srv_vprasanje_tip_21'].'

'; - echo '

'.$lang['srv_number_insert_1'].'

'; + // Vsebina okna + echo '
'; - echo '
'; - echo '

'.$lang['srv_sklop_tabele_ostale'].'

'; - echo '
'; + echo '
'; - echo '

'.$lang['srv_vprasanje_tip_16'].'

'; - echo '

'.$lang['srv_vprasanje_tip_20'].'

'; - echo '

'.$lang['srv_vprasanje_tip_19'].'

'; - echo '

'.$lang['srv_survey_table_multiple'].'

'; + echo '

'.$lang['srv_sklop_osnovna2'].'

'; + echo '

'.$lang['srv_vprasanje_tip_1'].'

'; + echo '

'.$lang['srv_vprasanje_tip_1'].' - '.$lang['srv_dropdown'].'

'; + echo '

'.$lang['srv_vprasanje_tip_2'].'

'; - echo '
'; - echo '

'.$lang['srv_standardni_vnosi'].'

'; - echo '
'; + echo '
'; - echo '

'.$lang['email'].'

'; - echo '

'.$lang['url'].'

'; - echo '

'.$lang['srv_tip_standard_993'].'

'; - echo '

'.$lang['srv_vprasanje_tip_long_21_7'].'

'; - echo '

'.$lang['srv_captcha_edit'].'

'; - echo '

'.$lang['srv_gdpr'].'

'; + + echo '
'; + echo '

'.$lang['srv_vprasanje_tables'].'

'; + + echo '

'.$lang['srv_classic'].'

'; + echo '

'.$lang['srv_diferencial2'].'

'; + echo '

'.$lang['srv_table_dropdown'].'

'; + echo '

'.$lang['srv_double_grid'].'

'; + + echo '
'; + + + echo '
'; + echo '

'.$lang['srv_sklop_posebna'].'

'; + + echo '

'.$lang['srv_vprasanje_tip_5'].'

'; + echo '

'.$lang['srv_vprasanje_tip_26'].'

'; + echo '

'.$lang['srv_vprasanje_heatmap'].'

'; + echo '

'.$lang['srv_vprasanje_tip_8'].'

'; + echo '

'.$lang['srv_vprasanje_tip_17'].'

'; + echo '

'.$lang['srv_vprasanje_tip_18'].'

'; echo '
'; - echo '
'; - if (($lang['id'] == '1' || $lang['id'] == '2') && ($site_url == 'https://www.1ka.si/' || strpos($site_url, 'localhost') !== false ) ) { + echo '
'; + echo '

'.$lang['srv_sklop_osnovna_vnos2'].'

'; - echo '

'.$lang['srv_demografija'].'

'; - echo '
'; + echo '

'.$lang['srv_vprasanje_tip_7'].'

'; + echo '

'.$lang['srv_vprasanje_tip_21'].'

'; + echo '

'.$lang['srv_number_insert_1'].'

'; - if ($lang['id'] == '1') { - echo '

'.$lang['srv_demografija_spol'].'

'; - echo '

'.$lang['srv_demografija_starost'].'

'; - echo '

'.$lang['srv_demografija_zakonski_stan'].'

'; - echo '

'.$lang['srv_demografija_status'].'

'; - echo '

'.$lang['srv_demografija_izobrazba'].'

'; - echo '

'.$lang['srv_demografija_lokacija'].'

'; - } + echo '
'; - if ($lang['id'] == '2') { - echo '

'.$lang['srv_demografija_spol'].'

'; - echo '

'.$lang['srv_demografija_starost'].'

'; - echo '

'.$lang['srv_demografija_zakonski_stan'].'

'; - echo '

'.$lang['srv_demografija_status'].'

'; - echo '

'.$lang['srv_demografija_izobrazba'].'

'; - echo '

'.$lang['srv_demografija_lokacija'].'

'; - } - } - echo '

'; - echo '

'; + echo '
'; + echo '

'.$lang['srv_sklop_tabele_ostale'].'

'; - echo '
'; - echo '

'.$lang['srv_advanced_features'].'

'; - echo '
'; + echo '

'.$lang['srv_vprasanje_tip_16'].'

'; + echo '

'.$lang['srv_vprasanje_tip_20'].'

'; + echo '

'.$lang['srv_vprasanje_tip_19'].'

'; + echo '

'.$lang['srv_survey_table_multiple'].'

'; + + echo '
'; + + + echo '
'; + echo '

'.$lang['srv_standardni_vnosi'].'

'; + + echo '

'.$lang['email'].'

'; + echo '

'.$lang['url'].'

'; + echo '

'.$lang['srv_tip_standard_993'].'

'; + echo '

'.$lang['srv_vprasanje_tip_long_21_7'].'

'; + echo '

'.$lang['srv_captcha_edit'].'

'; + echo '

'.$lang['srv_gdpr'].'

'; + + echo '
'; + + + echo '
'; + echo '

'.$lang['srv_advanced_features'].'

'; // Kalkulacija - echo '

'.$lang['srv_vprasanje_tip_22'].'

'; + echo '

'.$lang['srv_vprasanje_tip_22'].'

'; // Kvota - echo '

'.$lang['srv_vprasanje_tip_25'].'

'; + echo '

'.$lang['srv_vprasanje_tip_25'].'

'; // Loop - echo '

'.$lang['srv_zanka'].'

'; + echo '

'.$lang['srv_zanka'].'

'; // Signature - echo '

'.$lang['srv_signature_edit'].'

'; + echo '

'.$lang['srv_signature_edit'].'

'; // Chat (nagovor z gumbom za vklop chata) - ce je vklopljen modul chat if (SurveyInfo::getInstance()->checkSurveyModule('chat')){ - echo '

'.$lang['srv_vprasanje_tip_5_2'].'

'; + echo '

'.$lang['srv_vprasanje_tip_5_2'].'

'; } // Socialna omrezja if (SurveyInfo::getInstance()->checkSurveyModule('social_network')){ - echo '

'.$lang['srv_vprasanje_tip_9'].'

'; + echo '

'.$lang['srv_vprasanje_tip_9'].'

'; } elseif(!$userAccess->checkUserAccess($what='question_type_signature')){ - echo '

'.$lang['srv_vprasanje_tip_9'].'

'; + echo '

'.$lang['srv_vprasanje_tip_9'].'

'; } else{ - echo '

checkUserAccess($what='question_type_signature') ? 'class="user_access_locked"' : '').'"> '.$lang['srv_vprasanje_tip_9'].'

'; + echo '

checkUserAccess($what='question_type_signature') ? 'class="user_access_locked"' : '').'">'.$lang['srv_vprasanje_tip_9'].'

'; } echo '
'; - //echo ''.$lang['srv_zapri'].''; + echo '
'; + + + if($popup){ + echo '
'; + echo ' '; + echo '
'; + } + echo '
'; } @@ -629,142 +606,952 @@ class Branching { global $site_url; global $global_user_id; - echo '
'; - echo ''.$lang['srv_advanced_settings_title'].''; - - $row = SurveyInfo::getInstance()->getSurveyRow(); + $row = SurveyInfo::getInstance()->getSurveyRow(); # preverimo ali imamo ife. Če so, izpisujemo vse ikonce - $sql_select = "SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'"; - $sql_query = sisplet_query($sql_select); + $sql_query = sisplet_query("SELECT count(*) AS if_count FROM srv_branching WHERE element_if > 0 AND ank_id = '".$this->anketa."'"); $row_query = mysqli_fetch_array($sql_query); $has_if = (int)$row_query['if_count'] > 0 ? true : false; # ali prikazujemo vse ikonice ali samo "simpl" ikonice - $sql_select_fv = "SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'"; - $sql_query_fv = sisplet_query($sql_select_fv); + $sql_query_fv = sisplet_query("SELECT count(*) AS full_view FROM srv_user_setting_for_survey WHERE sid='".$this->anketa."' AND uid='".$global_user_id."' AND what='display_full_toolbox' AND value='1'"); $row_query_fv = mysqli_fetch_array($sql_query_fv); $full_view = (int)$row_query_fv['full_view'] == 1 ? true : false; $full_view = true; + + echo '
'; + + echo '
'.$lang['srv_advanced_settings_title'].'
'; + + + echo '
'; + // Razsiri / skrci if($this->survey_type > 1){ if($this->expanded) { - echo '

'; + echo '

'; echo ''; - echo ''; + echo ''; echo $lang['srv_expand_0']; echo ''; echo '

'; } else { - echo '

'; + echo '

'; echo ''; - echo ''; + echo ''; echo $lang['srv_expand_1']; echo ''; echo '

'; } } - if ($has_if == true/* && $full_view == true || ($has_if == true && $this->expanded == false)*/) { - echo '

'; - echo ''.$lang['srv_expand'].''."\n"; - echo ''.$lang['srv_collapse'].''."\n"; + /*if ($has_if == true) { + echo '

'; + echo ''.$lang['srv_expand'].''."\n"; + echo ''.$lang['srv_collapse'].''."\n"; echo '

'; - } + }*/ # find & replace if ($row['locked'] == 0) { - echo '

'; - echo ''.$lang['srv_find_replace_words'].''; + echo '

'; + echo ''.$lang['srv_find_replace_words'].''; echo '

'; } if ($row['locked'] == 0 && $full_view == true) { - echo '

'; - echo ''.$lang['srv_pagebreak_all'].' '."\n"; + echo '

'; + echo ''.$lang['srv_pagebreak_all'].' '."\n"; echo '

'; } # Hrošč je viden samo če imamo ife in razširjen pogled if ($row['locked'] == 0 && $full_view == true) { // if ($row['flat'] == 0) - echo '

'; - echo ''.$lang['srv_check_pogoji'].' '."\n"; + echo '

'; + echo ''.$lang['srv_check_pogoji'].' '."\n"; echo '

'; } if ($row['locked'] == 0 && $full_view == true) { - echo '

'; - echo ''.$lang['srv_grupe_recount_branching'].'' . Help :: display('srv_grupe_recount_branching') ."\n"; + echo '

'; + echo ''.$lang['srv_grupe_recount_branching'].'' . Help :: display('srv_grupe_recount_branching') ."\n"; echo '

'; } - - // Knjiznica na desni - if ($row['locked'] == 0) { - if($row['toolbox'] >= 3){ - echo '

'; - echo ''.$lang['srv_library_hide'].''; - echo '

'; - } - else{ - echo '

'; - echo ''.$lang['srv_library_show'].''; - echo '

'; - } - } echo '
'; - // prikaz blokov kot zavihke - /*echo '
'; - $sql = sisplet_query("SELECT i.* FROM srv_if i, srv_branching b WHERE i.tab='1' AND i.tip='1' AND i.id=b.element_if AND b.ank_id='$this->anketa' ORDER BY b.parent, b.vrstni_red"); - if (!$sql) echo mysqli_error($GLOBALS['connect_db']); - $i = 0; - while ($row = mysqli_fetch_array($sql)) { - if ($i++ != 0) echo ' | '; - $label = ($row['label'] == ''?$lang['srv_blok'].' ('.$row['number'].')':$row['label']); - echo '

'; - echo ''.$label.' '; - echo '

'; - } - echo '
';*/ - } - - /** - * prikaz knjiznice v toolboxu na levi strani - * - */ - function toolbox_library () { - global $lang; - - $row = SurveyInfo::getInstance()->getSurveyRow(); - - echo '
'; - - if ($row['locked'] == 1) { - - echo '

'; - echo ' '.$lang['srv_anketa_locked_1']; - echo '

'; - - } else { - - echo '
'; - $l = new Library(); - $l->display(); - echo '
'; - } echo '
'; - } + } + + /** + * preview + * + */ + private function getTipPreviewHtml(){ + global $lang; + global $global_user_id; + + + // Predpregled tipa vprašanj - prikazujemo samo kadar smo v urejanju ankete + if (!$this->anketa > 0) + return; + + if ( ($_GET['a'] != '' || !isset($_GET['anketa'])) && $_GET['a'] != 'branching' ) + return; + + + echo '
'; + + + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik + $userAccess = UserAccess::getInstance($global_user_id); + + // tip 9999 - IF + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_toolbox_if']; + echo '
'; + if(!$userAccess->checkUserAccess($what='if')){ + $userAccess->displayNoAccessText($what='if'); + } + echo '
'; + + // tip 9998 - Block + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_toolbox_block']; + echo '
'; + if(!$userAccess->checkUserAccess($what='block')){ + $userAccess->displayNoAccessText($what='block'); + } + echo '
'; + + // tip 9997 - Loop + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_toolbox_loop']; + echo '
'; + if(!$userAccess->checkUserAccess($what='loop')){ + $userAccess->displayNoAccessText($what='loop'); + } + echo '
'; + + + // tip 1_1 - radio + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 1_10 - gdpr + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_gdpr_intro_title'] . '

'; + echo '
' . $lang['srv_gdpr_intro'] . '.
'.$lang['srv_gdpr_intro4'].'
'; + echo '
' . $lang['srv_gdpr_intro_no'] . '
'; + echo '
' . $lang['srv_gdpr_intro_yes'] . '
'; + echo '
'; + echo '
'; + + // tip 1 - radio (horizontalno) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . ' ' . $lang['srv_tip_sample_t1_o1'] . ' ' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
'; + echo '
'; + + // tip 1_2 - radio (horizontalno - nova vrstica) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . ' ' . $lang['srv_tip_sample_t1_o2'] . ' ' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 1_5 - radio potrditev + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1_5'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 1_6 - select box + echo '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 1_8 - Drag-drop + echo '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + + echo '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 1_9 - custom radio picture + echo '
'; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + // star + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // thumb + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + //smiley + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // heart + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // flag + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + // user + echo '
'; + for ($i = 1; $i < 4; $i++) { + echo '
'; + } + echo '
'; + + echo '
'; + echo '
'; + + // tip 1_10 - Image HotSpot + echo '
'; + echo '
'; + echo '
' . $lang['srv_hotspot_preview_text_radio'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 1_11 - Vizualna anlaogna skala + echo '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + + echo '
'; + for ($i = 1; $i < 7; $i++) { + echo '
+ +
'; + } + echo '
'; + + echo '
'; + echo '
'; + + + // tip 2 - checkbox + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t2'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 2_1 - check(horizontalno) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t2'] . ' ' . $lang['srv_tip_sample_t2_o2'] . ' ' . $lang['srv_tip_sample_t2_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 2_2 - check (horizontalno - nova vrstica) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t2'] . '
'; + echo '
' . $lang['srv_tip_sample_t2_o1'] . ' ' . $lang['srv_tip_sample_t2_o2'] . ' ' . $lang['srv_tip_sample_t2_o3'] . '
'; + echo '
'; + echo '
'; + + // tip 2_8 - Drag-drop + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t1'] . '
'; + + echo '
'; + echo '
' . $lang['srv_tip_sample_t1_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t1_o3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 2_10 - Image HotSpot + echo '
'; + // echo '
Primer tipa vprašanj: label.
'; + //echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_hotspot_preview_text_checkbox'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 3 - select + echo '
'; + // echo '
Primer tipa vprašanj: select.
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21 - besedilo* + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_1 - cpatcha + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_1_o1'] . '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_2 - email + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
'.$lang['srv_tip_sample_t21_2_o1'].' ('.$lang['srv_email_example'].')
'; + echo '
'; + echo '
' . $lang['srv_email_example_txt'] . '
'; + echo '
'; + echo '
'; + + // tip 21_3 - url + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_3_o1'] . '
'; + echo '
(' . $lang['srv_url_example'] . ')
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_4 - upload + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_4_o1'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_5 - textbox box + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 21_6 - elektronski podpis + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_6'] . '
'; + echo '
'; + echo '
'; + echo '
'.$lang['srv_signature_clear'].'
'; + echo '
'; + echo ' '.$lang['srv_signature_name'].''; + echo ' '; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_signature')){ + $userAccess->displayNoAccessText($what='question_type_signature'); + } + echo '
'; + + // tip 21_7 - fotografija + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t21_7'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 5 - label + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t5'] . '
'; + echo '
'; + echo '
'; + + // tip 5_2 - nagovor za aktivacijo chata + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_chat_question_text'] . '
'; + echo '
'.$lang['srv_chat_turn_on'].'
'; + echo '
'; + echo '
'; + + // tip 26 - lokacija + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t26_1'] . '
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_location')){ + $userAccess->displayNoAccessText($what='question_type_location'); + } + echo '
'; + + // tip 26_2 - multi lokacija + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t26_2'] . '
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_location')){ + $userAccess->displayNoAccessText($what='question_type_location'); + } + echo '
'; + + // tip 26_1 - moja lokacija + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t26_1'] . '
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_location')){ + $userAccess->displayNoAccessText($what='question_type_location'); + } + echo '
'; + + // tip 6 - multigrid + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . ' ' . $lang['srv_tip_sample_t6_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_1 - multigrid (semanticni diferencial) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t61'] . ':
'; + echo '
 
123
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t61_v1x'] . '
' . $lang['srv_tip_sample_t61_v1y'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t61_v2x'] . '
' . $lang['srv_tip_sample_t61_v2y'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t61_v3x'] . '
' . $lang['srv_tip_sample_t61_v3y'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_2 - multigrid (dropdown) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_3 - multigrid (double grid) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_v1'] . '' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
 
' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . '' . $lang['srv_tip_sample_t6_o3'] . ' ' . $lang['srv_tip_sample_t6_o1'] . '' . $lang['srv_tip_sample_t6_o2'] . '' . $lang['srv_tip_sample_t6_o3'] . '
'; + echo '
'; + echo '
www.xxx.si
'; + echo '
'; + echo '
www.yyy.si
'; + echo '
'; + echo '
www.zzz.si
'; + echo '
'; + + echo '
'; + echo '
'; + + + // tip 6_4 - multigrid (one against another) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6_4'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_4_v1'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_4_v1'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_4_v3'] . '
' . $lang['srv_tip_sample_t6_4_vmes'] . '' . $lang['srv_tip_sample_t6_4_v2'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_5 - multigrid (max diff) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6_5'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_c1'] . '
 
' . $lang['srv_tip_sample_t6_5_c2'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v1'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v2'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v3'] . '
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t6_5_v4'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_6 - multigrid (select box) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6_6'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_6_v4'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_8 - multigrid (Tabela Da/Ne) + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t6_8_o1'] . '' . $lang['srv_tip_sample_t6_8_o2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_9 - Drag-drop + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + + echo '
'; + + echo '
' . $lang['srv_tip_sample_t6'] . '
'; + + echo '
'; + echo '


'; + echo '
' . $lang['srv_tip_sample_t6_v1'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_v2'] . '
'; + echo '
' . $lang['srv_tip_sample_t6_v3'] . '
'; + echo '
'; + + echo '
'; + echo '
'; + echo '
    '; + + echo '
  • +
    ' . $lang['srv_tip_sample_t6_o1'] . '
    +
  • '; //izpis "naslova" okvirja + echo '
  • +
    +
  • ' . "\n"; //izpis okvirja + echo '
  • +
    ' . $lang['srv_tip_sample_t6_o2'] . '
    +
  • '; //izpis "naslova" okvirja + echo '
  • +
    +
  • ' . "\n"; //izpis okvirja + echo '
  • +
    ' . $lang['srv_tip_sample_t6_o3'] . '
    +
  • '; //izpis "naslova" okvirja + echo '
  • +
    +
  • ' . "\n"; //izpis okvirja + echo '
'; + echo '
'; + echo '
'; + + echo '
'; + + echo '
'; + echo '
'; + + // tip 6_10 - Image HotSpot + echo '
'; + echo '
'; + echo '
' . $lang['srv_hotspot_preview_text_radio_grid'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 16 - multicheckbox + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t16_o1'] . '' . $lang['srv_tip_sample_t16_o2'] . ' ' . $lang['srv_tip_sample_t16_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t16_v3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 19 - multitext + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t19'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t19_o1'] . '' . $lang['srv_tip_sample_t19_o2'] . '' . $lang['srv_tip_sample_t19_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t19_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t19_v2'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 20 - multinumber + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t20_o1'] . '' . $lang['srv_tip_sample_t20_o2'] . '' . $lang['srv_tip_sample_t20_o3'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20_v1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20_v2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t20_v3'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 7 - number + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t7'] . '
'; + echo '
' . $lang['srv_tip_sample_t7_o1'] . '
'; + echo '
'; + echo '
'; + + // tip 7_2 - slider + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t7_2'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 8 - datum + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t8'] . '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 17 - Razvrščanje prestavljanje (default) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t17'] . '
'; + + echo '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t17_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t17_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t17_o3'] . '
'; + echo '
'; + + echo '
'; + echo '
1.
'; + echo '
2.
'; + echo '
3.
'; + echo '
'; + echo '
'; + + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_ranking')){ + $userAccess->displayNoAccessText($what='question_type_ranking'); + } + echo '
'; + + // tip 171 - Razvrščanje ostevilcevanje (design = 1) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t171'] . '
'; + + echo '
' . $lang['srv_tip_sample_t171_o1'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t171_o2'] . '
'; + echo '
'; + echo '
' . $lang['srv_tip_sample_t171_o3'] . '
'; + echo '
'; + + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_ranking')){ + $userAccess->displayNoAccessText($what='question_type_ranking'); + } + echo '
'; + + // tip 172 - Razvrščanje premikanje (design = 2) + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t172'] . '
'; + echo '
 
' . $lang['srv_tip_sample_t172_o1'] . '
 
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t172_o2'] . '
 
'; + echo '
'; + echo '
 
' . $lang['srv_tip_sample_t172_o3'] . '
 
'; + echo '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_ranking')){ + $userAccess->displayNoAccessText($what='question_type_ranking'); + } + echo '
'; + + // tip 18 - vsota + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t18'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o1'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o2'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o3'] . '
'; + echo '
' . $lang['srv_tip_sample_t18_o4'] . '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_sum')){ + $userAccess->displayNoAccessText($what='question_type_sum'); + } + echo '
'; + + // tip 24 - Kombinirana tabela + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_survey_table_multiple']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_multitable')){ + $userAccess->displayNoAccessText($what='question_type_multitable'); + } + echo '
'; + + // tip 27 - Heatmap + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_vprasanje_heatmap']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_heatmap')){ + $userAccess->displayNoAccessText($what='question_type_heatmap'); + } + echo '
'; + + // tip 22 - Kalkulacija + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_vprasanje_tip_long_22']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_calculation')){ + $userAccess->displayNoAccessText($what='question_type_calculation'); + } + echo '
'; + + // tip 25 - Kvota + echo '
'; + echo '' . $lang['srv_new_question_icon'] . ''; + echo '
'; + echo $lang['srv_vprasanje_tip_long_25']; + echo '
'; + if(!$userAccess->checkUserAccess($what='question_type_quota')){ + $userAccess->displayNoAccessText($what='question_type_quota'); + } + echo '
'; + + // tip 9 - SN-imena + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
'; + echo '
' . $lang['srv_add_field'] . '
'; + echo '
'; + if(!$userAccess->checkUserAccess($what='social_network')){ + $userAccess->displayNoAccessText($what='social_network'); + } + echo '
'; + + // tip 9_1 - SN-imena - fiksno st. polj + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 9_2 - SN-imena - 1 textbox + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
'; + echo '
'; + echo '
'; + + // tip 9_3 - SN-imena - vnos stevila polj + echo '
'; + echo '' . $lang['srv_new_question'] . ''; + echo '
'; + echo '
' . $lang['srv_tip_sample_t9'] . ':
'; + echo '
' . $lang['srv_design_count'] . ':
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + echo '
'; + + echo '
'; // tip_preview + } /** * hitre nastavitve - na dnu pri formi * */ - function toolbox_settings ($status1='none', $status2='none') { + function toolbox_settings ($status1='none') { global $lang; global $admin_type; @@ -776,7 +1563,7 @@ class Branching { $emailDiv = SurveySetting::getInstance()->getSurveyMiscSetting('srvtoolbox_form_email'); - //OBVESCANJE + // OBVESCANJE $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$this->anketa'"); if (!$sqlAlert) echo mysqli_error($GLOBALS['connect_db']); @@ -784,52 +1571,50 @@ class Branching { $rowAlert['finish_other'] == 1 || ($rowAlert['finish_other_emails'] && $rowAlert['finish_other'] != 0) ? $checked = true : $checked = false; - echo '

'; - $alertDiv == 1 ? $obvescanje = 0 : $obvescanje = 1; - echo ''; + $alertDiv == 1 ? $obvescanje = 0 : $obvescanje = 1; - $img = ($status1 == 'none') ? ' class="faicon icon-blue plus"' : ' class="faicon icon-blue minus"'; - echo ' '; - echo '' . $lang['srv_alert_link_form'] . ''; - echo '

'; + echo '
'; + echo ''.$lang['srv_alert_link_form'].''; + echo '
'; + - //echo '
'; $sas = new SurveyAdminSettings(); echo '
'; // avtor ankete oz osebe z dostopom - echo '

'; - echo ''; + echo '

'; + echo ''; + echo ' '; $sas->display_alert_label('finish_author',($rowAlert['finish_author'] == 1), true); - echo '

'; + echo ' '; + echo '
'; // posebej navedeni maili - echo '

'; + echo '
'; + echo ' '; - echo '

'; - echo ''; - echo ''; - echo '

'; + echo '
'; + echo ' '; + echo ' '; + echo '
'; - //respondent iz cms - /*echo '

'; - echo ''; - $sas->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1), true); - echo '

';*/ - - //respondent - echo '

'; - echo ''; - echo ''; - $sas->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1), true); - echo '

'; - - echo ''.$lang['srv_detail_settings'].''; echo '
'; - echo '
'; + // respondent + echo '
'; + echo ' '; + echo ' '; + $sas->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1), true); + echo ' '; + echo '
'; + + echo '
'; + echo ' '.$lang['srv_detail_settings'].''; + echo '
'; + + echo '
'; } /** @@ -847,28 +1632,28 @@ class Branching { echo '
'; if ($lang['id'] == '1') { - echo '

check_demografija_exists('XSPOL')?'checked':'').' value="XSPOL" id="XSPOL">

'; - echo '

check_demografija_exists('XSTAR2a4')?'checked':'').' value="XSTAR2a4" id="XSTAR2a4">

'; - echo '

check_demografija_exists('XZST1surs4')?'checked':'').' value="XZST1surs4" id="XZST1surs4">

'; + echo '

check_demografija_exists('XSPOL')?'checked':'').' value="XSPOL" id="XSPOL">

'; + echo '

check_demografija_exists('XSTAR2a4')?'checked':'').' value="XSTAR2a4" id="XSTAR2a4">

'; + echo '

check_demografija_exists('XZST1surs4')?'checked':'').' value="XZST1surs4" id="XZST1surs4">

'; echo '
'; - echo '

check_demografija_exists('XDS2a4')?'checked':'').' value="XDS2a4" id="XDS2a4">

'; - echo '

check_demografija_exists('XIZ1a2')?'checked':'').' value="XIZ1a2" id="XIZ1a2">

'; - echo '

check_demografija_exists('XLOKACREGk')?'checked':'').' value="XLOKACREGk" id="XLOKACREGk">

'; + echo '

check_demografija_exists('XDS2a4')?'checked':'').' value="XDS2a4" id="XDS2a4">

'; + echo '

check_demografija_exists('XIZ1a2')?'checked':'').' value="XIZ1a2" id="XIZ1a2">

'; + echo '

check_demografija_exists('XLOKACREGk')?'checked':'').' value="XLOKACREGk" id="XLOKACREGk">

'; //echo '

'; } if ($lang['id'] == '2') { - echo '

check_demografija_exists('XSEX')?'checked':'').' value="XSEX" id="XSEX">

'; - echo '

check_demografija_exists('XAGE')?'checked':'').' value="XAGE" id="XAGE">

'; - echo '

check_demografija_exists('XMRSTS')?'checked':'').' value="XMRSTS" id="XMRSTS">

'; + echo '

check_demografija_exists('XSEX')?'checked':'').' value="XSEX" id="XSEX">

'; + echo '

check_demografija_exists('XAGE')?'checked':'').' value="XAGE" id="XAGE">

'; + echo '

check_demografija_exists('XMRSTS')?'checked':'').' value="XMRSTS" id="XMRSTS">

'; echo '
'; - echo '

check_demografija_exists('XSTS')?'checked':'').' value="XSTS" id="XSTS">

'; - echo '

check_demografija_exists('XEDU')?'checked':'').' value="XEDU" id="XEDU">

'; - echo '

check_demografija_exists('XLOC')?'checked':'').' value="XLOC" id="XLOC">

'; //echo '

'; + echo '

check_demografija_exists('XSTS')?'checked':'').' value="XSTS" id="XSTS">

'; + echo '

check_demografija_exists('XEDU')?'checked':'').' value="XEDU" id="XEDU">

'; + echo '

check_demografija_exists('XLOC')?'checked':'').' value="XLOC" id="XLOC">

'; //echo '

'; } echo '
'; @@ -1004,11 +1789,14 @@ class Branching { // napis uvod na začetku echo '
  • '; - echo ''.$lang['srv_intro_page'].''; + echo '
    '; + echo '
    '.$lang['srv_intro_page'].'
    '; + echo '
    '; + echo '
    '; echo '
  • '; echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; // Ce imamo slucajno GDPR preduvod @@ -1025,7 +1813,7 @@ class Branching { echo ''; echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; } } @@ -1048,10 +1836,11 @@ class Branching { echo '
  • '; - echo '
    '.$lang['srv_new_survey_success2'].'
    '; + echo '
    '.$lang['srv_new_survey_success'].'
    '; - echo '
    '; - printf ($lang['srv_new_survey_success3'], 'index.php?anketa='.$this->anketa.'&a=branching&change_mode=1&what=toolbox&value=3'); + echo '
    '; + echo ' '; + echo ' '; echo '
    '; MobileSurveyAdmin::displayNoQuestions($this->anketa); @@ -1064,7 +1853,7 @@ class Branching { if ($this->survey_type != 1) { echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; $first = $this->find_first_spr(); @@ -1072,19 +1861,22 @@ class Branching { // Zaenkrat imamo vedno isti text za strani if ($first > 0){ - /*$gr = $this->getGrupa4Spremenljivka($first);*/ $gr = $this->getGrupa4Spremenljivka($first); $naslov = $lang['srv_stran'].' '.$gr['vrstni_red']; } else $naslov = $lang['srv_stran'].' 1'; - echo ''.$naslov.''; + echo '
    '; + echo '
    '.$naslov.'
    '; + echo '
    '; + echo '
    '; + echo ''; } echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; } @@ -1098,11 +1890,14 @@ class Branching { // napis zakljucek prikazemo tukaj in ne za zadnjo spremenljivko da je lepse echo '
  • '; - echo ''.$lang['srv_end_page'].''; + echo '
    '; + echo '
    '.$lang['srv_end_page'].'
    '; + echo '
    '; + echo '
    '; echo '
  • '; echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; echo '
  • '; @@ -1165,18 +1960,17 @@ class Branching { global $lang; $row = SurveyInfo::getInstance()->getSurveyRow(); - #$this->survey_type = SurveyAdmin::getSurvey_type($this->anketa); $this->survey_type = SurveyInfo::getInstance()->getSurveyColumn("survey_type"); if ($row['flat'] == 0) - $zamik = ( $this->level($spremenljivka,0) > 0 ? ' style="padding-left:'.(10+$this->level($spremenljivka,0)*20).'px"' : '' ); + $zamik = ( $this->level($spremenljivka,0) > 0 ? ' style="padding-left:'.($this->level($spremenljivka,0)*32).'px"' : '' ); else $zamik = ''; $row = Cache::srv_spremenljivka($spremenljivka); $row1 = Cache::srv_branching($spremenljivka, 0); - echo '
  • '; + echo '
  • '; if ($this->expanded) { $this->vprasanje($spremenljivka); } else { @@ -1184,76 +1978,75 @@ class Branching { } echo '
  • '; - //echo '
  • '; if ($this->pagebreak($spremenljivka)) { + $gr = $this->getGrupa4Spremenljivka($this->find_next_spr($spremenljivka)); + if ($gr['id'] > 0) { echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; // ++ zadnji pagebreak prikazan izven ifa // // ce je spremenljivka zadnja v IFu, ne prikazemo PB, ker ga bomo za ENDIFom $rows = Cache::srv_branching($spremenljivka, 0); if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) { - echo '
  • '; - //echo ''.$gr['naslov'].''; - echo ''.$lang['srv_stran'].' '.$gr['vrstni_red'].''; + + echo '
  • '; + echo '
    '; + echo '
    '.$lang['srv_stran'].' '.$gr['vrstni_red'].'
    '; + echo '
    '.$lang['srv_rem_pagebreak'].'
    '; + echo '
    '; + echo '
    '; echo '
  • '; + echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; } - // -- zadnji pagebreak prikazan izven ifa // - } elseif($this->survey_type != 1) { + + } + // -- zadnji pagebreak prikazan izven ifa // + elseif($this->survey_type != 1) { echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; - - /*echo '
  • '; - echo ''.$lang['srv_end_label'].''; - echo '
  • '; - - echo '
  • '; - echo ''; - echo '
  • ';*/ } - } elseif ($spremenljivka == $this->find_last_spr() && $this->survey_type != 1) { // zadnja spremenljivka - zakljucek + } + elseif ($spremenljivka == $this->find_last_spr() && $this->survey_type != 1) { // zadnja spremenljivka - zakljucek echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; - /*echo '
  • '; - echo ''.$lang['srv_end_label'].''; - echo '
  • '; - - echo '
  • '; - echo ''; - echo '
  • ';*/ - - } elseif ($this->survey_type != 1) { //pri formi ne dovolimo dodajanja page-breakov + } + // pri formi ne dovolimo dodajanja page-breakov + elseif ($this->survey_type != 1) { // tuki pustimo, da se PB lahko dodaja za spremenljivko in za ifom (pol se prikaze za ifom) // -- v zadnji spremenljivki za ifom ne prikazemo dodajanja $rows = Cache::srv_branching($spremenljivka, 0); if ( $this->find_last_in_if($rows['parent']) != $spremenljivka ) { echo '
  • '; - echo ''; + echo '
    '; + echo '
    '.$lang['srv_add_pagebreak'].'
    '; + echo '
    '; + echo '
    '; echo '
  • '; - } else { // zadnji spremenljivki v ifu izpisemo PB izven ifa (da je bolj pregledno in lepse) + } + // zadnji spremenljivki v ifu izpisemo PB izven ifa (da je bolj pregledno in lepse) + else { echo '
  • '; - echo ''; + echo '
    '; echo '
  • '; } - } elseif ($this->survey_type == 1) { // forma + } + // forma + elseif ($this->survey_type == 1) { echo '
  • '; echo '
  • '; } - - //echo ''; - } function display_if_label($if) { @@ -1267,7 +2060,7 @@ class Branching { if ($rowb['tip'] == 0) { $this->conditions_display($if); } elseif ($rowb['tip'] == 1) { - echo 'BLOCK ('.$rowb['number'].')'.($rowb['enabled']==2?' FALSE ':'').($rowb['label']!=''?' ( '.$rowb['label'].' )':'').''; + echo 'BLOCK ('.$rowb['number'].')'.($rowb['enabled']==2?' FALSE ':'').($rowb['label']!=''?' ( '.$rowb['label'].' )':'').''; } elseif ($rowb['tip'] == 2) { $this->loop_display($if); } @@ -1284,7 +2077,7 @@ class Branching { $rowb = Cache::srv_if($if); if ($row['flat'] == 0) - $zamik = ( $this->level(0,$if) > 0 ? ' style="padding-left:'.(10+$this->level(0,$if)*20).'px"' : '' ); + $zamik = ( $this->level(0,$if) > 0 ? ' style="padding-left:'.($this->level(0,$if)*32).'px"' : '' ); else $zamik = ''; @@ -1293,7 +2086,7 @@ class Branching { // plusminus if ($row['flat'] == 0) - echo ''; + echo ''; $this->display_if_label($if); @@ -1324,11 +2117,16 @@ class Branching { if ($gr['id'] > 0) { - echo '
  • '; - echo ''; + echo '
  • '; + echo '
    '; echo '
  • '; - echo '
  • '; - echo ''.$lang['srv_stran'].' '.$gr['vrstni_red'].''; + + echo '
  • '; + echo '
    '; + echo '
    '.$lang['srv_stran'].' '.$gr['vrstni_red'].'
    '; + echo '
    '.$lang['srv_rem_pagebreak'].'
    '; + echo '
    '; + echo '
    '; echo '
  • '; } @@ -1337,9 +2135,13 @@ class Branching { // zadnji spremenljivki v ifu, tudi dodamo PB izven pagebreaka (da se doda, tam kjer se potem prikaže) if ($rows['pagebreak'] == 0 AND (mysqli_num_rows($sqle)>0 || $rowi['parent']==0) ) { echo '
  • '; - echo ''; + echo '
    '; + echo '
    '.$lang['srv_add_pagebreak'].'
    '; + echo '
    '; + echo '
    '; echo '
  • '; - } else { + } + else { echo '
  • '; echo '
  • '; } @@ -1355,8 +2157,8 @@ class Branching { $rowb = Cache::srv_if($if); if ($row['flat'] == 0) { - $zamik = ($this->level(0, $if) > 0 ? ' style="padding-left:' . (10 + $this->level(0, $if) * 20) . 'px"' : ''); - $zaklepaj = ($this->level(0, $if) > 0 ? 'margin-left:-' . (10 + $this->level(0, $if) * 20) . 'px;width:' . (15 + $this->level(0, $if) * 20) . 'px;' : ''); + $zamik = ($this->level(0, $if) > 0 ? ' style="padding-left:' . ($this->level(0, $if) * 32) . 'px"' : ''); + $zaklepaj = ($this->level(0, $if) > 0 ? 'margin-left:-' . ($this->level(0, $if) * 32) . 'px;width:' . ($this->level(0, $if) * 32) . 'px;' : ''); } else { $zamik = ''; @@ -1371,7 +2173,7 @@ class Branching { } echo '
  • '; - echo ''.($rowb['tip']==0?'ENDIF':($rowb['tip']==1?'ENDBLOCK':'ENDLOOP')).' ('.$rowb['number'].')'."\n\r"; + echo ''.($rowb['tip']==0?'ENDIF':($rowb['tip']==1?'ENDBLOCK':'ENDLOOP')).' ('.$rowb['number'].')'."\n\r"; // Dodajanje komentarjev na if/blok if ($this->displayKomentarji !== false) { @@ -1408,15 +2210,15 @@ class Branching { // Kvota if($tip == 25){ $SQ = new SurveyQuotas($this->anketa); - echo '('.$variable.') '.$SQ->quota_display(-$spremenljivka).' ( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )'; + echo '('.$variable.') '.$SQ->quota_display(-$spremenljivka).' ('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')'; } // Kalkulacija else if($tip == 22){ - echo '('.$variable.') '.$this->calculations_display(-$spremenljivka).' ( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )'; + echo '('.$variable.') '.$this->calculations_display(-$spremenljivka).' ('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')'; } // Navadne spremenljivke else{ - echo '('.$variable.') '.$spanred.skrajsaj(strip_tags($naslov), 80).($spanred!=''?'':'').' ( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )'; + echo '('.$variable.') '.$spanred.skrajsaj(strip_tags($naslov), 80).($spanred!=''?'':'').' ('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')'; } } @@ -1482,13 +2284,15 @@ class Branching { $string = ''; // statusi: reminder, timer, in še kaj if ($row['sistem'] == 1) - $string = $string . $lang['srv_system_text'] . ' | '; + $string .= ''.$lang['srv_system_text'].''; if ($row['visible'] == 0) - $string .= $lang['srv_hidden_text'] . ' | '; + $string .= ''.$lang['srv_hidden_text'].''; if ($row['dostop'] != 4) { - $string = $string . $lang['srv_visible_dostop'].' '; + + $string .= ''.$lang['srv_visible_dostop'].' '; + switch ($row['dostop']) { case 3: $string .= strtolower($lang['see_registered']); break; @@ -1499,65 +2303,62 @@ class Branching { case 0; $string .= strtolower($lang['see_admin']); break; } - $string .= ' | '; + $string .= ''; } if ($row['reminder'] > 0) { if ($row['reminder'] == 1) { - // echo ''.$lang['srv_reminder_soft'].''; - $string = $string . $lang['srv_reminder_soft']; - } else { - // echo ''.$lang['srv_reminder_hard'].''; - $string = $string . $lang['srv_reminder_hard']; + $string .= ''.$lang['srv_reminder_soft'].''; + } + else { + $string .= ''.$lang['srv_reminder_hard'].''; } - $string = $string . ' | '; } $sqlv = sisplet_query("SELECT spr_id, if_id FROM srv_validation WHERE spr_id = '$spremenljivka'"); if (mysqli_num_rows($sqlv) > 0) { - $string = $string . $lang['srv_validation']; - $string = $string . ' | '; + $string .= ''.$lang['srv_validation'].''; } if ($row['timer'] > 0) { - $string = $string . $lang['srv_timer_on_time']; - $string = $string . (substr(bcdiv($row['timer'], 60), 0, 4)) . '' . $lang['srv_minutes'] . ' '; - $string = $string . (bcmod($row['timer'], 60)) . '' . $lang['srv_seconds'] . ''; - $string = $string . ' | '; + $string .= ''.$lang['srv_timer_on_time']; + $string .= (substr(bcdiv($row['timer'], 60), 0, 4)) . '' . $lang['srv_minutes'] . ' '; + $string .= (bcmod($row['timer'], 60)) . '' . $lang['srv_seconds'] . ''; + $string .= ''; } //izrišemo še ostale statuse: statistika, orientacija, sortiranje if ($row['tip'] <= 3 && $row['stat'] && $this->survey_type != 0) { - $string = $string . $lang['srv_stat_on'] . ' | '; + $string .= ''.$lang['srv_stat_on'].''; } // Status orentacije - navadna vprasanja if((in_array($row['tip'], array('1', '2', '21', '7', '8')) && $row['orientation'] != '1') || ($row['tip'] == '3' && $row['orientation'] == '1')){ - $string .= $this->getVprasanjeOrientationString($row['tip'], $row['orientation']) . ' | '; + $string .= ''.$this->getVprasanjeOrientationString($row['tip'], $row['orientation']) . ''; } // Status orentacije - tabele elseif(in_array($row['tip'], array('6', '16')) && $row['enota'] != '0'){ - $string .= $this->getVprasanjeOrientationString($row['tip'], $row['enota']) . ' | '; + $string .= ''.$this->getVprasanjeOrientationString($row['tip'], $row['enota']) . ''; } if ($row['tip'] == 1 && $row['hidden_default'] == 1) { - $string = $string . $lang['srv_potrditev'] . ' | '; + $string .= ''.$lang['srv_potrditev'].''; } if ($row['random']) { $arrayRandomText = array ( - 0 => $lang['srv_random_off'], - 1 => $lang['srv_random_on'], - 2 => $lang['srv_sort_asc'], - 3 => $lang['srv_sort_desc'] + 0 => $lang['srv_random_off'], + 1 => $lang['srv_random_on'], + 2 => $lang['srv_sort_asc'], + 3 => $lang['srv_sort_desc'] ); - $string = $string . $arrayRandomText[$row['random']] . ' | '; + $string .= ''.$arrayRandomText[$row['random']].''; } //skriti checkboxi if ($row['checkboxhide'] != 0) - $string = $string . $lang['srv_checkboxhide_disabled'] . ' | '; + $string .= ''.$lang['srv_checkboxhide_disabled'].''; // Kljucavnica ce je vprasanje zaklenjeno if($question_locked){ @@ -1565,22 +2366,20 @@ class Branching { } // Ce je zaklenjeno ampak ga lahko ureja ker je admin ali avtor elseif($row['locked']){ - $string = $string . $lang['srv_locked_text'] . ' | '; + $string .= ''.$lang['srv_locked_text'].''; } // Ce je onemogoceno vprasanje $disabled_vprasanje = $spremenljivkaParams->get('disabled_vprasanje') ? $spremenljivkaParams->get('disabled_vprasanje') : 0; if($disabled_vprasanje){ - $string = $string . $lang['srv_disabled_text'] . ' | '; + $string .= ''.$lang['srv_disabled_text'].''; } - //zbrisemo zadnji "|" iz niza - $string = substr($string, 0, -7); - $string = '' . $string . ''; echo $string; echo '
  • '; + echo '
    '; // - spremenljivka_settings // --- Zgornja vrstica pri editiranju vprasanj --> @@ -1599,12 +2398,12 @@ class Branching { // kalkulacija if ($row['tip'] == 22) { - $row['naslov'] = ''.$this->calculations_display(-$spremenljivka).' ( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )'; + $row['naslov'] = ''.$this->calculations_display(-$spremenljivka).' ('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')'; } // Kvota else if($row['tip'] == 25){ $SQ = new SurveyQuotas($this->anketa); - $row['naslov'] = ''.$SQ->quota_display(-$spremenljivka).' ( '.$lang['srv_vprasanje_tip_long_'.$row['tip']].' )'; + $row['naslov'] = ''.$SQ->quota_display(-$spremenljivka).' ('.$lang['srv_vprasanje_tip_long_'.$row['tip']].')'; } // Inline ifi so disablani ce nimamo ustreznega paketa @@ -1612,14 +2411,6 @@ class Branching { echo '
    '; - if ( in_array($row['tip'], array(1,2,6,16,19,20)) ) { - if ($row['enota'] != 10 && $row['orientation'] != 10){ - echo ''; - - MobileSurveyAdmin::displayAddQuestionCategory($this->anketa, $spremenljivka, $row['tip']); - } - } - // kalkulacija if ($row['tip'] == 22) { echo '
    '; @@ -1850,19 +2641,23 @@ class Branching { //echo '
    '; echo '
    '; // Ikona za upload slike - echo ' '; + echo ' '; echo ''; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; + echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; //koda za notranji IF if ($row1['if_id'] > 0) { echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; @@ -1872,19 +2667,24 @@ class Branching { } else{ if ($length > 30) $class = 'ranking_long'; $class = 'ranking'; - //echo '
    '; + echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; + echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - //koda za notranji IF + + // koda za notranji IF if ($row1['if_id'] > 0) { echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; @@ -1960,13 +2760,13 @@ class Branching { } if ($row['tip'] == 1 && $row['orientation'] != 8 && $row['orientation'] != 10) { - //echo '
    '; + if($row['orientation'] == 6){ echo '
    '.$row1['variable'].'
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; } elseif($row['orientation'] == 7){ - //echo '
    '.$row1['variable'].'
    ' . $row1['naslov'] . '
    '; - echo '
    '.$row1['variable'].'
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; + + echo '
    '.$row1['variable'].'
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; if ($row1['other'] == 1){ $otherWidth = ($spremenljivkaParams->get('otherWidth') ? $spremenljivkaParams->get('otherWidth') : -1); @@ -1982,7 +2782,7 @@ class Branching { echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; @@ -1990,23 +2790,23 @@ class Branching { echo ' '; } - echo ' '; - echo ' '; + echo '
    '; + echo ' '; + echo ' '; if($row['tip'] == 1) - echo ' '; - echo ' '; - echo ' '; - + echo ' '; + echo ' '; + echo ' '; + echo '
    '; echo ''; echo ''; - echo'
    '; + echo '
    '; } elseif($row['orientation'] == 9){ echo '
    -
    '; @@ -2033,7 +2833,7 @@ class Branching { echo '
    '.$row1['variable'].'
    '; // Ikona za upload slike - echo ' '; + echo ' '; // Slika oz. text (brez moznosti editiranja) - samo če je vnesen kaksen text ali slika echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; @@ -2069,7 +2869,7 @@ class Branching { echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; @@ -2077,13 +2877,14 @@ class Branching { echo ' '; } + echo '
    '; echo ' '; echo ' '; if($row['tip'] == 1) - echo ' '; + echo ' '; echo ' '; echo ' '; - + echo '
    '; echo''; echo ''; @@ -2098,7 +2899,7 @@ class Branching { echo '
    '.$row1['variable'].'
    '; // Ikona za upload slike - echo ' '; + echo ' '; // Slika oz. text (brez moznosti editiranja) - samo če je vnesen kaksen text ali slika echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'] . '
    '; @@ -2129,28 +2930,31 @@ class Branching { echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; if ($this->condition_check($row1['if_id']) != 0) echo ' '; } + + echo '
    '; echo ' '; // Kljukica za kviz if(SurveyInfo::getInstance()->checkSurveyModule('quiz')){ - $sqlQ = sisplet_query("SELECT * FROM srv_quiz_vrednost WHERE spr_id='".$row['id']."' AND vre_id='".$row1['id']."'"); + $sqlQ = sisplet_query("SELECT * FROM srv_quiz_vrednost WHERE spr_id='".$row['id']."' AND vre_id='".$row1['id']."'"); echo ' '; } echo ' '; - - if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 3) - echo ' '; + + if($row['tip'] == 1 || $row['tip'] == 2 || $row['tip'] == 3) + echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    '; @@ -2199,7 +3003,8 @@ class Branching { echo '
    '; } } - // multigrid, multicheckbox, multitext, multinumber prikaz + + // multigrid, multicheckbox, multitext, multinumber prikaz elseif ($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20 || $row['tip'] == 24) { $spremenljivkaParams = new enkaParameters($row['params']); @@ -2244,7 +3049,7 @@ class Branching { $sizebox = '$("#grids_count option:selected").val()'; $display = ($row['tip'] == 6 && $row['enota'] == 8) ? ' style="display:none;"' : ''; - $grid_plus_minus = '
    '; + $grid_plus_minus = '
    '; //izrisemo multigride z dropdowni in select box if($row['tip'] == 6 && ($row['enota'] == 2 || $row['enota'] == 6)) { @@ -2339,10 +3144,13 @@ class Branching { echo ''; echo ''; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -2529,10 +3337,13 @@ class Branching { echo ''; echo ''; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -2622,7 +3433,7 @@ class Branching { echo ' '; - echo ' '; + echo ' '; echo ' '; echo ' '; @@ -2641,26 +3452,25 @@ class Branching { } // Urejanje podnaslova 1. grida - echo ' '; - echo '
    ' . $row['grid_subtitle1'] . '
    '; - echo ''; + echo ' '; + echo '
    ' . $row['grid_subtitle1'] . '
    '; + echo ' '; - echo ' '; + echo ' '; // Urejanje podnaslova 2. grida - echo ' '; - echo '
    ' . $row['grid_subtitle2'] . '
    '; - echo ''; + echo ' '; + echo '
    ' . $row['grid_subtitle2'] . '
    '; + echo ' '; - echo ''; + echo ' '; echo ' '; // urejanje vrednosti - echo ' '; + echo ' '; echo ' '; - //echo ' '; echo ' '; $bg = 1; @@ -2681,7 +3491,7 @@ class Branching { } } - echo ''; + echo ''; echo ''; @@ -2721,7 +3531,7 @@ class Branching { } } - echo ''; + echo ''; //DRUGI DEL GRIDA //$sql2 = sisplet_query("SELECT naslov, vrstni_red FROM srv_grid WHERE spr_id='$row[id]' AND other=0 AND part='2' ORDER BY vrstni_red"); @@ -2787,10 +3597,13 @@ class Branching { echo ' '; echo ' '; echo ''; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -2841,7 +3654,7 @@ class Branching { } } - echo ''; + echo ''; //DRUGI DEL GRIDA //razlicni vnosi glede na tip multigrida @@ -2893,7 +3706,7 @@ class Branching { echo ' '; // urejanje vrednosti - echo ' '; + echo ' '; echo ' '; $bg = 1; @@ -3002,7 +3815,7 @@ class Branching { echo ' '; //začetek glave oz. naslovne vrstice tabele // urejanje vrednosti - echo ' '; + echo ' '; $bg = 1; @@ -3084,11 +3897,13 @@ class Branching { //sredinski del z besedilom echo '
    '; echo ''; + + echo '
    '; echo ' '; echo ' '; echo ' '; echo ' '; - + echo '
    '; echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; @@ -3171,8 +3986,11 @@ class Branching { $num = mysqli_num_rows($sql1); $size = $num * 50; + + echo '
    '; + //zaslon razdelimo na dva dela - izris leve strani - echo '
    '; + echo '
    '; while ($row1 = mysqli_fetch_array($sql1)) { @@ -3199,38 +4017,48 @@ class Branching { if ($length > 30) $class = 'ranking_long'; $class = 'ranking'; - //echo '
    '; + echo '
    '; + echo ''; - echo ' '; + + + + echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; + + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; - - echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - //koda za notranji IF + echo '
    '; + + // koda za notranji IF if ($row1['if_id'] > 0) { echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; if ($this->condition_check($row1['if_id']) != 0) echo ' '; } - echo '
    '; + echo '
    '; } + echo '
    '; + //izris desne strani************************************************************************************** //***********za skatlasto obliko $display_drag_and_drop_new_look = ($spremenljivkaParams->get('display_drag_and_drop_new_look') ? $spremenljivkaParams->get('display_drag_and_drop_new_look') : 0); //za checkbox //***********za skatlasto obliko - konec - echo '
    '; + echo '
    '; $sql2 = sisplet_query("SELECT id, naslov, variable, vrstni_red FROM srv_grid WHERE spr_id='$spremenljivka' AND other=0 ORDER BY vrstni_red"); $row2 = mysqli_fetch_array($sql2); @@ -3299,12 +4127,11 @@ class Branching { echo ''; - echo '
    '; //half2_$spremenljivka + echo '
    '; // half2_$spremenljivka - echo '
    '; + echo '
    '; // end ranking_holder; //***********************Drag and drop grid konec************************************************************* - } //Image hot spot******************************************************************************************************** elseif( ($row['tip'] == 6) && $row['enota'] == 10){ //image hot spot @@ -3429,26 +4256,18 @@ class Branching { $sliderTableColspan = ""; } + echo ' '; - echo ' '; - - - //vrstica z nadnaslovi ################################################################################### - echo ' '; - - - //vrstica z nadnaslovi - echo ''; - + echo ' '; + // vrstica z nadnaslovi + echo ''; echo ' '; echo ' '; - for ($j = 1; $j <= $row['grids']; $j++) { - //echo ''; if($j == 1){ $nadnaslov_floating = 'left'; } @@ -3462,11 +4281,11 @@ class Branching { echo ''; } echo ''; - //vrstica z nadnaslovi - konec ################################################################################### + // urejanje vrednosti - echo ' '; + echo ' '; echo ' '; echo ' '; @@ -3617,10 +4436,13 @@ class Branching { echo ' '; echo ' '; } - } elseif($row['tip'] == 16) { + } + elseif($row['tip'] == 16) { echo ' '; - - } elseif ($row['tip'] == 19) { - echo ' '; - - } elseif ($row['tip'] == 20) { - - //echo ' '; + } + elseif ($row['tip'] == 20) { if ($row['ranking_k'] == 1) { //ce je slider @@ -3741,17 +4562,18 @@ class Branching { '; - //echo ' '; - //Zadnja bela celica kjer se nahajajo ikone za mouseover, ko je slider - konec - - }else{ + + echo ''; + } + else{ echo ' '; - echo '

     
    - '.$lang['srv_neto_t_cas'].''; - echo '
     
    - '.$lang['srv_bruto_t_cas'].'

    '; + echo ''; + } + echo ''; - echo ''; - - - // izpis za vprasanja po blokih - $max = 0; - $bruto_total = 0; - $neto_total = 0; - foreach ($expected_vprasanja AS $vpr) { - if($vpr[4]){ - if ($vpr[0] > $max) $max = $vpr[0]; - $bruto_total += $vpr[0]; - $neto_total += $vpr[0] * $vpr[1]; - } - } + echo '
    '.$j.'
    lang_id!=null ?' default="1"':'').'>' . $trak_nadnaslov[$j] . '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; if($row['enota'] != 9){ @@ -3676,15 +4498,14 @@ class Branching { echo '
    '; + } + elseif ($row['tip'] == 19) { + echo '
    '; } @@ -3881,8 +4703,11 @@ class Branching { //ce je drsnik in moramo urediti opisne labele - konec ################################################## } - // textbox -- not any more - } elseif ($row['tip'] == 4) { + + // textbox -- not any more + } + + elseif ($row['tip'] == 4) { $taSize = ($spremenljivkaParams->get('taSize') ? $spremenljivkaParams->get('taSize') : 1); $taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1); @@ -3909,7 +4734,7 @@ class Branching { // textbox* elseif ($row['tip'] == 21) { - if($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit']) + if($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit']) $limit = '('.$lang['srv_text_length_char_num'].$row['vsota_min'].')'; elseif($row['num_useMin'] == 1 && $row['num_useMax'] == 1) $limit = '('.$lang['srv_text_length_char_num'].'min '.$row['vsota_min'].', max '.$row['vsota_limit'].')'; @@ -3926,9 +4751,7 @@ class Branching { if($taWidth == -1) $taWidth = 30; - echo ''; - if($row['orientation'] != 3) - echo ''; + echo '
    '; $_others = array(); $sql1 = sisplet_query("SELECT id, naslov, variable, size, other, hidden, naslov2 FROM srv_vrednost WHERE spr_id='$row[id]' AND vrstni_red > 0 ORDER BY vrstni_red"); @@ -3936,8 +4759,11 @@ class Branching { if ((int)$row1['other'] == 0) { - // sirina celice td - $cell = $row['text_kosov'] == 1 ? 100 : $row1['size'] ; + // sirina celice + $cell_width = $row['text_kosov'] > 0 ? 100 / $row['text_kosov'] : 100; + + echo '
    '; + // sirina vnosnega polja $input = $taWidth; @@ -3946,74 +4772,70 @@ class Branching { $naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($row1['id']); if ($naslov != '') $row1['naslov'] = $naslov; } - - if($row['orientation'] == 3) - echo '
    '; - echo ''; - if($row['orientation'] == 3) - echo ''; + echo ''; + + echo ''; } else { # imamo opcijo drugo prikažemo kot checkbox $_others[] = $row1; } } - if($row['orientation'] != 3) - echo ''; - echo '
    '; + // Polje za enoto + echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - if($row['text_orientation'] == 1 || $row['text_orientation'] == 3){ - echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - if ($row['text_orientation'] == 3) - echo '
    '; - } if ($taSize > 1) - echo ''; + echo ''; else - echo ''; - - if($row['text_orientation'] == 2){ - echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; - } - echo '
    '; + + echo ''; + - if ($row['vsota_show'] == 1 && $limit != '') - echo ''.$limit.''; + if ($row['vsota_show'] == 1 && $limit != '') + echo '
    '.$limit.'
    '; if (count($_others)> 0 ) { + + echo '
    '; + foreach ($_others AS $oKey => $_other) { - if ($this->lang_id != null) { - save('lang_id', $this->lang_id); - $naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($_other['id']); - if ($naslov != '') $_other['naslov'] = $naslov; - } - - // Ce je variabla ne vem in imamo vklopljen prikaz ob opozorilu -> rdec - $missing_warning = ''; - if(($_other['variable'] == '-97' && $row['alert_show_97'] > 0) - || ($_other['variable'] == '-98' && $row['alert_show_98'] > 0) - || ($_other['variable'] == '-99' && $row['alert_show_99'] > 0)){ - $missing_warning = ' red'; + if ($this->lang_id != null) { + save('lang_id', $this->lang_id); + $naslov = \App\Controllers\LanguageController::getInstance()->srv_language_vrednost($_other['id']); + if ($naslov != '') $_other['naslov'] = $naslov; + } + + // Ce je variabla ne vem in imamo vklopljen prikaz ob opozorilu -> rdec + $missing_warning = ''; + if(($_other['variable'] == '-97' && $row['alert_show_97'] > 0) + || ($_other['variable'] == '-98' && $row['alert_show_98'] > 0) + || ($_other['variable'] == '-99' && $row['alert_show_99'] > 0)){ + $missing_warning = ' red'; + } + + echo '
    '; + echo ' '; + echo ''; + echo '
    ' . $_other['naslov'] . '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } - echo '
    '; - echo ' '; - echo '
    ' . $_other['naslov'] . '
    '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - - echo '
    '; - - } + echo '
    '; } } // number - elseif ($row['tip'] == 7) { + elseif ($row['tip'] == 7) { if($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit']) $limit = '('.$row['vsota_min'].')'; @@ -4044,20 +4866,19 @@ class Branching { if($taWidth == -1) $taWidth = 10; - $cssFloat = ' floatLeft'; - $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' AND other = 0 "); $row1 = mysqli_fetch_array($sql1); $sqlOther = sisplet_query("SELECT id, naslov, other FROM srv_vrednost WHERE spr_id='$row[id]' AND vrstni_red>0 AND other != 0"); $num_other = mysqli_num_rows($sqlOther); - $num_all = $num_other+$row['size']; - $cell_width = 'width:'.(80/$num_all).'% '; if ( $row['ranking_k'] == '0' ) { - echo '
    '; + echo '
    '; + + + echo '
    '; if ($this->lang_id != null) { save('lang_id', $this->lang_id); @@ -4066,28 +4887,24 @@ class Branching { } if($row['enota'] == 1) - echo '
    lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '
    - '; + echo '
    lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '
    + '; elseif($row['enota'] == 2) - echo '
    lang_id!=null?' default="1"':'').'>' . $row1['naslov'].'
    '; + echo '
    lang_id!=null?' default="1"':'').'>' . $row1['naslov'].'
    '; else - echo ' '; - echo '
    '; + echo ' '; + + echo '
    '; + // Omejitev vnosa - if ($row['orientacija'] == 1) { - echo '
    ccc
    '; - $cssFloat = ''; - }else { - $cssFloat = ' floatLeft'; - } if ($row['vsota_show'] == 1 && $limit != '') { - echo ''.$limit.''; - } elseif($row['size'] != 2 && $limit == '') { - echo ''.$lang['srv_number_text'].''; + echo '
    '.$limit.'
    '; + } + elseif($row['size'] != 2 && $limit == '') { + echo '
    '.$lang['srv_number_text'].'
    '; } - $cssFloat = ' floatLeft'; if ($row['size'] == 2) { @@ -4099,35 +4916,32 @@ class Branching { if ($naslov != '') $row1['naslov'] = $naslov; } - echo '
    '; + echo '
    '; if($row['enota'] == 1){ if($taWidth > 40) echo '
    '; - echo '
    lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '
    - '; + echo '
    lang_id!=null ?' default="1"':'').'>' . $row1['naslov'] . '
    + '; } elseif($row['enota'] == 2) - echo '
    lang_id!=null ?' default="1"':'').'>' . $row1['naslov'].'
    '; + echo '
    lang_id!=null ?' default="1"':'').'>' . $row1['naslov'].'
    '; else - echo ' '; + echo ' '; echo '
    '; - //Omejitev vnosa - if ($row['orientacija'] == 1) { - echo '
    ccc
    '; - $cssFloat = ''; - }else { - $cssFloat = ' floatLeft'; - } + // Omejitev vnosa if ($row['vsota_show'] == 1 && $limit2 != '') { - echo ''.$limit2.''; - } elseif($limit == '' && $limit2 == '') { - echo ''.$lang['srv_number_text'].''; + echo '
    '.$limit2.'
    '; + } + elseif($limit == '' && $limit2 == '') { + echo '
    '.$lang['srv_number_text'].'
    '; } } - }//ranking_k == 0 - + echo '
    '; + } + + //ranking_k == 0 if ( $row['ranking_k'] == '1' ) { echo '
    '; @@ -4251,10 +5065,8 @@ class Branching { '; - echo '
    '; - echo '
    '; - + + //tabela za labele podrocij in podrocja echo ''; @@ -4373,11 +5185,15 @@ class Branching { } echo '
    '; - echo ''; - echo '
    ' . $row1['naslov'] . '
    '; + echo ''; + echo ''; + echo '
    ' . $row1['naslov'] . '
    '; + echo '
    '; echo ' '; echo ' '; + echo '
    '; + echo '
    '; } } @@ -4415,12 +5231,17 @@ class Branching { } echo '
    '; - echo ''; - echo '
    ' . $row1['naslov'] . '
    '; - echo ' '; + echo ''; + echo ''; + echo '
    ' . $row1['naslov'] . '
    '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; + echo '
    '; } @@ -4435,9 +5256,12 @@ class Branching { $num = mysqli_num_rows($sql1); $size = $num * 50; + echo '
    '; + // n=k if ($row['design'] == 2) { - echo '
    '; + + echo '
    '; while ($row1 = mysqli_fetch_array($sql1)) { @@ -4461,10 +5285,13 @@ class Branching { echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; @@ -4474,7 +5301,7 @@ class Branching { echo '
    '; echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; @@ -4486,6 +5313,7 @@ class Branching { echo '
    '; } + echo '
    '; } @@ -4493,7 +5321,7 @@ class Branching { elseif ($row['design'] == 0) { //zaslon razdelimo na dva dela - izris leve strani - echo '
    '; + echo '
    '; while ($row1 = mysqli_fetch_array($sql1)) { @@ -4517,10 +5345,6 @@ class Branching { echo '
    '; echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ' '; echo '
    lang_id!=null ?' default="1"':'').'>'.$row1['naslov'].'
    '; @@ -4529,7 +5353,7 @@ class Branching { echo '
    '; echo ' *'; - echo ' '; + echo ' '; $this->conditions_display($row1['if_id']); echo ''; @@ -4540,12 +5364,21 @@ class Branching { echo '
    '; } + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; } + echo '
    '; + // izris desne strani - echo '
    '; + echo '
    '; if($row['ranking_k'] == 0) $max = mysqli_num_rows($sql1); @@ -4557,8 +5390,6 @@ class Branching { } echo '
    '; - - echo '
    '; } // cifre - dropdown @@ -4576,10 +5407,13 @@ class Branching { echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; + echo '
    '; //echo ' '; echo ''; if ($row1['if_id'] > 0) { @@ -4668,21 +5507,17 @@ class Branching { $vsota = ($row1['vsota'] != '') ? $row1['vsota'] : $lang['srv_vsota_text']; - echo '
    '; + echo '
    '; - echo '
    '; + echo '
    '; + + echo '
    lang_id!=null ?' default="1"':'').'>' . $vsota . '
    '; - echo ' '; + echo ' '; - echo '
    '; - echo '
    '; - echo '
    lang_id!=null ?' default="1"':'').'>' . $vsota . '
    '; - echo '
    '; - echo '
    '; - echo ' '; + echo ' '; if ($row['vsota_show'] == 1) - echo ' '; - echo '
    '; + echo '
    '; } // SN - imena @@ -4730,11 +5565,11 @@ class Branching { $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY $orderby"); while ($row1 = mysqli_fetch_array($sql1)) { - echo '

    '; + echo '

    '; } if ($row['textfield'] == 1) { - echo '

    '; + echo '

    '; } } @@ -4973,22 +5808,31 @@ class Branching { elseif( ($row['tip'] == 27)){ //Heatmap $this->vprasanje_heatmap($row['id'], $row['tip']); } - - - - //echo '
    '; + echo '
    '; - if ($row['orientation']==0 || $row['orientation']==2 || $row['tip'] == 17) echo '
    '; // kjer so vsi divi floatani, da se raztegne okvir vprasanja + + // Add variable - hover + if ( in_array($row['tip'], array(1,2,6,16,19,20)) ) { + if ($row['enota'] != 10 && $row['orientation'] != 10){ + echo ''; + + MobileSurveyAdmin::displayAddQuestionCategory($this->anketa, $spremenljivka, $row['tip']); + } + } + + + // kjer so vsi divi floatani, da se raztegne okvir vprasanja + if ($row['orientation']==0 || $row['orientation']==2 || $row['tip'] == 17) + echo '
    '; echo ''; - //echo ' '; if ($this->displayKomentarji !== false) { $this->vprasanje_komentarji($spremenljivka); } - echo ' '; + echo ' '; } function vprasanje_grid_multiple ($spremenljivka) { @@ -5007,65 +5851,48 @@ class Branching { echo ' '; echo ' '; + // podnaslovi gridov - if ($row['grid_subtitle1'] == '1') { - echo ' '; + $sql2 = sisplet_query("SELECT s.id, s.naslov, s.grids FROM srv_spremenljivka s, srv_grid_multiple m WHERE s.id = m.spr_id AND parent = '".$row['id']."' ORDER BY m.vrstni_red"); + if ($row['grid_subtitle1'] == '1' && mysqli_num_rows($sql2) > 0) { + + echo ' '; echo ' '; - //echo ' '; echo ' '; - $sql2 = sisplet_query("SELECT s.id, s.naslov, s.grids FROM srv_spremenljivka s, srv_grid_multiple m WHERE s.id = m.spr_id AND parent = '".$row['id']."' ORDER BY m.vrstni_red"); + $col = 1; + $tip_prev = 0; + $id_prev = 0; + while ($row2 = mysqli_fetch_array($sql2)) { - - + + if ($id_prev == 0) $id_prev = $row2['id']; + + if ($tip_prev != $row2['tip']) $col++; + $tip_prev = $row2['tip']; + if ($this->lang_id != null) { save('lang_id', $this->lang_id); $rowl = \App\Controllers\LanguageController::srv_language_spremenljivka($row2['id']); if (strip_tags($rowl['naslov']) != '') $row2['naslov'] = $rowl['naslov']; - } - - - echo ' '; + } + echo ' '; } echo ' '; } - // urejanje vrednosti - echo ' '; - echo ' '; - //echo ' '; - echo ' '; $bg = 1; - $sql2 = sisplet_query("SELECT id, variable, vrstni_red FROM srv_grid WHERE spr_id='$row[id]' AND other=0 ORDER BY vrstni_red"); - $row2 = mysqli_fetch_array($sql2); - - for ($i = 1; $i <= $row['grids']; $i++) { - if ($row2['vrstni_red'] == $i) { - echo ' '; - $row2 = mysqli_fetch_array($sql2); - } else { - echo ' '; - } - } - echo ''; - - $grid_plus_minus = ''; - - echo ' '; - echo ' '; - //echo ' '; - echo ' '; - - $bg = 1; - - //$sql2 = sisplet_query("SELECT g.* FROM srv_grid g, srv_grid_multiple m WHERE g.spr_id = m.spr_id AND parent = '".$row['id']."' ORDER BY m.vrstni_red, g.vrstni_red"); - $sqlM = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka' ORDER BY vrstni_red"); if(mysqli_num_rows($sqlM) > 0){ + + echo ' '; + echo ' '; + echo ' '; + $multiple = array(); while ($rowM = mysqli_fetch_array($sqlM)) { $multiple[] = $rowM['spr_id']; @@ -5073,37 +5900,36 @@ class Branching { $sql2 = sisplet_query("SELECT g.*, s.tip, s.enota, s.dostop FROM srv_grid g, srv_grid_multiple m, srv_spremenljivka s WHERE s.id=g.spr_id AND g.spr_id=m.spr_id AND m.spr_id IN (".implode(',', $multiple).") ORDER BY m.vrstni_red, g.vrstni_red"); $row2 = mysqli_fetch_array($sql2); + $col = 1; + $tip_prev = 0; + $id_prev = 0; + for ($i = 1; $i <= mysqli_num_rows($sql2); $i++) { + + if ($id_prev == 0) $id_prev = $row2['id']; + + if ($tip_prev != $row2['tip']) $col++; + $tip_prev = $row2['tip']; + if ($this->lang_id != null) { $naslov = \App\Controllers\LanguageController::srv_language_grid($row2['spr_id'], $row2['id']); if ($naslov != '') $row2['naslov'] = $naslov; } - if (true) { - echo ' '; - $row2 = mysqli_fetch_array($sql2); - } else { - echo ' '; - } + echo ' '; + + $row2 = mysqli_fetch_array($sql2); } - } - #kateri missingi so nastavljeni - $sql_grid_mv = sisplet_query("SELECT * FROM srv_grid WHERE spr_id='".$spremenljivka."' AND other != 0"); - if (mysqli_num_rows($sql_grid_mv) > 0 ) { - echo ''; - while ($row_grid_mv = mysqli_fetch_array($sql_grid_mv)) { - echo ''; - - } + echo ' '; } - echo ' '; // linki za urejanje pod-spremenljivk tabele + $grid_plus_minus = ''; + echo ' '; echo ' '; - //echo ' '; echo ' '; $bg = 1; @@ -5119,7 +5945,9 @@ class Branching { if ($tip_prev != $row2['tip']) $col++; $tip_prev = $row2['tip']; - echo ' '; + echo ' '; $id_prev = $row2['id']; } @@ -5142,11 +5970,14 @@ class Branching { echo ' '; echo ' '; echo ' '; - - } elseif($row2['tip'] == 16) { - //echo ' '; + } + // Checkbox podtabela + elseif($row2['tip'] == 16) { echo ' '; + } + // Text podtabela + elseif ($row2['tip'] == 19) { + echo ' '; + } + // Number podtabela + elseif ($row2['tip'] == 20) { - } elseif ($row2['tip'] == 19) { - echo ' '; - - } elseif ($row2['tip'] == 20) { - - echo ' '; + echo ' '; + echo ''; + echo ''; - echo ''; + echo ''; } function anketa_nice_links () { + global $lang; echo '
    '; + + echo '
    '.$lang['srv_nice_url'].''; $sql = sisplet_query("SELECT l.link, a.id, a.naslov FROM srv_nice_links l, srv_anketa a WHERE a.id=l.ank_id ORDER BY l.link ASC"); - while ($row = mysqli_fetch_array($sql)) { - echo '

    '.$row['link'].' '.$row['naslov'].'

    '; - } - + $table_exists = 0; + while ($row = mysqli_fetch_array($sql)) { + if ($table_exists == 0) { + echo '

    '.$lang['srv_nice_url_note'].'

    '; + echo '
    lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '
    lang_id!=null ?' default="1"':'').'>' . $row2['naslov'] . '
    ' . $row2['variable'] . '
    lang_id!=null ? ' default="1"':'').'>' . $row2['naslov'] . '
    lang_id!=null ? ' default="1"':'').'>' . $row2['naslov'] . '
    lang_id!=null ?' default="1"':'').'>' . $row_grid_mv['naslov'] . '
    '.$grid_plus_minus.''.$lang['edit3'].''; + echo ' '; + echo '
    '; echo ''; - echo ' '; + + echo '
    '; + echo ' '; echo ' '; echo ' '; echo ' '; - + echo '
    '; + echo '
    lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'
    '; if ($row1['if_id'] > 0) { @@ -5190,20 +6021,22 @@ class Branching { if ($tip_prev != $row2['tip']) $col++; $tip_prev = $row2['tip']; + // Radio podtabela if($row2['tip'] == 6) { - //echo '
    '.($row2['enota']!=2?'':'').''.(($row2['enota']!=2 && $row2['enota']!=6)?'':'').''.(($row2['enota']!=2 && $row2['enota']!=6)?'':'').''; + echo ' '; if ($row['ranking_k'] == 1) { echo '
    '; @@ -5217,7 +6050,6 @@ class Branching { echo '
    '; - // ?> '; + echo ''; + echo ' '; + echo ''; + + echo ''; $row = Cache::srv_spremenljivka($spremenljivka); if ($row['thread'] == 0) { @@ -5319,28 +6158,32 @@ class Branching { // Poglej komentarje if ($admin_type <= $question_comment_viewadminonly || $question_comment_viewauthor==1) { - echo '   '; - echo ' '; + echo ''; + echo ' '; + echo ''; + + echo ''; } } // komentarji respondentov if (($question_resp_comment==1) AND ($admin_type <= $question_resp_comment_viewadminonly)) { - echo ' '; $sql = sisplet_query("SELECT COUNT(*) AS count FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spremenljivka'"); $row = mysqli_fetch_array($sql); if ($row['count'] > 0) { - echo ''; - echo ' '; - echo $lang['srv_repondent_comment'].' ('.$row['count'].')'; + echo ''; + echo ' '; echo ''; - echo ' '; + + echo ''; } echo ''; } @@ -5516,7 +6359,7 @@ class Branching { // prikažemo nastavitve vprasanja $fullscreen = ( isset($_POST['fullscreen']) && $_POST['fullscreen'] != 'undefined') ? (int)$_POST['fullscreen'] : false; - echo '
    '."\n\r"; + echo '
    '."\n\r"; if ($id == -1) { $show = $row['show_intro']; @@ -5537,25 +6380,21 @@ class Branching { // <-- Editor teksta vprasanja --- echo '
    '; echo '
    '.$text.'
    '; - echo '
    '; echo ''; // opomba if ($opomba != '' && $this->lang_id == null) { - echo ''; - echo ''; - echo ''; - echo '
    '.$lang['note'].' ('.$lang['srv_internal'].'):'; - echo ''.$opomba.''; - echo '
    '; + + echo '
    '; + echo '*'.$lang['note'].' ('.$lang['srv_internal'].'): '.$opomba; + echo '
    '; } + echo '
    '; // --- Editor teksta vprasanja --> - - echo '
    '; - - } else { // urejanje uvoda,zakljucka + } + else { // urejanje uvoda,zakljucka // <-- Zgornja vrstica pri editiranju vprasanj --- echo '
    '; @@ -5568,9 +6407,8 @@ class Branching { // prikažemo nastavitve vprasanja $fullscreen = ( isset($_POST['fullscreen']) && $_POST['fullscreen'] != 'undefined') ? (int)$_POST['fullscreen'] : false; - echo '
    '."\n\r"; + echo '
    '."\n\r"; echo ' '; - //$this->introconcl_visible($id); echo ' '."\n\r"; echo '
    '; @@ -5593,7 +6431,6 @@ class Branching { echo '
    '; echo ''; echo '
    '; @@ -5705,16 +6542,14 @@ class Branching { // <-- Editor teksta vprasanja --- echo '
    '; echo '
    '.$text.'
    '; - echo '
    '; - echo '
    '; // --- Editor teksta vprasanja --> - echo '
    '; // Da/ne variable + echo '
    '; echo '
    '; echo '
    '; @@ -5731,6 +6566,7 @@ class Branching { echo '
    '.$lang['srv_gdpr_intro_yes'].'
    '; echo '
    '; + echo '
    '; echo '
    '; echo '
    '; @@ -6023,48 +6859,49 @@ class Branching { echo ' ) '; } - //echo ''; if ($row_if['label'] != '') { echo ' ('; echo ' '.$row_if['label'].' '; echo ') '; - } $condition_check = $this->condition_check($if); if ($long_alert) { - if ($c == 1 && $spr_id == 0) - if ($this->count_spr_in_if($if) > 1) { + + if ($c == 1 && $spr_id == 0){ + + if ($this->count_spr_in_if($if) > 1) { echo ''.$lang['srv_edit_condition_question'].''; - } else { + } + else { $spr = $this->find_first_in_if($if); $r = Cache::srv_spremenljivka($spr); if (!$spr > 0) $r['variable'] = ''; echo ''.sprintf($lang['srv_edit_condition_question1'], ''.$r['variable'].'').''; } - //if ($condition_check >= 1 && $condition_check <= 5 ) { - echo ''; - if ($condition_check == 1) - echo ' '.$lang['srv_error_oklepaji'].''; - if ($condition_check == 2) { - if (mysqli_num_rows($sql) > 1) // ko nardimo nov if, ne prikazemo takoj errorja - echo ' '.$lang['srv_error_spremenljivka'].''; - } elseif ($condition_check == 3) - echo ' '.$lang['srv_error_vrednost'].''; - if ($condition_check == 4) - echo ' '.$lang['srv_error_numericno'].''; - if ($condition_check == 5) - echo ' '.$lang['srv_error_calculation'].''; - if ($condition_check == 6) - echo ' '.$lang['srv_error_date'].''; - echo ''; - //} - } else { + echo ''; + if ($condition_check == 1) + echo ' '.$lang['srv_error_oklepaji'].''; + if ($condition_check == 2) { + if (mysqli_num_rows($sql) > 1) // ko nardimo nov if, ne prikazemo takoj errorja + echo ' '.$lang['srv_error_spremenljivka'].''; + } elseif ($condition_check == 3) + echo ' '.$lang['srv_error_vrednost'].''; + if ($condition_check == 4) + echo ' '.$lang['srv_error_numericno'].''; + if ($condition_check == 5) + echo ' '.$lang['srv_error_calculation'].''; + if ($condition_check == 6) + echo ' '.$lang['srv_error_date'].''; + echo ''; + } + } + else { if ($condition_check != 0) - echo ' '.$lang['srv_if_error'].''; + echo ' '.$lang['srv_if_error'].''; } @@ -6086,7 +6923,7 @@ class Branching { $rowb = Cache::srv_if($if); //začetek oklepaja za ZANKO - echo 'LOOP ('.$rowb['number'].')'; + echo 'LOOP ('.$rowb['number'].')'; $sql = sisplet_query("SELECT l.spr_id, s.variable FROM srv_loop l, srv_spremenljivka s WHERE l.if_id='$if' AND l.spr_id=s.id"); $row = mysqli_fetch_array($sql); @@ -6555,9 +7392,7 @@ class Branching { echo '

    '.$lang['urejanje_pogoj_popup_vrednost'].'

    '; echo ''; - echo ''.$lang['urejanje_podif_alert'].''; - - echo '

    '; + echo ''.$lang['urejanje_podif_alert'].''; $sql = sisplet_query("SELECT naslov FROM srv_vrednost WHERE id='$vrednost'"); $row = mysqli_fetch_assoc($sql); @@ -6565,7 +7400,7 @@ class Branching { } // Pogoj pri npr. obvescanju elseif($vrednost == -3){ - echo '

    '.$lang['urejanje_pogoj_popup'].'

    '; + echo '

    IF - '.$lang['urejanje_pogoj_popup'].'

    '; echo ''; } // Validacija @@ -6593,26 +7428,56 @@ class Branching { // gumbi na desni v novem oknu if ($vrednost==0) { - // floating box + // floating box echo '
    '; + + echo '
    '; + + echo ''; + if ($row['tip'] == 0) - echo '

    '.$lang['oblikovanje_if'].'

    '; + echo $lang['oblikovanje_if']; elseif ($row['tip'] == 1) - echo '

    '.$lang['oblikovanje_blok'].'

    '; + echo $lang['oblikovanje_blok']; elseif ($row['tip'] == 2) - echo '

    '.$lang['srv_loop_urejanje'].'

    '; + echo $lang['srv_loop_urejanje']; - if ($row['tip'] == 0) - echo '

    '.$lang['srv_edit_condition_question'].'

    '; - elseif ($row['tip'] == 1) - echo '

    '.$lang['srv_block_desc'].'

    '; + echo '
    '; + + + echo '
    '; + + echo '
    '.$lang['srv_common_settings'].''; + + if ($row['tip'] == 0){ + echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_edit_condition_question'].'

    '; + echo '
    '; + echo '
    '; + } + elseif ($row['tip'] == 1){ + echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_block_desc'].'

    '; + echo '
    '; + echo '
    '; + } + if ($vrednost != -1 && $vrednost != -2) { - echo '

    '; - echo ($row['tip']==0?$lang['srv_if_label']:($row['tip']==1?$lang['srv_block_label']:$lang['srv_loop_label'])).':'; - echo ''; - echo '

    '; + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; echo ''; - } + // Dodaj blok/if v knjiznico + echo '
    '; + + echo '
    '; + echo ' '.$lang['srv_library_add_to_lib'].''; + echo '
    '; + + echo '
    '; + + echo '
    '; + + if ($row['tip'] == 0 || $row['tip'] == 1) { - echo '
    '; + echo '
    '.($row['tip'] == 1 ? $lang['srv_block_enabled'] : $lang['srv_if_enabled']).''; - echo '

    '.($row['tip'] == 1 ? $lang['srv_block_enabled'] : $lang['srv_if_enabled']).':'; + echo '

    '; - echo''; - echo ''; - if ($row['tip'] == 0) - echo ''; - echo ''; - echo ''; + echo '
    '; + echo ' '; + echo '
    '; - echo '

    '; + if ($row['tip'] == 0){ + echo '
    '; + echo '
    '; + } + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; echo '
    '; } @@ -6645,15 +7528,18 @@ class Branching { // Posebna nastavitev vrednosti statusa panelista ce je vklopljen modul "panel" if ($row['tip'] == 0 && SurveyInfo::getInstance()->checkSurveyModule('panel')) { - echo '
    '; - echo '

    '.$lang['srv_panel_if'].':'; + echo '

    '.$lang['srv_panel_if'].''; - $sp = new SurveyPanel($this->anketa); + $sp = new SurveyPanel($this->anketa); $panel_if = $sp->getPanelIf($if); - - echo''; - echo ''; - echo ''; + + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; echo ''; - echo '

    '; echo '
    '; } if ($row['tip'] == 1) { - echo '
    '; + echo '
    '.$lang['srv_block_random'].' '.Help::display('srv_block_random').''; // Blok ki prikaze nakljucno razvrscena vprasanja (in samo doloceno stevilo) - echo '

    '; - echo ' '.$lang['srv_block_random'].': '.Help::display('srv_block_random'); - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' =0?' checked="checked"':'').' onClick="if_blok_random(\''.$row['id'].'\', $(this).val())" />'; + echo '
    '; + + echo '
    '; + // Stevilo vprasanj ki jih nakljucno izberemo (ce je zgornja "da") - echo '

    = 0) ? '' : ' style="display:none;"').'>'.$lang['srv_block_random_cnt'].':'; - echo ''; + echo ' '; $sqlB = sisplet_query("SELECT count(*) AS cnt_spr FROM srv_branching WHERE ank_id='".$this->anketa."' AND parent='".$row['id']."' AND element_spr>'0' ORDER BY vrstni_red"); @@ -6694,102 +7592,116 @@ class Branching { echo ' '; } } - echo ''; - + echo ' '; + echo ' '; + + echo '

    '; + + echo '
    '; + + // Blok ki vsebuje horizontalno urejena vprasanja - echo '

    '.$lang['srv_orientacija_vprasanja'].':'; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + // Blok kot zavihek - echo '

    '.$lang['srv_block_tab'].':'; - echo ''; - echo '

    '; - + echo '
    '; + + echo '
    '; + echo ' '; + echo' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + // Opozorilo, da mora biti blok na svoji strani (ce je vklopljena katera od zgornjih nastavitev) - echo '

    =0 ? '' : ' style="display:none;"').'>'.$lang['srv_block_pbWarning'].'

    '; - + echo '
    =0 ? '' : ' style="display:none;"').'>'; + echo '
    '; + echo ' '.$lang['srv_block_pbWarning'].''; + echo '
    '; + echo '
    '; + echo ''; } + + echo '
    '; - echo ''; - - echo ''; - echo ''.($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ).''."\n\r"; - echo ''; + echo '
    '; - echo '
    '; + echo '
    '; + echo ($row['tip'] == 0 ? $lang['srv_if_rem_all'] : ($row['tip']==1?$lang['srv_block_rem_all']:$lang['srv_loop_rem_all']) ); + echo '
    '; - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; + echo '
    '; + echo ' '; + echo ($row['tip'] == 0 ? $lang['srv_if_rem_only'] : ($row['tip']==1?$lang['srv_block_rem_only']:$lang['srv_loop_rem_only']) ); + echo '
    '; + + echo '
    '; + + + echo '
    '; + + echo ' '; + + echo '
    '; - echo ''; - echo ''.($row['tip'] == 0 ? $lang['srv_if_rem'] : ($row['tip']==1?$lang['srv_block_rem']:$lang['srv_loop_rem']) ).''."\n\r"; - echo ''; echo '
    '; // -- div_condition_editing_float - - } - // filter v DisplayData - elseif ($vrednost == -1) { - // tega niti ni vec... - } - // profili filtrov - elseif ($vrednost == -2) { - } // klasicen popup v #div_condition_editing, uporablja se npr pri ifih za obvescanje - elseif ($vrednost == -3) { - echo ''; - echo ''.$lang['srv_potrdi'].''; - echo ''; - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; - echo ''; - echo ''.$lang['srv_if_rem'].''."\n\r"; - echo ''; - + elseif ($vrednost == -3) { + + echo '
    '; + echo ''; + echo ''; + echo '
    '; } // validacija - elseif ($vrednost == -4) { - echo ''; - echo ''.$lang['srv_potrdi'].''; - echo ''; - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; - echo ''; - echo ''.$lang['srv_if_rem'].''."\n\r"; - echo ''; - + elseif ($vrednost == -4) { + + echo '
    '; + echo ''; + echo ''; + echo '
    '; } // filter na vrednosti - else { - echo ''; - echo ''.$lang['srv_potrdi'].''; - echo ''; - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; - echo ''; - echo ''.$lang['srv_if_rem'].''."\n\r"; - echo ''; + else { + + echo '
    '; + echo ''; + echo ''; + echo ''; + echo '
    '; } - echo '
    '; + echo '
    '; ?>'; - echo '

    '.$lang['srv_calc'].'

    '; + echo '

    '.$lang['srv_calc'].'

    '; echo '
    '; echo $this->calculations_display($condition, 1); echo '
    '; echo '
    '; - echo '
    '; - echo '

    '.$lang['srv_editcalculation'].'

    '; - echo '
    '; - - echo '
    '; + $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red"); if (mysqli_num_rows($sql) == 0) { sisplet_query("INSERT INTO srv_calculation (id, cnd_id, vrstni_red) VALUES ('', '$condition', '1')"); $sql = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id = '$condition' ORDER BY vrstni_red"); } + while ($row = mysqli_fetch_array($sql)) { $this->calculation_edit($row['id'], $vrednost); } - echo '
    '; + echo '

    '.$lang['srv_add_cond'].': +  + , +  - , +  * , +  /  +

    '; - echo '

    '.$lang['srv_add_cond'].': -  + , -  - , -  * , -  /  -



    '; + echo ''; } /** @@ -7987,51 +8913,14 @@ class Branching { if (!$sql_count) die(); $row_count = mysqli_fetch_array($sql_count); - if ($row['vrstni_red'] == 1 && $row_count['count'] > 1) { - echo ''; - echo ''; - echo ''; // gumbi oklepaji - echo ''; // logicni operatorji - echo ''; // oklepaji - echo ''; - echo ''; // gumbi zaklepaji - echo ''; // move - echo ''; - echo '
    '.$lang['srv_oklepaji'].'   '.$lang['srv_zaklepaji'].''.$lang['edit2'].'
    '; - - } elseif ($row['vrstni_red'] == 1) { - echo '
     
    '; - } // form - echo '
    '."\n\r"; + echo ''."\n\r"; - echo ''; - echo ''; - - - // left_bracket - if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) { - - echo ''; // operator - echo ''; + echo '
    '; + + // move + echo '
    '; + if ($row_count['count'] != 1 ) + echo ''; + echo '
    '; + + + // Srednji bel del + echo '
    '; // left_bracket - echo '
    '; + echo ' ( '; + } + + echo ''; // spremenljivka - echo ''; - + echo ''; // right_bracket - echo ''; + echo ''; // right_bracket buttons + echo '
    '; + if ($row_count['count'] != 1 || $row['right_bracket']>0 || $row['left_bracket']>0) { - echo '
    '; + echo ''; - // move - echo ''; + echo ''; + + echo '
    '.$lang['srv_zaklepaji'].'
    '; + } + + echo ''; + + echo ''; + // remove - echo ''; + echo ' '."\n\r"; + + echo ''; - echo ''; - echo '
    '; - echo ''; - - if ($row['left_bracket'] > 0) - echo ''; - else - echo ''; - } - else { - echo ''; - } - echo ''; - - if ($row['vrstni_red'] == 1) { - // nimamo nic.. - } else { + if ($row['vrstni_red'] > 1) { + echo '
    '; if ($row['operator']==0) echo ' + '; @@ -8041,22 +8930,60 @@ class Branching { echo ' * '; if ($row['operator']==3) echo ' / '; + + echo '
    '; } - echo '
    '; + echo '
    '; + + if ($row_count['count'] != 1 || $row['left_bracket']>0 || $row['right_bracket']>0) { + + echo '
    '; + + echo ''; + + if ($row['left_bracket'] > 0) + echo ''; + else + echo ''; + + echo '
    '; + + echo '
    '.$lang['srv_oklepaji'].'
    '; + } + + echo '
    '; + + // left_bracket + echo '
    '; + for ($i=$row['left_bracket']; $i>0; $i--) { - echo ' ( '; } - echo '
    '; - if ($row['spr_id']==0) echo ''.$lang['srv_select_spr'].'!'; - echo '
    '; - echo ''."\n\r"; echo ''; echo ''; @@ -8170,8 +9097,7 @@ class Branching { // number vnos if ($row['spr_id'] == -1) { - //if ($row['number'] == 0) $row['number'] = ''; - echo ' '; + echo ' '; echo ''; - } - echo '
     '."\n\r"; - echo '
    '; + echo '
    '; + for ($i=$row['right_bracket']; $i>0; $i--) { echo ' ) '; } - echo '
    '; + + echo '
    '; + if ($row['right_bracket'] > 0) echo ''; else echo ''; - echo ''; - } else { - echo '
    '; -// echo ''; -// echo ''; - } - echo ''; - if ($row_count['count'] != 1 ) - echo ''; - echo ''; + echo '
    '; + $sql3 = sisplet_query("SELECT * FROM srv_calculation WHERE cnd_id='$row[cnd_id]'"); if (mysqli_num_rows($sql3) != 1 ) - echo ' '."\n\r"; - echo '
    '; - - echo '
    '."\n\r"; + echo ''; + echo ''; } /** @@ -8377,6 +9303,7 @@ class Branching { 'naslov' => "'".mysqli_real_escape_string($GLOBALS['connect_db'], $row['naslov'])."'", 'variable' => "'".mysqli_real_escape_string($GLOBALS['connect_db'], $variable)."'", 'variable_custom' => "'$variable_custom'", + 'vrstni_red' => "'$vrstni_red'", 'thread' => "'0'", 'edit_graf' => "'0'", // naknadno popravimo editiranje grafov - po kopiranju je onemogoceno ); @@ -8457,7 +9384,7 @@ class Branching { $condition = SurveyCopy::preformCopyTable('srv_condition', 'id', SurveyCopy::sql2array($qry_src_condition), $pre_set); // condtition grid, tabela srv_condition_grid - if (count($condition) > 0) { + if (is_countable($condition) && count($condition) > 0) { foreach ($condition AS $orig => $bckp) { // condtition grid, tabela srv_condition_grid $qry_src_condition_grid = sisplet_query("SELECT * FROM srv_condition_grid WHERE cond_id = '".$orig."'"); @@ -8469,7 +9396,7 @@ class Branching { } // condtition vrednost, tabela srv_condition_vre - if (count($condition) > 0) { + if (is_countable($condition) && count($condition) > 0) { foreach ($condition AS $orig => $bckp) { $qry_src_condition_vre = sisplet_query("SELECT * FROM srv_condition_vre WHERE cond_id = '$orig'"); //$src_srv_condition_vre = SurveyCopy::arrayfilter($arr_src['srv_condition_vre'], 'cond_id', $orig); @@ -9802,33 +10729,36 @@ class Branching { // Vprasalnik se shranjuje avt. echo '
    '; - echo ''; - echo '
    '.$lang['srv_vprasalnik_autosave'].'
    '; + echo ' '; + echo ' '.$lang['srv_vprasalnik_autosave'].''; echo '
    '; echo ''; + } else { echo '1'; } @@ -1641,7 +1641,7 @@ class BranchingAjax { if ($code['type'] == 'if') { $sql = sisplet_query("SELECT id, number FROM srv_if WHERE id = '$code[id]'"); $row = mysqli_fetch_array($sql); - echo '

    '.$lang['srv_check_pogoji_if'].' '.$row['number'].'

    '; + echo '

    '.$lang['srv_check_pogoji_if'].' '.$row['number'].'.

    '; // napaka v podifih, ki so nastavljeni na vrednosti spremenljivk } elseif ($code['type'] == 'podif') { @@ -1684,18 +1684,20 @@ class BranchingAjax { } echo '

    '; - - //echo ''; - echo ''; + + echo '
    '; + echo ''; + echo '
    '; } else { echo '

    '.$lang['srv_check_pogoji_not_ok'].'

    '; echo ''; echo '

    '.$lang['srv_check_pogoji_not_ok_txt'].'

    '; - - //echo ''; - echo ''; + + echo '
    '; + echo ''; + echo '
    '; } } } @@ -1789,7 +1791,6 @@ class BranchingAjax { $results = $_POST['results']; $status1 = $_POST['status1']; - $status2 = $_POST['status2']; if($what == 'finish_author' || $what == 'finish_respondent_cms' || $what == 'finish_respondent' || $what == 'finish_other' | $what == 'finish_other_emails') { sisplet_query("INSERT INTO srv_alert (ank_id, $what) VALUES ('$this->anketa', '$results') @@ -1800,7 +1801,7 @@ class BranchingAjax { } $b = new Branching($this->anketa); - $b->toolbox_settings($status1, $status2); + $b->toolbox_settings($status1); } @@ -2323,19 +2324,27 @@ class BranchingAjax { global $site_url; $rowanketa = SurveyInfo::getInstance()->getSurveyRow(); - - echo '
    '; - echo ''; - + + echo ''; + + echo '
    '; + + if($_GET['a'] == 'comment_manage') + echo ' '; + else + echo ' '; + + echo ' '; + echo '
    '; + if (($type == 0 || $view==3) && ($admin_type == 0 || $global_user_id==$rowanketa['insert_uid'])) { - - echo '
    '; + echo '
    '; // Link na pregled splosnih komentarjev - echo ''.$lang['srv_comment_overview'].''; + echo ''.$lang['srv_comment_overview'].''; // Link na nastavitve komentarjev - echo ''.$lang['settings'].''; + echo ''.$lang['settings'].''; echo '
    '; } @@ -2669,6 +2678,30 @@ class BranchingAjax { $b->repare_condition($if); $b->calculation_editing_inner($condition); } + + function ajax_quota_sort() { + Common::getInstance()->Init($this->anketa); + Common::getInstance()->updateEditStamp(); + + $condition = $_POST['condition']; + $sortable = $_POST['sortable']; + $sortable = explode('&', $sortable); + + $i=1; + foreach ($sortable AS $val) { + $quota = explode('=', $val); + $quota = $quota[1]; + + $s = sisplet_query("UPDATE srv_quota SET vrstni_red='{$i}' WHERE id='{$quota}'"); + if (!$s) echo mysqli_error($GLOBALS['connect_db']); + + $i++; + } + + $b = new Branching($this->anketa); + $b->repare_condition($if); + //$b->calculation_editing_inner($condition); + } function ajax_spremenljivka_preview_print() { global $lang; @@ -2693,11 +2726,11 @@ class BranchingAjax { '; - echo ' '.$lang['hour_print2'].''; - echo '
    '; + echo ''; + include_once('../../main/survey/app/global_function.php'); new \App\Controllers\SurveyController(true); @@ -2715,7 +2748,7 @@ class BranchingAjax { save('forceShowSpremenljivka', true); \App\Controllers\Vprasanja\VprasanjaController::getInstance()->displaySpremenljivka($_GET['spremenljivka']); } - + ?> @@ -2725,7 +2758,7 @@ class BranchingAjax { function ajax_toolbox_add_advanced () { $b = new Branching($this->anketa); - $b->toolbox_add_advanced(); + $b->toolbox_add_advanced($popup=true); } function ajax_toggle_toolbox () { @@ -2759,15 +2792,27 @@ class BranchingAjax { echo ''; - echo '

    '.$lang['srv_find_replace'].'

    '; + echo '

    '.$lang['srv_find_replace'].'

    '; - echo '

    '.$lang['srv_find_text'].'

    '; - - echo '

    '; - echo '

    '; - - echo ''; - echo ''; + echo '

    '.$lang['srv_find_text'].'

    '; + + echo '
    '; + echo '

    '.$lang['srv_find'].':

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo '

    '.$lang['srv_replace_with'].':

    '; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; } function ajax_find_replace_count() { diff --git a/admin/survey/Glasovanje.php b/admin/survey/Glasovanje.php index aab7be0ef..60e92185d 100644 --- a/admin/survey/Glasovanje.php +++ b/admin/survey/Glasovanje.php @@ -100,222 +100,238 @@ class Glasovanje { global $site_path; global $admin_type; - echo '
    '.NEW_LINE; - echo '
    '.NEW_LINE; - echo '
    ' . $lang['srv_glasovanja_settings'] . Help :: display('srv_type_glasovanje') . '
    ' . NEW_LINE; - echo '
    '; - echo '
    '; + echo '
    '; + echo $lang['srv_glasovanja_settings'].Help :: display('srv_type_glasovanje'); echo '
    '; $sql2 = sisplet_query("SELECT * FROM srv_glasovanje WHERE ank_id='$this->anketa'"); $row2 = mysqli_fetch_array($sql2); $row = Cache::srv_spremenljivka($row2['spr_id']); - $rowA = SurveyInfo::getInstance()->getSurveyRow(); - //Vkljucenost ankete (embeddana ali samostojna) + + // Vkljucenost ankete (embeddana ali samostojna) echo '
    '; - echo '' . $lang['glasovanja_embed'] . ''; - echo '
    '; - echo ' '; + + echo '
    ' . $lang['glasovanja_embed'] . ':
    '; + echo '
    '; + echo ' '; + echo '
    '; + echo '
    '; + echo ' '; + echo '
    '; + echo '
    '; - //Izbira spola ob resevanju + // Izbira spola ob resevanju echo '
    '; - echo '' . $lang['glasovanja_spol'] . ''; - //echo ''; - echo ' '; - echo ' '; - echo '
    '; + + echo '
    ' . $lang['glasovanja_spol'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo ''; - //Prikaz dodatnih strani + // Prikaz dodatnih strani echo '
    '; - echo '' . $lang['glasovanja_strani'] . ''; - echo ''; - echo ' '; - echo '
    '; + echo '
    ' . $lang['glasovanja_strani_intro'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    ' . $lang['glasovanja_strani_outro'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo '
    '; // Prikaz naslova... echo '
    '; - echo '' . $lang['glasovanja_naslov'] . ''; - + // prikaz naslova ankete SurveySetting::getInstance()->Init($this->anketa); - $survey_hide_title = SurveySetting::getInstance()->getSurveyMiscSetting('survey_hide_title'); - echo ''; - echo ' '; - echo '
    '; - - //anketa v arhivu - prikaz arhiva - echo ''. Help :: display('srv_glasovanje_archive').''; - echo ' '; - echo '
    '; + $survey_hide_title = SurveySetting::getInstance()->getSurveyMiscSetting('survey_hide_title'); + echo '
    ' . $lang['glasovanja_results_survey_title'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + //anketa v arhivu - prikaz arhiva + echo '
    ' . $lang['glasovanja_results_archive'].' '.Help :: display('srv_glasovanje_archive').':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; - //Prikaz statistike - nastavitve + // Prikaz statistike - nastavitve echo '
    '; - echo '' . $lang['glasovanja_results'] . ''; - - //prikaz statistike - echo '
    '; - echo ' '; - echo ' '; - echo '
    '; - + + echo '
    ' . $lang['glasovanja_results'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + if($row['stat'] > 0){ // prikaz stevila glasov, v procentih in z grafom - echo '
    '; - echo '
    '; - echo ' '; - echo ' '; - echo '
    '; - echo '
    '; + echo '
    ' . $lang['glasovanja_results_type'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; // prikaz stevila glasov - echo '
    '; - echo ''; - echo ' '; - echo '
    '; - echo '
    '; + echo '
    ' . $lang['glasovanja_results_allcount'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; // prikaz casa glasovanja - echo '
    '; - echo ''; - echo ' '; - echo '
    '; - echo '
    '; + echo '
    ' . $lang['glasovanja_results_time'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; // prikaz naslova vprasanja - echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo '
    '; + echo '
    ' . $lang['glasovanja_results_title'] . ':
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; } + echo '
    '; // SPODNJE EXTRA NASTAVITVE - echo ''; - - // gumb VEC + // gumb VEC + echo ''; + + + echo ''; } /** @@ -326,7 +342,7 @@ class Glasovanje { $Branching = new Branching($this->anketa); - echo '
  • '; + echo '
  • '; $Branching->vprasanje($spremenljivka); @@ -386,15 +402,12 @@ class Glasovanje { // <-- Editor teksta vprasanja --- echo '
    '; echo '
    '.$text.'
    '; - echo '
    '; + // opomba if ($opomba != '') { - echo ''; - echo ''; - echo ''; - echo '
    '.$lang['note'].' ('.$lang['srv_internal'].'):'; - echo ''.$opomba.''; - echo '
    '; + echo '
    '; + echo '*'.$lang['note'].' ('.$lang['srv_internal'].'): '.$opomba; + echo '
    '; } echo '
    '; @@ -438,12 +451,10 @@ class Glasovanje { echo '
    '; echo '
    '; - //echo ''; echo $lang['srv_editor'] . ' »'; echo'
    '; echo '
    '; echo ''; - echo '
    '; // opomba echo ''; diff --git a/admin/survey/Help.php b/admin/survey/Help.php index ff64e211d..6174ca74d 100644 --- a/admin/survey/Help.php +++ b/admin/survey/Help.php @@ -7,7 +7,7 @@ class Help { * ce smo v editmodu se bo prikazal textbox za urejanje helpa * ce smo v navadnem modu se bo prikazal help box */ - public static function display ($what) { + public static function display ($what, $title='') { global $admin_type, $lang; $sql = sisplet_query("SELECT help FROM srv_help WHERE what='$what' AND lang='$lang[id]'"); @@ -15,10 +15,10 @@ class Help { $help = $row['help']; if ($admin_type == 0 && isset($_COOKIE['edithelp'])) { - return ' (?)'; + return ' '.(empty($title) ? '(?)' : '').''; } elseif ($help != '') { - return ' (?)'; + return ' '.(empty($title) ? '(?)' : '').''; } } @@ -29,10 +29,16 @@ class Help { static function edit_toggle () { global $lang; - if (isset($_COOKIE['edithelp'])) - echo ''; - else - echo ''; + if (isset($_COOKIE['edithelp'])) { + echo '
    '; + echo ''; + echo '
    '; + } + else { + echo '
    '; + echo ''; + echo '
    '; + } } function ajax () { diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index c22623669..0d2658644 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -110,6 +110,14 @@ class SurveyAdmin var $full_screen_edit = false; # ali ima uporabnik nastavljeno da ureja vprašanja v fullscreen načinu var $isAnketar = false; # Ali je uporabnik anketar ankete privzeto je ne + var $first_action = ''; // Prvi nivo navigacije kjer se nahajamo + var $second_action = ''; // Drugi nivo navigacije kjer se nahajamo + var $third_action = ''; // Tretji nivo navigacije kjer se nahajamo + + var $layout_width = ''; // Layout strani kjer se nahajamo - "fullwidth", "wide" ali "narrow" + var $layout_menu = ''; // Layout strani kjer se nahajamo - "menu_lef" (prisoten levi meni) + + /** * @desc konstruktor */ @@ -266,6 +274,18 @@ class SurveyAdmin global $site_domain; + // prvi in drugi nivo (tretji samo za mobilno navigacijo) + $navigationArray = CrossRoad::MainNavigation($this->anketa, true); + $this->first_action = $navigationArray['first_action']; + $this->second_action = $navigationArray['second_action']; + $this->third_action = $navigationArray['third_action']; + + // Layout strani + $this->layout_width = $navigationArray['layout_width']; + $this->layout_menu = $navigationArray['layout_menu']; + $this->hide_header = $navigationArray['hide_header']; + + echo '
    '; @@ -273,20 +293,11 @@ class SurveyAdmin echo '
    '; // DESKTOP HEADER - echo '
    '; - - // Nastavitve zgoraj desno v headerju (search, help, profil...) - $this->displayHeaderRight(); - - // logotip - $this->displayHeaderLogo(); + echo '
    '; // Znotraj posamezne ankete if($this->anketa > 0){ - // Utripajoc napis "Demo anketa" - $this->displayHeaderDemoSurvey(); - // Prikaze podatke o anketi in navigacijo - na vrhu (top bar) $this->displayHeaderAnketa(); } @@ -310,7 +321,7 @@ class SurveyAdmin /********************* MAIN *********************/ - echo '
    '; + echo '
    '; // SEZNAM ANKET - Ce ni nastavljene ankete, potem prikazujemo seznam na prvi strani *****/ if (!($this->anketa > 0)) { @@ -321,7 +332,7 @@ class SurveyAdmin echo '
    '; // breadcrumbs - echo '
    '; + + echo ''; + echo ''; + echo ''; + echo ''; + + if($spr_id > 0){ + $vrednosti = $ss->getVrednosti($spr_id); + if($vrednosti != 0){ + foreach($vrednosti as $vrednost){ + echo ''; + echo ''; + echo ''; + echo ''; + } + } + } + + echo '
    '.$lang['password'].'
    '.$vrednost['naslov'].'
    '; + echo '
  • '; + + + echo ''; echo ''; } @@ -720,18 +1064,10 @@ class SurveyAdminSettings { echo ''.$lang['back'] . ''; } } - echo ''; - echo $lang['edit1337'] . ''; - - /* - $http_referer = parse_url($_SERVER['HTTP_REFERER']); //If yes, parse referrer - $referer_url = $http_referer['query']; - if (preg_match('/anketa='.$this->anketa.'&a'.A_VABILA.'/', $referer_url)) { - echo ''; - echo ''; - } - */ + echo '
    '; + echo ''; + echo ''; + echo '
    '; } /*Respondenti*/ @@ -795,7 +1131,17 @@ class SurveyAdminSettings { $preview_disable_test_insert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disable_test_insert'); if ( isset($_GET['show']) && $_GET['show']=='on_alert' ) { - echo '
    '.$lang['srv_comments_on_alert'].' '.$lang['srv_off'].'. '.$lang['srv_comments_on_alert2'].' '.$lang['srv_anl_more'].'
    '; + echo '
    '; + + echo '
    '.$lang['srv_comments_on_alert'].'
    '; + + echo '
    '; + echo $lang['srv_comments_on_alert1'].' '.$lang['srv_here'].'. '; + echo $lang['srv_comments_on_alert2']; + echo ' '.$lang['srv_more_info'].'.'; + echo '
    '; + + echo '
    '; } $css_width = ''; @@ -804,41 +1150,45 @@ class SurveyAdminSettings { $css_width2 = 'width:45% !important;'; } - echo '
    '.$lang['comments'].''; + echo '
    '.$lang['comments'].''; - echo '


          ('.$lang['srv_comments_admin_note1'].')

    '; - echo '


          ('.$lang['srv_comments_resp_note2'].')

    '; - echo '


          ('.$lang['srv_comments_admin_note2'].')

    '; - echo '


          ('.$lang['srv_comments_resp_note'].')

    '; + echo '

    '.$lang['srv_admin_s_comments_editor'].'

    '; + echo '
    '; + echo ''; + echo '

    ('.$lang['srv_comments_admin_note1'].')

    '; + echo '
    '; + echo '
    '; + echo ''; + echo '

    ('.$lang['srv_comments_admin_note2'].')

    '; + echo '
    '; + + echo '

    '.$lang['srv_admin_s_comments_resp'].'

    '; + echo '
    '; + echo ''; + echo '

    ('.$lang['srv_comments_resp_note2'].')

    '; + echo '
    '; + echo '
    '; + echo ''; + echo '

    ('.$lang['srv_comments_resp_note'].')

    '; + echo '
    '; + + echo '

    '.$lang['srv_admin_s_comments_links'].'

    '; + + echo ''; echo '
    '; @@ -878,6 +1228,9 @@ class SurveyAdminSettings { if ( ( !check_comments_admin() && !check_comments_admin_off() ) || ( !check_comments_resp() && !check_comments_resp_off() ) ) { $('#komentarji_napredno').show(); + $('#komentarji_napredno_arrow').addClass('minus'); + $('#komentarji_napredno_arrow').removeClass('plus'); + $('#more_comments').removeClass('border_blue'); } }); @@ -886,71 +1239,105 @@ class SurveyAdminSettings { if ($survey_comment != "") { - echo '
    '.$lang['srv_admin_s_comments'].''; - //echo '
    '; - echo ''; - - echo '

    '; - echo '

    '; - - echo '
    '.$lang['srv_admin_s_comments'].''; + echo ''; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + + echo ''; + echo '
    '; - echo ' - '; - //echo ''; echo '
    '; - echo '
    '; - } - echo '
    '; + + echo '
    '.$lang['srv_admin_s_comments'].''.$lang['srv_admin_s_comments_txt'].''; + + echo '
    '; + echo '' . $lang['srv_comments_write'] . ':'; + + echo '
    '; + echo ''; - echo '
    '; - echo ''; - echo ''; //echo ''; echo ''; echo ''; echo ''; echo ''; echo ' '; - echo $lang['srv_comments_viewauthor']; - echo ''; - echo '
    '; - echo ''; - echo ' '; - echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '' . $lang['srv_survey_comment_show'] . ':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    '; + echo '
    '; echo '' . $lang['srv_admin_q_notes'] . ''.$lang['srv_admin_q_notes_txt'].''; - echo ''; - echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; - echo '
    '; - echo ''; - echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; - echo ' '; + echo ''; + echo ''; + + echo ''; + echo '
    '; - echo '
    '; - echo '
    '; + echo '
    '; echo '' . $lang['srv_admin_q_comments'] . ''.$lang['srv_admin_q_comments_txt'].''; - echo ''; - echo ''; echo ''; echo ''; echo ''; @@ -1010,30 +1436,55 @@ class SurveyAdminSettings { echo ''; echo ''; echo ''; - echo '
    '; - echo ''; - echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; - echo ' '; - echo $lang['srv_comments_viewauthor']; - echo ''; - echo '
    '; - echo '
    '; - + echo ''; + echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo ''; - echo '
    '; - echo '' . $lang['srv_comments_respondents'] . ''.$lang['srv_comments_respondents_txt'].''; - - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ''; + echo ' '; + echo ''; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo ''; + + echo '
    '; + echo '' . $lang['srv_comments_view'] . ':'; + + echo '
    '; + echo ''; - echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ''; - echo ''; - echo '
    '; - echo '
    '; - - echo '
    '; - echo '' . $lang['srv_comments_respondents'] . ' - '.$lang['srv_extra_settings'].''; - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo ' '; - /*echo '
    '; - echo '
    '; - echo ''; - echo ' ' . strlen($srv_qct) . '/250' . "\n\r";*/ - echo '
    '; - echo '
    '; - - echo '
    '.$lang['srv_comments_respondents'].''.$lang['srv_resp_s_comments_txt'].''; + echo ''; + + echo ''; - echo ''; - echo ''; + echo ' '; + echo ''; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo ''; + + echo '
    '; + echo '' .$lang['text'].' "'. $lang['srv_question_respondent_comment'] . '":'; + + echo '
    '; + echo ''; + echo '';echo '
    '; + + echo '
    '; + + echo '

    '.$lang['srv_resp_s_comments_txt'].'

    '; + + echo '
    '; + echo '' . $lang['srv_comments_write'] . ':'; + + echo '
    '; + echo ''; - echo '
    '; - echo ''; - echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; echo ' '; - echo $lang['srv_comments_viewauthor']; - echo ''; - /*echo '
    '; - echo ''; - echo ' '; - echo ' '; - */ + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '

    '.$lang['srv_extra_settings'].'

    '; + + echo '
    '; + echo '' . $lang['srv_q_inicialke'] . ':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '' . $lang['srv_q_inicialke_alert'] . ':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    '; + echo '
    '; echo '' . $lang['srv_settings_komentarji'] . ''; - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ' '; - echo ' '; - echo '
    '; - echo ''; - echo ''; + echo ' '; + echo ''; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo ''; + + echo '
    '; + echo '' . $lang['srv_add_comment'] . ':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '' . $lang['srv_comments_marks'] . ':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '' . $lang['srv_comments_marks_who'] . ':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '' . $lang['srv_comment_history'] . ':'; + + echo '
    '; + echo ''; - echo '
    '; + echo '
    '; + + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    ' . $lang['srv_delete_comments'] . ''; - echo '

    '.$lang['srv_delete_comments3'].' ('.$lang['srv_delete_comments_txt2'].')

    '; - echo '
    '; + echo '

    '.$lang['srv_delete_comments3'].' ('.$lang['srv_delete_comments_txt2'].')

    '; echo ''; - echo '
    '; } } /*Dostop*/ if ($_GET['a'] == 'dostop') { - + // tukaj bom dodal še kontrolo na Avtorja ankete, tako da avtor lahko vedno spreminja dostop (gorazd,1.9.2009) $stringDostopAvtor = "SELECT count(*) as isAvtor FROM srv_dostop WHERE ank_id = '" . $this->anketa . "' AND (uid='" . $global_user_id . "' OR uid IN (SELECT user FROM srv_dostop_manage WHERE manager='$global_user_id' ))"; $sqlDostopAvtor = sisplet_query($stringDostopAvtor); @@ -1147,26 +1684,26 @@ class SurveyAdminSettings { if ($admin_type <= $row['dostop'] || $rowDostopAvtor['isAvtor'] > 0) { - echo '
    ' . $lang['srv_dostop_users'] . '' . Help :: display('srv_dostop_users'). ''."\n"; + echo '
    ' . $lang['srv_dostop_users'] . '' . Help :: display('srv_dostop_users'). ''; - if($admin_type == 0 || $admin_type == 1){ + //Dodajanje dostopa - prikaži vse za admine - potrebuje prenovo + /**if($admin_type == 0 || $admin_type == 1){ + echo ''; + }**/ echo '
    '; $this->display_dostop_users(0); echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; echo '
    '; - echo '
    '; - - echo ''; - echo '
    '; - echo '
    '; - // Dodajanje uproabnikov preko e-maila echo '
    '.$lang['srv_dostop_addusers'].''; @@ -1200,10 +1737,10 @@ class SurveyAdminSettings { include($file); - echo '
    '.$lang['srv_extra_translations'].' '; + echo '
    '.$lang['srv_extra_translations'].' '; if ($row['multilang'] == 1) { - echo ' '; $lang_id = (int)$_GET['lang_id']; if ($lang_id > 0) @@ -1227,33 +1764,26 @@ class SurveyAdminSettings { if ($row['multilang'] == 1 && $lang_id > 0) { //echo '

    '.SurveyInfo::getSurveyLink().'?language='.$lang_id.'

    '; } - echo '

    '.$lang['srv_info_language'].'

    '; - echo '
    '; echo ''; // da vemo, da nastavljamo ta besedila + + // Tabela standardnih besed + echo ''; + echo ''; - echo '

     '.($lang_id>0?$lang['srv_multilang']:$lang['srv_language_respons_1']).':'; - + echo '

    '; + echo ''; + + // nazaj na administrativni jezik $file = '../../lang/'.$lang_admin.'.php'; include($file); - - echo '

    '; - - echo ''.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).''; - echo ''.$lang['srv_std_second'].''; - echo ''; - echo ''.$lang['srv_std_translation'].' '; - - echo '


    '; - - echo '

    '; + echo '

    '; + echo ''; // jezik nastavimo na nastavitev za respondente, ker ta text dejansko nastavljamo $file = '../../lang/'.$lang_resp.'.php'; @@ -1305,33 +1835,43 @@ class SurveyAdminSettings { $this->extra_translation('srv_survey_non_active_notStarted', 1); $this->extra_translation('srv_survey_non_active_expired', 1); $this->extra_translation('srv_survey_non_active_voteLimit', 1); - - - echo '

    '; - + // nastavimo jezik nazaj $file = '../../lang/'.$lang_admin.'.php'; include($file); - - echo '
    '; - - echo ''; - - echo '
    '; - - - echo ''; + echo '
    '.($lang_id>0?$lang['srv_language_respons_1'].': '.$resp_lang['language']:$lang['srv_language_admin'].': '.$lang['language']).''.$lang['srv_std_second'].': '; $file = '../../lang/'.$lang_resp.'.php'; include($file); - echo ' '.$lang['language'].'

    '; - - // nazaj na administrativnega + echo $lang['language'].'
    '.$lang['srv_std_translation'].'
    '; + + echo '
    '; // Gumb za ponastavitev prevoda v bazi pobriše že nastavljene prevode za izbran jezik - echo ''; + echo '
    '; + echo ''; + echo '
    '; + + // Ta del se v 2. fazi zamenja z gumbom "Večjezične ankete" + echo '
    '; + echo '

    '.$lang['srv_language_link2'].':'; + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik + $userAccess = UserAccess::getInstance($global_user_id); + if($userAccess->checkUserAccess($what='prevajanje')){ + echo ' '.$lang['srv_language_link'].'

    '; + } + else{ + echo ' '.$lang['srv_language_link'].'

    '; + } + echo '

    '.$lang['srv_language_mySurveys'].'.

    '; - echo ''.$lang['lang'].''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + } /*Forma*/ if ($_GET['a'] == 'forma') { @@ -1340,40 +1880,71 @@ class SurveyAdminSettings { /*Nastavitve prikaza za mobilnike*/ if ($_GET['a'] == 'mobile_settings') { - SurveySetting::getInstance()->Init($this->anketa); - - echo '
    '; + SurveySetting::getInstance()->Init($this->anketa); + echo '
    '; - echo ''.$lang['srv_mobile_settings_title'].''; + echo ''.$lang['srv_mobile_settings_title'].Help::display('srv_mobilne_tabele').''; // Prikaz slik pri mobilnikih (default da) $mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly'); - echo ''.$lang['srv_settings_mobile_friendly'].':'; - echo ' '; - echo ' '; + echo '
    '; + + echo ''.$lang['srv_settings_mobile_friendly'].':'; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - $display = ($mobile_friendly == 1) ? '' : ' display: none;'; - echo '
    '; + echo '
    '; + + $display = ($mobile_friendly == 1) ? '' : 'displayNone'; + + echo '
    '; // Prikaz slik pri mobilnikih (default da) $hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img'); - echo ''.$lang['srv_settings_mobile_img'].':'; - echo ' '; - echo ' '; - - echo ''; + echo '
    '; + + echo ''.$lang['srv_settings_mobile_img'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + // Prilagoditev tabel pri mobilnikih $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables'); - echo ''.$lang['srv_settings_mobile_tables'].':'; - echo ' '; - echo ' '; - echo ' '; - + echo '
    '; + + echo ''.$lang['srv_settings_mobile_tables'].':'; + echo '
    '; + echo ''; + echo ' '; echo '
    '; - - + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '
    '; } @@ -1388,76 +1959,138 @@ class SurveyAdminSettings { $date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date'); - echo '
    '; + echo '
    '; echo ''.$lang['srv_sledenje'].''; // Preverimo ce je vklopljen modul za volitve - potem ne pustimo nobenih preklopov $voting_disabled = ''; - $voting_disabled_class = ''; if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ $voting_disabled = ' disabled'; - $voting_disabled_class = ' class="gray"'; - echo '

    '.$lang['srv_voting_warning_paradata'].'

    '; + echo '

    '.$lang['srv_voting_warning_paradata'].'


    '; } - echo '

    '.$lang['srv_metadata_desc'].'

    '; - - echo ''; - echo ' '; - echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_metadata_desc'].'

    '; + echo '
    '; - echo ''; - echo ' '; - echo '
    '; + echo '
    '; + echo ''.$lang['srv_sledenje_browser'].':'; - echo ''; - echo ' '; - echo '
    '; - + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_sledenje_referal'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_sledenje_date'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo '
    '; - - echo '
    '; - - echo '
    '; echo ''.$lang['srv_sledenje_ip_title'].''; + + //Shranjuj IP naslov respondenta + echo '
    '; + echo ''.$lang['srv_sledenje_ip'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; - echo ''; - echo ' '; - echo ' '; + echo '
    '; + + echo '
    '; + echo '

    '.$lang['srv_sledenje_ip_alert'].'


    '; + echo '
    '; + + //Poveži IP v bazi s podatki + if ($admin_type == 0 || $admin_type == 1){ + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_show_ip'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; - if($ip == 0 && $ip_show != 1) - echo '
    '.$lang['srv_sledenje_ip_alert'].'
    '; - - echo '
    '; - - if($ip == 0 && ($admin_type == 0 || $admin_type == 1)){ - echo ''; - echo ' '; - echo ' '; - - if($ip_show == 1) - echo '
    '.$lang['srv_show_ip_alert'].'
    '; - } + echo '
    '; + + echo '
    '; + echo '

    '.$lang['srv_show_ip_alert'].'

    '; + echo '
    '; + + echo '
    '; + } echo '
    '; // Povezovanje identifikatorjev s podatki - samo za admine in ce so vklopljena email vabila if ($admin_type == 0 && SurveyInfo::getInstance()->checkSurveyModule('email')) { - echo '
    '; - echo '
    '; + echo '
    '; echo ''.$lang['srv_sledenje_identifikatorji_title'].' '.Help::display('srv_email_with_data').''; + + echo '
    '; + echo ''.$lang['srv_sledenje_identifikatorji'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; - echo ''; - echo ' '; - echo ' '; + echo '
    '; - if($row['show_email'] == 1) - echo '
    '.$lang['srv_show_mail_with_data3'].'
    '; + echo '
    '; + echo '

    '.$lang['srv_show_mail_with_data3'].'.

    '; + echo '
    '; echo '
    '; } @@ -1469,100 +2102,172 @@ class SurveyAdminSettings { SurveySetting::getInstance()->Init($this->anketa); // Nastavitve za izpis vprasalnika - echo '
    '; + echo '
    '; echo ''.$lang['srv_export_survey_settings'].''; // Številčenje vprašanj (default da) $export_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_numbering'); - echo ''.$lang['srv_nastavitveStevilcenje'].':'; - echo ' '; - echo ' '; - - echo '
    '; + echo '
    '; + echo ''.$lang['srv_nastavitveStevilcenje'].':'; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + // Prikaz pogojev (default da) $export_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_show_if'); - echo ''.$lang['srv_export_if'].':'; - echo ' '; - echo ' '; + echo '
    '; + echo ''.$lang['srv_export_if'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '
    '; + echo '
    '; // Prikazi uvoda (default ne) $export_show_intro = SurveySetting::getInstance()->getSurveyMiscSetting('export_show_intro'); - echo ''.$lang['srv_export_intro'].':'; - echo ' '; - echo ' '; - + echo '
    '; + echo ''.$lang['srv_export_intro'].':'; + + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + + echo '
    '; + echo '
    '; - echo '
    '; - - // Nastavitve za izpis odgovorov respondentov - echo '
    '; + echo '
    '; echo ''.$lang['srv_export_results_settings'].''; + echo '
    '; + // Tip izvoza (1->dolg oz. razsirjen, 2->kratek oz. skrcen) $export_data_type = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_type'); - echo ''.$lang['srv_displaydata_type'].':'; - echo ''; echo ' '; echo ' '; - //echo ' '; echo ''; - echo Help :: display('displaydata_pdftype'); - - echo '
    '; + echo '
    '; + + echo '
    '; // Številčenje vprašanj (default da) $export_data_numbering = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_numbering'); - echo ''.$lang['srv_nastavitveStevilcenje'].':'; - echo ' '; - echo ' '; + echo ''.$lang['srv_nastavitveStevilcenje'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '
    '; + echo '
    '; + + echo '
    '; // Prikaz recnuma (default da) $export_data_show_recnum = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_recnum'); - echo ''.$lang['srv_export_show_recnum'].':'; - echo ' '; - echo ' '; + echo ''.$lang['srv_export_show_recnum'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '
    '; + echo '
    '; + echo '
    '; + // Prikaz pogojev (default da) $export_data_show_if = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_show_if'); - echo ''.$lang['srv_export_if'].':'; - echo ' '; - echo ' '; + echo ''.$lang['srv_export_if'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '

    '; + echo '
    '; + + echo '
    '; // Page break med posameznimi respondenti (default ne) $export_data_PB = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_PB'); - echo ''.$lang['srv_export_pagebreak'].':'; - echo ' '; - echo ' '; + echo ''.$lang['srv_export_pagebreak'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '
    '; + echo '
    '; + + echo '
    '; // Izpusti vprasanja brez odgovora (default ne) $export_data_skip_empty = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty'); - echo ''.$lang['srv_export_skip_empty'].':'; - echo ' '; - echo ' '; + echo ''.$lang['srv_export_skip_empty'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '
    '; + echo '
    '; + echo '
    '; + // Izpusti podvprasanja brez odgovora (default ne) $export_data_skip_empty_sub = SurveySetting::getInstance()->getSurveyMiscSetting('export_data_skip_empty_sub'); - echo ''.$lang['srv_export_skip_empty_sub'].':'; - echo ' '; - echo ' '; + echo ''.$lang['srv_export_skip_empty_sub'].':'; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; + echo '
    '; + echo ''; + echo ' '; + echo '
    '; - echo '
    '; + echo '
    '; echo '
    '; } @@ -1576,16 +2281,16 @@ class SurveyAdminSettings { if ($_GET['a'] != 'jezik' && $_GET['a'] != 'trajanje' && $_GET['a'] != A_GDPR && $_GET['a'] != 'dostop') { - echo '
    '; - - echo ''; - echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; } if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } echo ''; @@ -1637,7 +2342,7 @@ class SurveyAdminSettings { echo '

    '; echo '

    '; # replyTo - echo '

    '; + echo '

    '; echo '

    '; echo ''; @@ -1648,7 +2353,7 @@ class SurveyAdminSettings { echo '

    '; echo '

    '; # replyTo - echo '

    '; + echo '

    '; echo '

    '; #Password echo '

    '; @@ -1665,7 +2370,7 @@ class SurveyAdminSettings { echo '

    '; echo '

    '; # replyTo - echo '

    '; + echo '

    '; echo '

    '; #Username echo '

    '; @@ -1703,7 +2408,6 @@ class SurveyAdminSettings { echo ''; echo '

    '; - echo '
    '; echo ''; echo ''; } - echo '
    '; - if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } } @@ -1751,28 +2453,52 @@ class SurveyAdminSettings { if($text == 'srv_nextpage_uvod') $next_uvod = $lang_id == '' ? $admin_lang['srv_nextpage_uvod_desc'] : $resp_lang['srv_nextpage_uvod_desc']; - echo '
    '.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? '('.$next_uvod.')' : '').' '; - echo ''.$lang[$text].' '; - echo '
    '.$value.'
    '; - + echo '
    '.($lang_id==''?$admin_lang[$text]:$resp_lang[$text]).' '.($text == 'srv_nextpage_uvod' ? ' ('.$next_uvod.')' : '').''.$lang[$text].'
    '.$value.'
    '; + if($editor == 1) - echo ''; - + echo ''; + echo ''; + echo '
    '; + echo ''; + echo ''; + echo ''; + echo ''; + + $table_exists = 1; + } + + echo ''; + echo ''; + echo ''; + echo ''; + } + + if ($table_exists == 1) + echo '
    '.$lang['srv_nice_url_extension'].''.$lang['srv_nice_url_surveyname'].'
    '.$row['link'].''.$row['naslov'].'
    '; + + echo ''; echo ''; } @@ -1803,14 +2529,38 @@ class SurveyAdminSettings { global $lang; echo '
    '; + + echo '
    '.$lang['srv_anketa_deleted'].''; $sql = sisplet_query("SELECT srv_anketa.id, srv_anketa.naslov, users.email FROM srv_anketa, users WHERE users.id=srv_anketa.insert_uid AND active='-1' ORDER BY edit_time DESC"); if (!$sql) echo mysqli_error($GLOBALS['connect_db']); - - while ($row = mysqli_fetch_array($sql)) { - echo '

    '.$row['naslov'].' ('.$row['email'].') '.$lang['srv_restore'].'

    '; + + + $table_exists = 0; + while ($row = mysqli_fetch_array($sql)) { + if ($table_exists == 0) { + echo '

    '.$lang['srv_anketa_deleted_note'].'

    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + $table_exists = 1; + } + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; } + + if ($table_exists == 1) + echo '
    '.$lang['srv_data_deleted_surveyname'].''.$lang['srv_data_deleted_user'].'
    '.$row['naslov'].''.$row['email'].'
    '; + echo '
    '; echo '
    '; } @@ -1822,14 +2572,39 @@ class SurveyAdminSettings { global $lang; echo '
    '; - + + echo '
    '.$lang['srv_data_deleted'].''; + $sql = sisplet_query("SELECT a.id, a.naslov, users.email, COUNT(u.id) AS deleted FROM srv_anketa a, srv_user u, users WHERE u.deleted='1' AND u.ank_id=a.id AND users.id=a.insert_uid GROUP BY a.id ORDER BY edit_time DESC"); if (!$sql) echo mysqli_error($GLOBALS['connect_db']); - while ($row = mysqli_fetch_array($sql)) { - echo '

    '.$row['naslov'].' ('.$row['email'].') '.$lang['srv_restore'].' ('.$row['deleted'].')

    '; + $table_exists = 0; + while ($row = mysqli_fetch_array($sql)) { + if ($table_exists == 0) { + echo '

    '.$lang['srv_data_deleted_note'].'

    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + $table_exists = 1; + } + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; } + + if ($table_exists == 1) + echo '
    '.$lang['srv_data_deleted_surveyname'].''.$lang['srv_data_deleted_user'].''.$lang['srv_data_deleted'].'
    '.$row['naslov'].''.$row['email'].''.$row['deleted'].'
    '; + echo '
    '; echo '
    '; } @@ -1843,8 +2618,6 @@ class SurveyAdminSettings { global $lang; if ($_GET['m'] == '' || $_GET['m'] == 'settings') { $this->anketa_vabila_nastavitve(); - } elseif ($_GET['m'] == 'url') { - $this->anketa_vabila_url(); } } @@ -1854,442 +2627,235 @@ class SurveyAdminSettings { $row = SurveyInfo::getInstance()->getSurveyRow(); $d = new Dostop(); - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - - # če ni aktivna damo opozorilo - echo ''; - - # Povezave, lepi linki... - echo ''; - /* # Opozorilo o napakah - echo '';*/ - - echo ''; - - echo ''; - - echo ''; + //HTML koda + števec + echo '
    '; + echo '
    '; + echo '
    '; + echo $lang['srv_anketa_href_count']; + echo '
    '; + echo $lang['srv_anketa_href_count_text']; + echo '
    '; - echo ''; + //QR koda + echo '
    '; + echo '
    '; + echo '
    '; + echo $lang['srv_anketa_href_friends']; + echo '
    '; + echo $lang['srv_anketa_href_friends_text']; + echo '
    '; + + // iFrame - js + echo '
    '; + echo '
    '; + echo '
    '; + echo $lang['srv_anketa_href_ijs']; + echo '
    '; + echo $lang['srv_anketa_href_ijs_text']; + echo '
    '; - echo ''; - - echo '
    '; - + # Opozorilo o napakah $sd = new SurveyDiagnostics($this->anketa); $sd->doDiagnostics(); $diagnostic = $sd->getDiagnostic(); - if (is_array($diagnostic) && count($diagnostic) > 0) - echo '
    '.$lang['srv_publication_survey_warnings'].' >>
    '; - - // Aktivacija ankete - echo ''; - $this->anketa_aktivacija_note(); - echo''; - - echo '
    '; - - # Linki, lepi linki - $this->niceUrlSettings(); - - echo '
    '; - - // Napredne URL povezave - echo '
    '; - //echo ''.$lang['srv_publication_advanced_url'].''; - echo ''; - echo '

    '.$lang['srv_publication_advanced_url_text'].'

    '; - echo '
    '; - - echo '
    '; - - // Individualizirana vabila - echo '
    '; - //echo ''.$lang['srv_publication_invitations'].''; - echo ''; - echo '

    '.$lang['srv_publication_invitations_text'].'

    '; - echo '
    '; - - echo '
    '; - $sd = new SurveyDiagnostics($this->anketa); - $sd->doDiagnostics(); - $diagnostic = $sd->getDiagnostic(); if (is_array($diagnostic) && count($diagnostic) > 0) { - echo ''; - $this->anketa_diagnostika_note($sd, $d->checkDostopSub('test')); - echo''; + + echo '
    '; + echo '
    '; + echo ' '.$lang['srv_warning']; + echo ''; + echo '
    '; + echo $lang['srv_publication_survey_warnings'].'\''.$lang['srv_testiranje'].'\'.'; + echo '
    '; } - echo '
    '; - echo ''; - - $base_url = $site_url.'admin/survey/index.php?anketa='.$this->anketa; - # preberomo osnovne nastavitve - $row = SurveyInfo::getInstance()->getSurveyRow(); - - echo '
    '.($row['active']==0 ? $lang['srv_default_setting_unactive'] : $lang['srv_default_setting']).''; + + # Opozorilo - anketa ni aktivna + if ($row['active']==0) { + echo '
    '; + echo '
    '; + echo ' '.$lang['srv_publication_survey_noactive']; + echo '
    '; + echo '

    '.$lang['srv_publication_survey_noactive_note'].'

    '; + + + echo '
    '; - // Ce imamo dostop do zavihka urejanje - if($d->checkDostopSub('edit')){ + echo '

    '.$lang['srv_anketa_noactive2'].'

    '; + + //Toggle kopiran iz headerja + if (SurveyInfo::getSurveyColumn('active') == 1) { + + # anketa je aktivna + # V kolikor gre za hierarhijo in uporabnik ni administrator hierarhije + if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){ + if ($hierarhija_type == 1) { + echo ''; + } + else{ + echo ''; + } + } + else { + echo ''; + } + + echo '
    ON
    '; + + echo '
    '; + } + else { + $anketa_active = "anketa_active('" . $this->anketa . "','" . $row['active'] . "'); "; + + //Preden anketo aktiviramo preverimo, če gre tudi za izgradnjo hierarhije in če anketa še ni bila aktivirana + if (SurveyInfo::getInstance()->checkSurveyModule('hierarhija')){ + if ($hierarhija_type == 1) { + echo ''; + } else{ + echo ''; + } + } + else { + echo ''; + } + + if ((int)$_last_active > 0) { + # anketa je zaključena + echo '
    OFF
    '; + } + else { + # anketa je neaktivna + echo '
    OFF
    '; + } + + echo '
    '; + } + + echo '
    '; + + echo '

    '.$lang['srv_publication_survey_noactive_note2'].'

    '; + + echo '
    '; + + } + + // Delite povezavo do ankete + echo '

    '.$lang['srv_publication_survey_links'].'

    '; + + echo '

    '.$lang['srv_publication_survey_links_note'].'

    '; + + + //Lep URL - dodajanje + // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik + $userAccess = UserAccess::getInstance($global_user_id); + if(!$userAccess->checkUserAccess($what='nice_url')){ + + echo '
    '; + + echo '
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo ' '; + echo '
    '; + + echo ' '; - # Trajanje - $starts = explode('-',$row['starts']); - $starts = $starts[2].'.'.$starts[1].'.'.$starts[0]; - $expire = explode('-',$row['expire']); - $expire = $expire[2].'.'.$expire[1].'.'.$expire[0]; - echo '

    '.$lang['srv_starts'].':'.$starts.'

    '; - if ( $row['expire'] == PERMANENT_DATE ) { - #trajna - echo '

    '.$lang['srv_trajna_anketa'].':'.($row['expire'] == PERMANENT_DATE ? $lang['yes'] : $lang['no']).'

    '; - } else { - echo '

    '.$lang['srv_expire'].':'.$expire.'

    '; - } + echo '
    '; + } + else{ + + echo '
    '; + + echo '
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo ' '; + echo '
    '; + + // Gumb za dodajanje lepega linka + echo ' '; + + echo '
    '; + + echo '
    '; + echo $site_url; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; + + echo '
    '; + + + if (isset($_GET['error'])) { + + ?>'; + + // Prekratek lep url + if(strlen($_GET['error']) <= 2) + echo '

    '.$_GET['error'].' '.$lang['srv_nice_url_short'].'

    '; + // Predolg lep url + elseif(strlen($_GET['error']) > 20) + echo '

    '.$_GET['error'].' '.$lang['srv_nice_url_long'].'

    '; + // Ze obstaja + else + echo '

    '.$_GET['error'].' '.$lang['srv_nice_url_taken'].'

    '; - // Skin ankete - if ($row['skin_profile'] == 0) { - $skin_name = $row['skin']; - } - else { - $sqla = sisplet_query("SELECT name FROM srv_theme_profiles WHERE id = '".$row['skin_profile']."'"); - $rowa = mysqli_fetch_array($sqla); - $skin_name = $rowa['name']; + echo ''; } - //echo '

    '.$lang['srv_themes'].':'.$row['skin'].'

    '; - echo '

    '.$lang['srv_themes'].':'.$skin_name.'

    '; - - # Jezik - $lang_old = $lang; - $lang_admin = (int)$row['lang_admin']; - $lang_resp = (int)$row['lang_resp']; - $lang_array = array(); - $lang_array[0] = $lang['srv_language_not_set']; - // Preberemo razpoložljive jezikovne datoteke - if ($dir = opendir('../../lang')) { - while (($file = readdir($dir)) !== false) { - if ($file != '.' AND $file != '..') { - if (is_numeric(substr($file, 0, strpos($file, '.')))) { - $i = substr($file, 0, strpos($file, '.')); - $file = '../../lang/'.$i.'.php'; - if (file_exists($file)) { - include($file); - $lang_array[$i] = $lang['language']; - } - } - } - } - } - - // nastavimo jezik nazaj - /*$file = '../../lang/'.$lang_admin.'.php'; - if (file_exists($file)) { - include($file); - }*/ - $lang = $lang_old; - $resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang'); - //echo '

    '.$lang['srv_language_admin_1'].':

    '; - echo '

    '.$lang['srv_language_admin_0'].':'.$lang_array[$lang_admin].' / '.$lang_array[$lang_resp].'

    '; - #obveščanje - - // jezikovni linki - $p = new Prevajanje($this->anketa); - $p->dostop(); - $jeziki = $p->get_all_translation_langs(); - if (count($jeziki) > 0) { - echo '

    ' . $lang['srv_trans_lang'] . ': '; - $i = 0; - foreach ($jeziki AS $key => $val) { - if ($i++ != 0) echo ', '; - echo ''.$val.''; - } - echo '

    '; - } - #piškotki - echo '

    '.$lang['srv_cookie'].':'.$lang['srv_cookie_'.$row['cookie']].'

    '; - echo '

    '.$lang['srv_cookie_return'].':'.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'

    '; - - #more - več - echo ''; - echo ''; - echo '
    '; - - if ($row['cookie'] > -1) { - # če je piškotek dlje kot do konca nakete lahko izbere tudi druge možnosti - echo '

    '.$lang['srv_return_finished'].':'.($row['return_finished'] == 1 ? $lang['srv_return_finished_yes'] : $lang['srv_return_finished_no']).'

    '; - } else { - # ker je piškotek samo do konca ankete se ne more vrnit ali urejat - echo '

    '.$lang['srv_return_finished'].':'. $lang['srv_return_finished_no'] .'

    '; - } - - echo '

    '.$lang['srv_multilang'].':'.($row['multilang'] == 1 ? $lang['yes'] : $lang['no'] ).'

    '; - - echo '

    '.$lang['srv_user'].':'; - if ($row['user_from_cms'] == 1) { - echo $lang['srv_respondent']; - } elseif ($row['user_from_cms'] == 2) { - echo $lang['srv_vnasalec']; - } elseif ($row['user_from_cms'] == 0) { - echo $lang['no1']; - } - echo '

    '; - - echo '

    '.$lang['srv_block_ip'].':'; - if ($row['block_ip'] == 0) { - echo $lang['no1']; - } elseif ($row['block_ip'] == 10) { - echo '10 min'; - } elseif ($row['block_ip'] == 20) { - echo '20 min'; - } elseif ($row['block_ip'] == 60) { - echo '60 min'; - } elseif ($row['block_ip'] == 720) { - echo '12 '.$lang['hour_hours2']; - } elseif ($row['block_ip'] == 1440) { - echo '24 '.$lang['hour_hours2']; - } - echo ''; - echo '

    '; - - - # user from cms - if ($row['user_from_cms']>0) { - echo '

    '.$lang['srv_user_cms_show'].':'.($lang['srv_user_cms_email']).'

    '; - } - echo '

    '.$lang['srv_vote_limit'].':'.($row['vote_limit'] == 0 ? $lang['no'] : $lang['yes']).'

    '; - - echo '

    '.$lang['srv_vote_count'].':'.($row['vote_limit'] == 0 ? '/' : $row['vote_count']).'

    '; - # Obveščanje - // preberemo nastavitve alertov - $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '".$this->anketa."'"); - if (mysqli_num_rows($sqlAlert) > 0) { - $rowAlert = mysqli_fetch_assoc($sqlAlert); - } else { - SurveyAlert::getInstance()->Init($anketa, $global_user_id); - $rowAlert = SurveyAlert::setDefaultAlertBeforeExpire(); - } - - $alert_finish = array(); - $alert_expire = array(); - $alert_delete = array(); - $alert_active = array(); - if ($rowAlert['finish_respondent'] == 1) { - $alert_finish[] = $lang['srv_alert_respondent']; - } - if ($rowAlert['finish_respondent_cms'] == 1) { - $alert_finish[] = $lang['srv_alert_respondent_cms']; - } - if ($rowAlert['finish_author'] == 1) { - $alert_finish[] = $lang['srv_info_author']; - } - if ($rowAlert['finish_other'] == 1) { - $alert_finish[] = $lang['email_prejemniki']; - } - if ($rowAlert['expire_author'] == 1) { - $alert_expire[] = $lang['srv_info_author']; - } - if ($rowAlert['expire_other'] == 1) { - $alert_expire[] = $lang['email_prejemniki']; - } - if ($rowAlert['delete_author'] == 1) { - $alert_delete[] = $lang['srv_info_author']; - } - if ($rowAlert['delete_other'] == 1) { - $alert_delete[] = $lang['email_prejemniki']; - } - if ($rowAlert['active_author'] == 1) { - $alert_active[] = $lang['srv_info_author']; - } - if ($rowAlert['active_other'] == 1) { - $alert_active[] = $lang['email_prejemniki']; - } - echo '

    '.$lang['srv_alert_completed_2'].':'.(count($alert_finish) ? implode(',',$alert_finish) : $lang['no']).'

    '; - echo '

    '.$lang['srv_alert_expired_2'].':'.(count($alert_expire) ? implode(',',$alert_expire) : $lang['no']).'

    '; - echo '

    '.$lang['srv_alert_active_2'].':'.(count($alert_active) ? implode(',',$alert_active) : $lang['no']).'

    '; - echo '

    '.$lang['srv_alert_delete_2'].':'.(count($alert_delete) ? implode(',',$alert_delete) : $lang['no']).'

    '; - - echo '

    '; - echo ''; - echo $lang['srv_nastavitve_ankete_all'].''; - echo '

    '; - echo '
    '; - } - // Nimamo dostopa do zavihka urejanje - ni nobenih linkov - else{ - # Trajanje - $starts = explode('-',$row['starts']); - $starts = $starts[2].'.'.$starts[1].'.'.$starts[0]; - $expire = explode('-',$row['expire']); - $expire = $expire[2].'.'.$expire[1].'.'.$expire[0]; - echo '

    '.$lang['srv_starts'].': '.$starts.'

    '; - if ( $row['expire'] == PERMANENT_DATE ) { - #trajna - echo '

    '.$lang['srv_trajna_anketa'].': '.($row['expire'] == PERMANENT_DATE ? $lang['yes'] : $lang['no']).'

    '; - } else { - echo '

    '.$lang['srv_expire'].': '.$expire.'

    '; - } - - echo '

    '.$lang['srv_themes'].': '.$row['skin'].'

    '; - - # Jezik - $lang_old = $lang; - $lang_admin = (int)$row['lang_admin']; - $lang_resp = (int)$row['lang_resp']; - $lang_array = array(); - $lang_array[0] = $lang['srv_language_not_set']; - // Preberemo razpoložljive jezikovne datoteke - if ($dir = opendir('../../lang')) { - while (($file = readdir($dir)) !== false) { - if ($file != '.' AND $file != '..') { - if (is_numeric(substr($file, 0, strpos($file, '.')))) { - $i = substr($file, 0, strpos($file, '.')); - $file = '../../lang/'.$i.'.php'; - if (file_exists($file)) { - include($file); - $lang_array[$i] = $lang['language']; - } - } - } - } - } - - // nastavimo jezik nazaj - /*$file = '../../lang/'.$lang_admin.'.php'; - if (file_exists($file)) { - include($file); - }*/ - $lang = $lang_old; - $resp_change_lang = SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang'); - echo '

    '.$lang['srv_language_admin_0'].': '.$lang_array[$lang_admin].' / '.$lang_array[$lang_resp].'

    '; + } - #obveščanje - - // jezikovni linki - $p = new Prevajanje($this->anketa); - $jeziki = $p->get_all_translation_langs(); - if (count($jeziki) > 0) { - echo '

    ' . $lang['srv_trans_lang'] . ': '; - $i = 0; - foreach ($jeziki AS $key => $val) { - if ($i++ != 0) echo ', '; - echo ''.$val.''; - } - echo '

    '; - } - #piškotki - echo '

    '.$lang['srv_cookie'].': '.$lang['srv_cookie_'.$row['cookie']].'

    '; - echo '

    '.$lang['srv_cookie_return'].': '.($row['cookie_return'] == 0 ? $lang['srv_cookie_return_start'] : $lang['srv_cookie_return_middle']).'

    '; - - #more - več - echo ''; - echo ''; - echo '
    '; - - if ($row['cookie'] > -1) { - # če je piškotek dlje kot do konca nakete lahko izbere tudi druge možnosti - echo '

    '.$lang['srv_return_finished'].': '.($row['return_finished'] == 1 ? $lang['srv_return_finished_yes'] : $lang['srv_return_finished_no']).'

    '; - } else { - # ker je piškotek samo do konca ankete se ne more vrnit ali urejat - echo '

    '.$lang['srv_return_finished'].': '. $lang['srv_return_finished_no'] .'

    '; - } - - echo '

    '.$lang['srv_multilang'].': '.($row['multilang'] == 1 ? $lang['yes'] : $lang['no'] ).'

    '; - - echo '

    '.$lang['srv_user'].': '; - if ($row['user_from_cms'] == 1) { - echo $lang['srv_respondent']; - } elseif ($row['user_from_cms'] == 2) { - echo $lang['srv_vnasalec']; - } elseif ($row['user_from_cms'] == 0) { - echo $lang['no1']; - } - echo '

    '; - - echo '

    '.$lang['srv_block_ip'].': '; - if ($row['block_ip'] == 0) { - echo $lang['no1']; - } elseif ($row['block_ip'] == 10) { - echo '10 min'; - } elseif ($row['block_ip'] == 20) { - echo '20 min'; - } elseif ($row['block_ip'] == 60) { - echo '60 min'; - } elseif ($row['block_ip'] == 720) { - echo '12 '.$lang['hour_hours2']; - } elseif ($row['block_ip'] == 1440) { - echo '24 '.$lang['hour_hours2']; - } - echo '

    '; - - - # user from cms - if ($row['user_from_cms']>0) { - echo '

    '.$lang['srv_user_cms_show'].': '.($lang['srv_user_cms_email']).'

    '; - } - echo '

    '.$lang['srv_vote_limit'].': '.($row['vote_limit'] == 0 ? $lang['no'] : $lang['yes']).'

    '; - - echo '

    '.$lang['srv_vote_count'].': '.($row['vote_limit'] == 0 ? '/' : $row['vote_count']).'

    '; - # Obveščanje - // preberemo nastavitve alertov - $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '".$this->anketa."'"); - if (mysqli_num_rows($sqlAlert) > 0) { - $rowAlert = mysqli_fetch_assoc($sqlAlert); - } else { - SurveyAlert::getInstance()->Init($anketa, $global_user_id); - $rowAlert = SurveyAlert::setDefaultAlertBeforeExpire(); - } - - $alert_finish = array(); - $alert_expire = array(); - $alert_delete = array(); - $alert_active = array(); - if ($rowAlert['finish_respondent'] == 1) { - $alert_finish[] = $lang['srv_alert_respondent']; - } - if ($rowAlert['finish_respondent_cms'] == 1) { - $alert_finish[] = $lang['srv_alert_respondent_cms']; - } - if ($rowAlert['finish_author'] == 1) { - $alert_finish[] = $lang['srv_info_author']; - } - if ($rowAlert['finish_other'] == 1) { - $alert_finish[] = $lang['email_prejemniki']; - } - if ($rowAlert['expire_author'] == 1) { - $alert_expire[] = $lang['srv_info_author']; - } - if ($rowAlert['expire_other'] == 1) { - $alert_expire[] = $lang['email_prejemniki']; - } - if ($rowAlert['delete_author'] == 1) { - $alert_delete[] = $lang['srv_info_author']; - } - if ($rowAlert['delete_other'] == 1) { - $alert_delete[] = $lang['email_prejemniki']; - } - if ($rowAlert['active_author'] == 1) { - $alert_active[] = $lang['srv_info_author']; - } - if ($rowAlert['active_other'] == 1) { - $alert_active[] = $lang['email_prejemniki']; - } - echo '

    '.$lang['srv_alert_completed_2'].': '.(count($alert_finish) ? implode(',',$alert_finish) : $lang['no']).'

    '; - echo '

    '.$lang['srv_alert_expired_2'].': '.(count($alert_expire) ? implode(',',$alert_expire) : $lang['no']).'

    '; - echo '

    '.$lang['srv_alert_active_2'].': '.(count($alert_active) ? implode(',',$alert_active) : $lang['no']).'

    '; - echo '

    '.$lang['srv_alert_delete_2'].': '.(count($alert_delete) ? implode(',',$alert_delete) : $lang['no']).'

    '; - + // Zlistamo nice URL, povezave za skupine in jezike + $this->niceUrlSettings(); + + // Več načinov deljenja ankete + echo '

    '.$lang['srv_publication_survey_more'].'

    '; + + echo '
    '; + + // Vabila + echo '
    '; + echo '
    '; + echo '
    '; + echo $lang['srv_publication_invitations']; echo '
    '; - } + echo $lang['srv_publication_invitations_text']; + echo '
    '; + + //HTML koda + echo '
    '; + echo '
    '; + echo '
    '; + echo $lang['srv_anketa_href']; + echo '
    '; + echo $lang['srv_anketa_href_text']; + echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; + // iFrame - brez js + echo '
    '; + echo '
    '; + echo '
    '; + echo $lang['srv_anketa_href_inojs']; + echo '
    '; + echo $lang['srv_anketa_href_inojs_text']; + echo '
    '; + + echo ''; + echo ''; + } function niceUrlSettings() { @@ -2307,10 +2873,7 @@ class SurveyAdminSettings { $preview_hidecomment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hidecomment'); $preview_options = ''.($preview_disableif==1?'&disableif=1':'').($preview_disablealert==1?'&disablealert=1':'').($preview_displayifs==1?'&displayifs=1':'').($preview_displayvariables==1?'&displayvariables=1':'').($preview_hidecomment==1?'&hidecomment=1':'').''; - - echo '
    '.$lang['srv_publication_base_title'].''; - - // Predogled url + /*// Predogled url echo '
    '; echo '

    ' . $lang['srv_poglejanketo2'] . ''; @@ -2335,42 +2898,40 @@ class SurveyAdminSettings { echo ' ('.$lang['srv_testrianje_how'].')

    '; echo '
    '; - } - - // Navaden url + }*/ echo '
    '; + //Zlistamo vse lepe url-je + $title = 0; + $sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC"); + while ($rowl = mysqli_fetch_assoc($sqll)) { + if ($title == 0) { + echo ''; + $title = 1; + } + + $link_nice = $site_url . $rowl['link']; + + echo '
    '; + echo ''.$link_nice.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); + echo ''; + echo ''; + echo '
    '; + } + + echo ''; + // Navaden url $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '

    ' . $lang['srv_survey_real'] . ''; - echo '('.$lang['srv_survey_real_savedata'].')

    '; - - echo '' . $lang['url'] . ':  '; - $p->include_lang($p->lang_resp); $base_lang_resp = $lang['language']; $p->include_base_lang(); $link1 = $site_url.'a/'.$row['hash']; - echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').''; - - echo '' - .'  ' - . ''; - - // Zlistamo vse lepe url-je - $sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC"); - while ($rowl = mysqli_fetch_assoc($sqll)) { - - $link_nice = $site_url . $rowl['link']; - - echo '
    '; - echo ''.$link_nice.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').''; - - - //echo ''.$site_url.$rowl['link'].''; - //echo '
    '; - } + echo '
    '; + echo ''.$link1.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : ''); + echo ''; + echo '
    '; // Imamo vec linkov za skupine $ss = new SurveySkupine($this->anketa); @@ -2379,132 +2940,34 @@ class SurveyAdminSettings { $vrednosti = $ss->getVrednosti($spr_id); foreach($vrednosti as $vrednost){ $link_skupine = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url']; - echo '
    '; - echo ''.$link_skupine.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').' - '.$vrednost['naslov'].''; + echo '
    '; + echo ''.$link_skupine.''.(count($lang_array) > 0 ? ' - '.$base_lang_resp : '').' - '.$vrednost['naslov']; + echo ''; + echo '
    '; } } // Imamo vec linkov za jezike if (count($lang_array) > 0) { foreach ($lang_array AS $lang_id => $lang_name) { - echo '
    '; - echo ''.$link.'?language='.$lang_id.' - '.$lang_name.''; + echo '
    '; + echo ''.$link.'?language='.$lang_id.' - '.$lang_name; + echo ''; + echo '
    '; if($spr_id > 0){ foreach($vrednosti as $vrednost){ $link_skupine = isset($vrednost['nice_url']) ? $vrednost['nice_url'] : $vrednost['url']; - echo '
    '; - echo ''.$link_skupine.'&language='.$lang_id.' - '.$lang_name.' - '.$vrednost['naslov'].''; + echo '
    '; + echo ''.$link_skupine.'&language='.$lang_id.' - '.$lang_name.' - '.$vrednost['naslov']; + echo ''; + echo '
    '; } } } } - - echo ''; - - echo '
    '; - - - echo '
    '; - - - // Okno za dodajanje lepega url-ja - echo '
    '.$lang['srv_nice_url'].''; - - // Zlistamo vse lepe url-je - $sqll = sisplet_query("SELECT id, link FROM srv_nice_links WHERE ank_id = '$this->anketa' ORDER BY id ASC"); - while ($rowl = mysqli_fetch_assoc($sqll)) { - - echo ''; - echo ''.$site_url.$rowl['link'].''; - - // Remove nice url - echo ''; - - echo '
    '; - } - - echo '
    '; - - // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik - $userAccess = UserAccess::getInstance($global_user_id); - if(!$userAccess->checkUserAccess($what='nice_url')){ - $userAccess->displayNoAccess($what='nice_url'); - } - else{ - // Gumb za dodajanje lepega linka - //echo '
    ' . $lang['srv_nice_url'] . ' '.Help::display('srv_nice_url'); - echo ' '.Help::display('srv_nice_url'); - - - echo '


    '; - - echo $site_url.' '; - - echo '
    '; - echo '
    '; - - if (isset($_GET['error'])) { - - // Prekratek lep url - if(strlen($_GET['error']) <= 2) - echo '

    '.$_GET['error'].' '.$lang['srv_nice_url_short'].''; - // Predolg lep url - elseif(strlen($_GET['error']) > 20) - echo '

    '.$_GET['error'].' '.$lang['srv_nice_url_long'].''; - // Ze obstaja - else - echo '

    '.$_GET['error'].' '.$lang['srv_nice_url_taken'].''; - } - - echo ''; - } - - echo '

    '; - - echo '
    '; } - function anketa_vabila_url() { - echo ''; - echo ''; - - echo ''; - - echo ''; - - echo ''; - echo '
    '; - $this->displayInvSurveyEmbed(); - - // Embed v popup je zaenkrat disablan zaradi cross domain omejitev browserjev - //$this->displayInvSurveyPopup(); - echo ''; - $this->displayInvSurveyLink(); - echo '
    '; - } - - function displayInvSurveyEmbed() { - global $lang; - - echo '
    '; - echo ''.$lang['srv_embed_title'].':'; - - echo '

    '.$lang['srv_embed_js'].Help :: display('srv_embed_js').'

    '; - echo '

    '; - - echo '

    '.$lang['srv_embed_fixed'].Help :: display('srv_embed_fixed').'

    '; - echo '

    '; - - - echo '
    '; - - if ($_GET['js'] == 'open') { - ?>'; } - function displayInvSurveyLink() { - global $lang, $site_url, $admin_type; - - $row = SurveyInfo::getInstance()->getSurveyRow(); - - echo '
    '; - echo '' . $lang['srv_user_base_url'] . ''; - - echo '

    '; - echo '

    '.$lang['srv_anketa_href_text'].'

    '; - echo '

    '; - echo '

    '.$lang['srv_anketa_href_count_text'].'

    '; - - echo '
    '; - - // Prikaz QR kode - $img = 'classes/phpqrcode/imgs/code'.$this->anketa.'.png'; - QRcode::png(SurveyInfo::getSurveyLink(), $img, 'L', 4, 2); - - echo ''; -# echo '

    '.$lang['srv_qr_code'].':
    '; - echo '

    '; - echo ''; - echo '
    '; - - // Prikaz ikon za deljenje (FB, twitter...) - echo '

    '; - - ?> -

    - - - - - - - - - | - -
    - - - - - '; - echo '
    '; - } /** * nastavitve za obveščanje na email * @@ -2626,10 +3024,9 @@ class SurveyAdminSettings { echo ''; - echo '
    '; if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } #echo ''; @@ -2685,6 +3082,9 @@ class SurveyAdminSettings { global $admin_type; $anketa = $this->anketa; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; /* moznosti: * 'complete' -> obvsetilo o izpolnjeni anketi (respondent, respondent iz cms, avtor + dostop, dodatn-emaili) @@ -2732,7 +3132,7 @@ class SurveyAdminSettings { if ($tab == 'complete') { - //echo '

    ' . $lang['srv_alert_title'] . '

    '."\n"; + //Obveščanje o izpolnjeni anketi echo '
    ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; @@ -2740,60 +3140,75 @@ class SurveyAdminSettings { echo ' ' . "\n"; - echo '
    '. "\n"; - echo ' ' . $lang['srv_alert_prejemnik'] . ''. "\n"; - - // respondent - ne prikazemo ce gre za glasovanje oz. volitve + echo '
    '; + echo ' ' . $lang['srv_alert_completed_2'] . ''; + + echo '
    '; + echo ''.$lang['srv_alert_completed_prejemniki'].''; + + // respondent - ne prikazemo ce gre za glasovanje oz. volitve if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){ - echo '

    '; - echo ''; - echo ''; - $this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1)); - echo ''. "\n"; + echo '

    '; + //echo ''; + $this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1)); + + echo '
    '; + // Ce imamo vec prevodov omogocimo za vsak prevod svoj email $this->display_alert_label('finish_respondent_language',($rowAlert['finish_respondent'] == 1)); - echo '

    '; + } - // respondent iz cms ne prikazemo ce gre za volitve + // respondent iz cms ne prikazemo ce gre za volitve if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ - echo '

    '; - echo ''; + echo '

    '; + + //echo ''; $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1)); - echo '

    '. "\n"; + + echo '
    '; } - // avtor ankete oz osebe z dostopom - //echo '

    '; - echo '

    '; - echo ''; + //Avtor ankete oz. souredniki + echo '

    '; + echo ''; $this->display_alert_label('finish_author',($rowAlert['finish_author'] == 1)); - echo '

    '; + echo '
    '; - // posebej navedeni maili - echo '

    '; - echo ' '; + //Posebej navedeni maili + echo '

    '; + echo ''; + echo ' '; echo ' '; - if ($rowAlert['finish_other_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($rowAlert['finish_other_if']); } - echo '

    '; - - echo '

    '; - echo '' . - '' . - '

    '; - - echo '
    '; - - - echo '
    '; + if ($rowAlert['finish_other_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($rowAlert['finish_other_if']); } + echo ''; + + echo '
    '; - echo '
    '; - echo '' . $lang['srv_alert_oblika'] . ''; - echo '
    '; - echo '

    '; - echo '

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo '
    '; + + echo '
    '; + echo '
    '; + + echo '

    '.$lang['message_content'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + if ($rowAlert['finish_text'] != '') { $text = $rowAlert['finish_text']; } @@ -2805,95 +3220,134 @@ class SurveyAdminSettings { } // prikaze editor za ne-spremenljivko (za karkoli druzga pac) - echo '

    '; - echo ' '; - echo '

    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo $lang['srv_alert_instruction1']; + echo '
    '; + + echo ''; + echo ''; + + echo '
    '; + echo '
    '; + + //Navodila na desni + echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_alert_instruction1'].'

    '; + echo '

    '.$lang['srv_alert_instruction1a'].':

    '; + + echo '
    '; + // ta se skriva, potreben respondent iz CMS, da dobi NAME echo ''.$lang['srv_alert_instruction2'].''; - echo $lang['srv_alert_instruction_survey'].'
    '; - echo $lang['srv_alert_instruction_date'].'
    '; - echo $lang['srv_alert_instruction_site'].'
    '; - echo $lang['srv_alert_instruction_url'].'
    '; - echo $lang['srv_alert_instruction_pdf'].'
    '; - echo $lang['srv_alert_instruction_rtf'].'
    '; - + echo '

    '.$lang['srv_alert_instruction_survey'].'

    '; + echo '

    '.$lang['srv_alert_instruction_date'].'

    '; + echo '

    '.$lang['srv_alert_instruction_site'].'

    '; + echo '

    '.$lang['srv_alert_instruction_url'].'

    '; + echo '

    '.$lang['srv_alert_instruction_pdf'].'

    '; + echo '

    '.$lang['srv_alert_instruction_rtf'].'

    '; + $row = SurveyInfo::getInstance()->getSurveyRow(); # če imamo prepoznavanje uporabnik iz CMS, potem ponudimo tudi META_REFERAL_URL - echo $lang['srv_alert_instruction_meta_referer_url'].'
    '; - echo $lang['srv_alert_instruction_system']; - echo $lang['srv_alert_instruction_sample']; - echo $lang['srv_alert_instruction_available']; - -# echo $lang['srv_alert_instruction3']; + if ($rowAlert['finish_respondent_cms'] == 1) + echo '

    '.$lang['srv_alert_instruction_meta_referer_url'].'

    '; + + echo '
    '; + + echo '
    '; + $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 '

    '.$lang['srv_alert_no_sys_var'].'

    '; + if($prefix != "") { + echo '

    '.$lang['srv_alert_instruction_available'].'

    '; + echo '

    '.rtrim($prefix, ", ").'

    '; + echo '

    '.$lang['srv_alert_instruction_system'].'

    '; + echo '

    '.$lang['srv_alert_instruction_sample'].'

    '; } - echo ''; + else{ // ni sistemskih spremenljivk + echo '

    '.$lang['srv_alert_no_sys_var'].'

    '; + } + + echo '
    '; + + echo '
    '; - echo '
    '; - echo '
    '; - - echo '
    '; + echo ''; + + echo ''; + + echo ''; - echo ' '; - - echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } echo '
    '; } else if ($tab == 'expired') { global $site_path, $global_user_id; - //echo '

    ' . $lang['srv_alert_expired_title'] . '

    '."\n"; + //Obveščanje o izteku ankete echo '
    ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; - echo '
    '. "\n"; - echo ' ' . $lang['srv_alert_expired_time_title'] . ''. "\n"; - - echo $lang['srv_alert_expire_days1']; - echo ''; - echo $lang['srv_alert_expire_days2']; - echo $lang['srv_alert_expire_expire_at'] . $rowS['expire'].''.$lang['at'].'00:00
    '; - echo $lang['srv_alert_expire_note_at'] . ''.$rowAlert['newdate'].''.$lang['at'].'01:00
    '; - echo '
    '; - - echo '
    '; - echo '
    '. "\n"; - echo ' ' . $lang['srv_alert_prejemnik'] . ''. "\n"; - echo '

    '; - echo ''; - $this->display_alert_label('expire_author',($rowAlert['expire_author'] == 1)); - echo '

    '; - echo '

    '; - echo '

    '; - echo '' . - ' ' . - '

    '; - echo '
    '; - - echo ''; - echo '
    '; - echo '
    '; - echo '' . $lang['srv_alert_oblika'] . ''; - echo '
    '; - echo '

    '; + echo '
    '; + echo ' ' . $lang['srv_alert_expired_2'] . ''; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo '

    '. $lang['srv_alert_expire_expire_at'] .'

    '; + echo $rowS['expire'].$lang['at'].'00:00'; + echo '
    '; + + echo '
    '; + echo '

    '. $lang['srv_alert_expire_note_at'] .'

    '; + echo '

    '.$rowAlert['newdate'].''.$lang['at'].'01:00

    '; + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_alert_expire_prejemniki'].''; + + echo '
    '; + echo ''; + $this->display_alert_label('expire_author',($rowAlert['expire_author'] == 1)); + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '
    '; + + echo '

    '.$lang['message_content'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; if ($rowAlert['expire_text'] != ''){ $text = $rowAlert['expire_text']; @@ -2906,56 +3360,81 @@ class SurveyAdminSettings { } // prikaze editor za ne-spremenljivko (za karkoli druzga pac) - echo '

    '; - echo ' '; - echo '

    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo $lang['srv_alert_instruction1']; - echo $lang['srv_alert_instruction4']; + echo '
    '; + + echo ''; + echo ''; + + echo '
    '; + echo '
    '; + + //Navodila na desni + echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_alert_instruction1'].'

    '; + echo '

    '.$lang['srv_alert_instruction1a'].':

    '; + echo '

    '.$lang['srv_alert_instruction4'].'

    '; + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; - echo '
    '; - echo ''; - echo '
    '; - echo '
    '; - echo ''; - echo '
    '; if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } echo '
    '; - } else if ($tab == 'active') { - //echo '

    ' . $lang['srv_alert_active_title'] . '

    '."\n"; + } + + // Obveščanje o spremembi aktivnosti ankete + else if ($tab == 'active') { echo '
    ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; - echo '
    '. "\n"; - echo '' . $lang['srv_alert_prejemnik'] . ''. "\n"; - echo '

    '; - echo ''; - $this->display_alert_label('active_author',($rowAlert['active_author'] == 1)); - echo '

    '; - echo '

    '; - echo '

    '; - echo ''; - echo '' . - '

    '; - echo '
    '; - - echo ''; - - echo '
    '; echo '
    '; - echo '' . $lang['srv_alert_oblika'] . ''; - echo '
    '; - echo '

    ' . $lang['srv_alert_oblika_deactivate_note'] . '

    '; - echo '

    '; + echo '' . $lang['srv_alert_active_2'] . ''; + + echo '
    '; + echo ''.$lang['srv_alert_active_prejemniki'].''; + + echo '
    '; + echo ''; + $this->display_alert_label('active_author',($rowAlert['active_author'] == 1)); + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '
    '; + + echo '

    '.$lang['message_content'].'

    '; + echo '

    '.$lang['srv_alert_oblika_deactivate_note'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; if ($rowAlert['active_text0'] != '') { $text0 = $rowAlert['active_text0']; @@ -2966,15 +3445,21 @@ class SurveyAdminSettings { $text0 = nl2br($lang['srv_alert_active_text0'].$signature); } - // prikaze editor za ne-spremenljivko (za karkoli druzga pac) - echo '

    '; - echo ' '; - echo '

    '; - echo '
    '; - echo '

    ' . $lang['srv_alert_oblika_activate_note'] . '

    '; - echo '

    '; + // prikaze editor za ne-spremenljivko (za karkoli druzga pac) + echo '
    '; + + echo ''; + echo ''; + + echo '
    '; + + echo '

    '.$lang['srv_alert_oblika_activate_note'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; if ($rowAlert['active_text1'] != '') { $text1 = $rowAlert['active_text1']; @@ -2985,55 +3470,81 @@ class SurveyAdminSettings { $text1 = nl2br($lang['srv_alert_active_text1'].$signature); } - - echo '

    '; - echo ' '; - echo '

    '; + echo '
    '; + + echo ''; + echo ''; + + echo '
    '; + echo '
    '; + + //Navodila na desni + echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_alert_instruction1'].'

    '; + echo '

    '.$lang['srv_alert_instruction1a'].':

    '; + echo '

    '.$lang['srv_alert_instruction5'].'

    '; + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; echo '
    '; - echo '
    '; - echo '
    '; - echo $lang['srv_alert_instruction1']; - echo $lang['srv_alert_instruction5']; - echo '
    '; - echo '
    '; - echo ''; - echo '
    '; - echo ''; - echo '
    '; + if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } echo '
    '; - } else if ($tab == 'delete') { - //echo '

    ' . $lang['srv_alert_delete_title'] . '

    '."\n"; + } + + else if ($tab == 'delete') { echo '
    ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; echo ' ' . "\n"; - echo '
    '. "\n"; - echo '' . $lang['srv_alert_prejemnik'] . ''. "\n"; - echo '

    '; - echo ''; - $this->display_alert_label('delete_author',($rowAlert['delete_author'] == 1)); - echo '

    '; - echo '

    '; - echo '

    '; - echo ''; - echo ''; - echo '

    '; - echo '
    '; - - echo ''; - - echo '
    '; + //Obveščanje o izbrisu ankete echo '
    '; - echo '' . $lang['srv_alert_oblika'] . ''; - echo '
    '; - echo '

    '; + echo '' . $lang['srv_alert_surveydelete'] . ''; + + echo '
    '; + echo ''.$lang['srv_alert_surveydelete_text'].''; + + echo '
    '; + echo ''; + $this->display_alert_label('delete_author',($rowAlert['delete_author'] == 1)); + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '
    '; + + echo '

    '.$lang['message_content'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; if ($rowAlert['delete_text'] != '') { $text = $rowAlert['delete_text']; @@ -3044,25 +3555,37 @@ class SurveyAdminSettings { $text = nl2br($lang['srv_alert_delete_text'].$signature); } + // prikaze editor za ne-spremenljivko (za karkoli druzga pac) - echo '

    '; - echo ' '; - echo '

    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo $lang['srv_alert_instruction1']; - echo $lang['srv_alert_instruction5']; + echo '
    '; + + echo ''; + echo ''; + echo '
    '; echo '
    '; + + //Navodila na desni + echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_alert_instruction1'].'

    '; + echo '

    '.$lang['srv_alert_instruction1a'].':

    '; + echo '

    '.$lang['srv_alert_instruction5a'].'

    '; + echo '
    '; + echo '
    '; + + echo '
    '; + echo '
    '; - echo '
    '; - echo ''; - echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } echo '
    '; @@ -3113,7 +3636,7 @@ class SurveyAdminSettings { global $global_user_id; global $mysql_database_name; - echo '
    '; + echo '
    '; echo ''.$lang['srv_user_base_email_server_settings'].''; $row = SurveyInfo::getInstance()->getSurveyRow(); @@ -3121,7 +3644,7 @@ class SurveyAdminSettings { // Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve $isEmail = (int)SurveyInfo::getInstance()->checkSurveyModule('email'); if($isEmail) - echo '

    '.$lang['srv_email_server_settings_warning'].'

    '; + echo '

    '.$lang['srv_email_server_settings_warning'].'

    '; echo '
    ' . "\n\r"; @@ -3136,20 +3659,31 @@ class SurveyAdminSettings { // Dostop za posiljanje mailov preko 1ka serverja $enabled1ka = ( $MA->is1KA() || (($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi' || $mysql_database_name == '1kaarnessi')) ) ? true : false; - echo '

    '; - echo ''.$lang['srv_email_setting_select_server'].' '; - echo ''; + + echo '

    '; + echo ''.$lang['srv_email_setting_select_server'].''; + + echo '
    '; + echo 'is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">'; + echo ''; + echo '
    '; + // Google smtp je viden samo starim, kjer je ze vklopljen - if($MA->isGoogle()){ - echo ''; - } - echo ''; + if($MA->isGoogle()){ + echo '
    '; + echo 'isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">'; + echo ''; + echo '
    '; + } + + echo '
    '; + echo 'isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">'; + echo ''; echo Help :: display('srv_mail_mode'); - echo '

    '; - + echo '
    '; + + echo '
    '; + #1KA $enkaSettings = $MA->get1KASettings($raziskave=true); @@ -3160,7 +3694,7 @@ class SurveyAdminSettings { echo '

    '; echo '

    '; # replyTo - echo '

    '; + echo '

    '; echo '

    '; echo ''; @@ -3173,7 +3707,7 @@ class SurveyAdminSettings { echo '

    '; echo '

    '; # replyTo - echo '

    '; + echo '

    '; echo '

    '; #Password echo '

    '; @@ -3183,89 +3717,155 @@ class SurveyAdminSettings { #SMTP $enkaSettings = $MA->getSMTPSettings(); echo '

    isSMTP() ? ' class="displayNone"' : '').'>'; - echo ''.$lang['srv_email_setting_adapter2_note'].'
    '; - echo '
    '.$lang['srv_email_setting_settings'].'
    '; - # from - NICE - echo '

    '; - echo '

    '; - # from - echo '

    '; - echo '

    '; - # replyTo - echo '

    '; - echo '

    '; - #Username - echo '

    '; - echo '

    '; - #Password - echo '

    '; - echo '

    '; - #autentikacija - echo '

    '; - echo $lang['srv_email_setting_autentication']; - echo ''; - echo ''; - echo '

    '; - #Varnost SMTPSecure - echo '

    '; - echo $lang['srv_email_setting_encryption']; - echo ''; - echo ''; - echo ''; - echo '

    '; - #port - echo '

    '; - echo ' '.$lang['srv_email_setting_port_note']; - echo '

    '; - #host - echo '

    '; - echo '

    '; - #delay - echo '

    '; - echo '

    '; + //echo ''.$lang['srv_email_setting_adapter2_note'].'
    '; + echo '

    '.$lang['srv_email_setting_settings'].'

    '; + + echo '
    '; + + # from - NICE + echo '
    '; + echo ''.$lang['srv_email_setting_from_nice'].''; + echo ''; + echo '
    '; + + # from + echo '
    '; + echo ''.$lang['srv_email_setting_from'].''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + + # replyTo + echo '
    '; + echo ''.$lang['srv_email_setting_reply'].Help::display('srv_obvescanje_odgovorZa').''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + + #Username + echo '
    '; + echo ''.$lang['srv_email_setting_username'].''; + echo ''; + echo '
    '; + + #Password + echo '
    '; + echo ''.$lang['srv_email_setting_password'].''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + + #autentikacija + echo '
    '; + echo ''.$lang['srv_email_setting_autentication'].''; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo '
    '; + + #Varnost SMTPSecure + echo '
    '; + echo ''.$lang['srv_email_setting_encryption'].''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + + #port + echo '
    '; + echo ''.$lang['srv_email_setting_port'].$lang['srv_email_setting_port_note'].''; + echo ''; + echo '
    '; + + #host + echo '
    '; + echo ''.$lang['srv_email_setting_host'].''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + + #delay + echo '
    '; + echo ''.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').':'; + echo ''; + echo '
    '; + + + echo '
    '; - echo '
    '; echo '
    '; echo '
    '; - - - echo '
    '; - - // Gumb shrani - echo ''; - + + echo '
    '; // Gumb preveri nastavitve - echo ''; + echo ''; + // Gumb shrani + echo ''; + echo '
    '; if ($_GET['s'] == '1') { - echo '
    '; - echo ''; + echo ''; } } @@ -3325,7 +3925,6 @@ class SurveyAdminSettings { $sa = new SurveyAdmin(1, $this->anketa); $sa->show_mailto_users('all', null); echo ''; - echo '
    '; } else { // pošljemo emaile @@ -3511,71 +4110,96 @@ class SurveyAdminSettings { global $site_url; global $site_path; - echo '
    '; - echo '' . $lang['srv_splosna_navodila'] . ''; - - echo '

    '.$lang['srv_social_settings_text1'].'

    '; - echo '

    '.$lang['srv_social_settings_text2'].'

    '; - echo '

    '.$lang['srv_social_settings_text3'].'

    '; - echo '

    '.$lang['srv_social_settings_text4'].'

    '; - echo '

    '.$lang['srv_social_settings_text5'].' http://www.1ka.si/a/3510,

    '; - echo '

    '.$lang['srv_social_settings_text6'].' '.$lang['srv_library'].' '.$lang['srv_social_settings_text7'].'

    '; - echo '

    '.$lang['edit2'].''.$lang['srv_social_settings_text8'].'

    '; + echo '

    '.$lang['srv_social_settings_text1'].'

    '; + echo '

    '.$lang['srv_social_settings_text2'].$lang['srv_social_settings_text3'].$lang['srv_social_settings_text4'].'

    '; + echo '

    '.$lang['srv_social_settings_text5'].''.$lang['srv_social_settings_text6'].'.

    '; - echo '
    '; // Omrežja so sestavljane vprašanja. Začnejo se iz generatorja imen (name generator). S tem respondent (ego) navede objekte, prijatelje - alterje. , s katerim pridobimo imena pzanke in vprašanj. Druga kompnenta je zanka, ki za vse alterje določenega ega sproži enaka vprašanja. Dretja komponenta so vprašanja. Primer omrežja je tukaj, http://www.1ka.si/a/3510, vprašalnik pa najdemo v knjižnjic med Primerov 1KA anket http://www.1ka.si/admin/survey/index.php?a=knjiznica } /** * @desc prikaze tab arhivi */ - function arhivi() {//OSTANE + function arhivi() { global $lang; - echo '
    '; + echo '
    '; echo '' . $lang['srv_questionnaire_archives'] . ''; - - echo '

    ' . $lang['srv_backup_label'] . '

    '; - echo '

    '.$lang['srv_note'].':

    '; - - echo ''; - - echo '

    '; + + echo '

    '.$lang['srv_questionnaire_archives_text'].'

    '; + + echo '
    '; + echo $lang['srv_questionnaire_archives_note'].':'; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; // Seznam ustvarjenih arhivov $sql = sisplet_query("SELECT a.id, a.naslov, a.intro_opomba, a.insert_time, a.edit_time, CONCAT(i.name, ' ', i.surname) AS insert_name, CONCAT(e.name, ' ', e.surname) AS edit_name FROM srv_anketa a, users i, users e WHERE a.insert_uid=i.id AND a.edit_uid=e.id AND a.backup = '$this->anketa' AND a.active>='0' ORDER BY a.insert_time DESC"); if (!$sql) echo mysqli_error($GLOBALS['connect_db']); - if (mysqli_num_rows($sql) > 0) - echo '
    ' . $lang['srv_backup_list'] . ':'; - - while ($row = mysqli_fetch_array($sql)) { - echo '
    '; - echo '' . $row['naslov'] . ' '.($row['intro_opomba']!='' ? ' - '.$row['intro_opomba'].'' : ''); - echo '
    (' . $lang['sent_by'] . ': ' . $row['insert_name'].' ' . datetime($row['insert_time']) . ', ' . $lang['edit_by'] . ': ' . $row['edit_name'].' ' . datetime($row['edit_time']) . ')'; - echo '
    ' . $lang['srv_survey_archives_delete_survey'] . ', ' . $lang['srv_anketarestore'] . ''; - echo '
    '; + if (mysqli_num_rows($sql) > 0) { + echo '

    ' . $lang['srv_backup_list'] . ':

    '; + + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + while ($row = mysqli_fetch_array($sql)) { + echo ''; + echo ''; + echo ''; + + if ($row['intro_opomba']=='') + $opomba = "/"; + else if (strlen($row['intro_opomba']) > 40) + $opomba = substr($row['intro_opomba'], 0, 37).'...'; + else + $opomba = $row['intro_opomba']; + + echo ''; + + //Ikone + echo ''; + + echo ''; + } + + echo '
    '.$lang['srv_questionnaire_archives_date'].''.$lang['srv_questionnaire_archives_by'].''.$lang['srv_questionnaire_archives_note2'].'
    '.datetime($row['insert_time']).''.$row['insert_name'].''.$opomba.''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + } + + echo '
    '; } function arhivi_data() { global $lang; - echo '
    '; + echo '
    '; echo '' . $lang['srv_arhiv_data'] . ''; - - echo '

    ' . $lang['srv_backup_data_label'] . '

    '; - - echo ''; - echo '

    '; + echo '

    '.$lang['srv_backup_data_text'].'

    '; + + echo '
    '; + echo ''; + echo '
    '; + // Seznam ustvarjenih arhivov - 2. faza: kdo je arhiviral, opomba, možnost izbrisa $backups = array(); if ($handle = opendir( dirname(__FILE__) . '/SurveyBackup/' )) { while (false !== ($entry = readdir($handle))) { @@ -3589,13 +4213,37 @@ class SurveyAdminSettings { closedir($handle); } if (count($backups) > 0) { - echo '
    ' . $lang['srv_backup_data_list'] . ':'; + echo '

    ' . $lang['srv_backup_data_list'] . ':

    '; + + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + foreach ($backups AS $file) { $e = explode('-', $file); $e[2] = str_replace('.1ka', '', $e[2]); - echo '
    '.$e[1].' '.$e[2].' - '.$lang['srv_anketarestoredata'].''; + $e[2] = str_replace('.', ':', $e[2]); + $e[2] = substr($e[2], 0, -3); + + echo ''; + echo ''; + + + //Ikone + echo ''; + + echo ''; + } - echo '

    '; + echo '
    '.$lang['srv_questionnaire_archives_date'].'
    '.$e[1].' '.$e[2].''; + echo '
    '; + //echo ''; + echo ''; + echo '
    '; + echo '
    '; } echo '
    '; @@ -3604,94 +4252,115 @@ class SurveyAdminSettings { function arhivi_testdata() { global $lang; - $str_testdata = "SELECT count(*) FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2')"; - $query_testdata = sisplet_query($str_testdata); - list($testdata) = mysqli_fetch_row($query_testdata); - - $str_testdata_auto = "SELECT count(*), add_date, add_uid FROM srv_testdata_archive WHERE ank_id='".$this->anketa."' GROUP BY add_date"; - $query_testdata_auto = sisplet_query($str_testdata_auto); - $auto_testdata = array(); - while (list($_cnt, $_date, $_uid) = mysqli_fetch_row($query_testdata_auto) ) { - $testdata_auto+=$_cnt; - $auto_testdata[] = $cnt; - } - echo '
    '; echo ''.$lang['srv_arhiv_testdata'].''; - - echo $lang['srv_archive_test_data_count'].(int)$testdata; - if ($testdata_auto > 0) { - echo $lang['srv_archive_test_data_auto'].(int)$testdata_auto; + + $link = SurveyInfo::getSurveyLink(); + $surveyName = SurveyInfo::getInstance()->getSurveyTitle(); + + $preview_disableif = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disableif'); + $preview_disablealert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disablealert'); + $preview_displayifs = SurveySetting::getInstance()->getSurveyMiscSetting('preview_displayifs'); + $preview_displayvariables = SurveySetting::getInstance()->getSurveyMiscSetting('preview_displayvariables'); + $preview_hidecomment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hidecomment'); + $preview_options = '' . ($preview_disableif == 1 ? '&disableif=1' : '') . ($preview_disablealert == 1 ? '&disablealert=1' : '') . ($preview_displayifs == 1 ? '&displayifs=1' : '') . ($preview_displayvariables == 1 ? '&displayvariables=1' : '') . ($preview_hidecomment == 1 ? '&hidecomment=1' : '') . ''; + + echo '

    '.$lang['srv_archive_test_data_text1'].''.$lang['srv_archive_test_data_text1a'].''.$lang['srv_archive_test_data_text2'].''.$lang['srv_archive_test_data_text2a'].''.$lang['srv_archive_test_data_text3'].'

    '; + + //Nimamo nobenih vnosov + $str_testdata_any = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1' OR testdata='2') GROUP BY day(time_insert)"; + $query_testdata_any = sisplet_query($str_testdata_any); + list($testdata_any) = mysqli_fetch_row($query_testdata_any); + if ((int)$testdata_any == 0) { + echo '

    '.$lang['srv_archive_test_data_none1']. $surveyName . $lang['srv_archive_test_data_none2'] . $lang['srv_archive_test_data_none3'].'.

    '; + } + else { // Imamo vnose, izpišemo eno ali obe tabeli + + // Avtomatski vnosi + $str_testdata = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='2') GROUP BY day(time_insert)"; + $query_testdata = sisplet_query($str_testdata); + $table_exists1 = 0; + while ($testdata = mysqli_fetch_array($query_testdata)) { + // Izpišemo naslov in začetek tabele + if($table_exists1==0 && $testdata[cnt]!=0) { + echo '

    '.$lang['srv_archive_test_data_timeline_auto'].$surveyName.':

    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + $table_exists1=1; + } + + echo ''; + echo ''; + echo ''; + echo ''; + } + + if($table_exists1==1) { + echo '
    '.$lang['srv_archive_test_data_date'].''.$lang['srv_archive_test_data_count'].'
    '.date("d.m.Y",strtotime($testdata[time])).''.$testdata[cnt].'
    '; + } + + // Ročni vnosi + $str_testdata = "SELECT count(*) as cnt, time_insert as time FROM srv_user WHERE ank_id='".$this->anketa."' AND (testdata='1') GROUP BY day(time_insert)"; + $query_testdata = sisplet_query($str_testdata); + $table_exists2 = 0; + while ($testdata = mysqli_fetch_array($query_testdata)) { + // Izpišemo naslov in začetek tabele + if($table_exists2==0 && $testdata[cnt]!=0) { + echo '

    '.$lang['srv_archive_test_data_timeline_manual'].$surveyName.':

    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + $table_exists2=1; + } + + echo ''; + echo ''; + echo ''; + echo ''; + } + + if($table_exists2==1) { + echo '
    '.$lang['srv_archive_test_data_date'].''.$lang['srv_archive_test_data_count'].'
    '.date("d.m.Y",strtotime($testdata[time])).''.$testdata[cnt].'
    '; + } } - echo '
    '; } function arhivi_survey() { global $lang; - // Uvoz/izvoz samo ankete - po novem je uvoz pri kreiranju ankete + // Izvoz samo ankete if($_GET['m'] == 'survey'){ echo '
    '; - echo ''.$lang['srv_survey_archives_ie_title'].''; + echo ''.$lang['srv_survey_archives_ie_title'].Help::display('srv_arhiv_vprasalnik').''; - echo '

    '.$lang['srv_survey_archives_note_survey'].'

    '; - - // Izvoz - echo '

    '; - echo ''.$lang['srv_survey_archives_export'].''; - echo '
    '.$lang['srv_survey_archives_export_text']; - echo ''.$lang['srv_survey_archives_export_save'].''; - echo '

    '; - - echo '

    '; - - // Uvoz - /*echo '

    '; - echo ''.$lang['srv_survey_archives_import'].''; - echo '
    '.$lang['srv_survey_archives_import_text']; - echo '
    '.$lang['srv_survey_archives_import_import'].''; - echo '
    '; - echo '

    '; - echo '

    ';*/ - + echo '

    '.$lang['srv_survey_archives_note_survey'].'

    '; + + echo '
    '; + echo ''; + echo '
    '; + echo '
    '; } - // Uvoz/izvoz ankete s podatki - po novem je uvoz pri kreiranju ankete + + // Izvoz ankete s podatki else{ echo '
    '; - echo ''.$lang['srv_survey_archives_ie_data_title'].''; - - echo '

    '.$lang['srv_survey_archives_note_survey_data'].'

    '; - - // Izvoz - echo '

    '; - echo ''.$lang['srv_survey_archives_export'].''; - echo '
    '.$lang['srv_survey_archives_export_text']; - echo ''.$lang['srv_survey_archives_export_save'].''; - echo '

    '; - - echo '

    '; - - // Uvoz - /*echo '

    '; - echo ''.$lang['srv_survey_archives_import'].''; - echo '
    '.$lang['srv_survey_archives_import_text']; - echo '
    '.$lang['srv_survey_archives_import_import'].''; - echo '
    '; - echo '

    '; - echo '

    ';*/ - + echo ''.$lang['srv_survey_archives_ie_data_title'].Help::display('srv_arhiv_podatki').''; + + echo '

    '.$lang['srv_survey_archives_note_survey_data'].'

    '; + + echo '
    '; + echo ''; + echo '
    '; + echo '
    '; } } @@ -3852,11 +4521,9 @@ class SurveyAdminSettings { echo ''; echo ''; - echo '
    '; - if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } } @@ -3867,6 +4534,10 @@ class SurveyAdminSettings { global $site_url; global $lang; + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; + + SurveySetting::getInstance()->Init($this->anketa); if (count($_POST) > 0 && (isset($_POST['uporabnost_link']) || isset($_POST['uporabnost_razdeli']))) { @@ -3898,52 +4569,59 @@ class SurveyAdminSettings { if ($row['uporabnost_link'] == '') $row['uporabnost_link'] = 'http://'; - echo '

    '.$lang['srv_uporabnost_link'].'

    '; - echo '

    '.$lang['srv_uporabnost_warning'].'

    '; - echo '

    Link:

    '; + echo '

    '.$lang['srv_vrsta_survey_note_4_3b'].'

    '; + + echo '
    '; + echo '

    '.$lang['srv_uporabnost_link'].'

    '; + echo ''; + echo '
    '; $uporabnost_razdeli = SurveySetting::getInstance()->getSurveyMiscSetting('uporabnost_razdeli'); - echo '

    '.$lang['srv_uporabnost_razdeli'].': '.$lang['srv_vodoravno'].' '.$lang['srv_navpicno'].' ('.$lang['srv_razdeli_dodatno'].')

    '; + + echo '
    '; + echo ''.$lang['srv_uporabnost_razdeli'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '

    '.$lang['srv_uporabnost_warning'].'

    '; + echo '
    '; - echo '
    '; - echo '
    '.$lang['srv_uporabnost_nadaljne'].''; - echo '

    '.$lang['srv_uporabnost_link_stran'].'

    '; + echo '

    '.$lang['srv_uporabnost_link_stran'].'

    '; $sqlg = sisplet_query("SELECT id, naslov FROM srv_grupa WHERE ank_id = '$this->anketa' ORDER BY vrstni_red ASC"); while ($rowg = mysqli_fetch_array($sqlg)) { $link = SurveySetting::getInstance()->getSurveyMiscSetting('uporabnost_link_'.$rowg['id']); if ($link == '') $link = 'http://'; - echo '

    '.$rowg['naslov'].':

    '; + + echo '
    '; + echo '

    '.$rowg['naslov'].':

    '; + echo ''; + echo '
    '; } echo '
    '; - echo '
    '; - - //echo '

    '; - echo ''; - echo ''; - echo ''; - - echo '
    '; - echo '
    '; + // Gumb shrani + echo '
    '; + echo ''; + echo ''; + echo '
    '; echo ''; - - /*echo '
    '.$lang['srv_upora_dodatno'].''; - echo '

    ' . $lang['srv_upora_text'] . '

    '; - echo '

    '.$lang['srv_primer'].'

    '; - echo ''; - echo '
    ';*/ } /** @@ -3954,6 +4632,8 @@ class SurveyAdminSettings { $sdf = SurveyDataFile::get_instance(); $sdf->init($this->anketa); + $sdf->prepareFiles(); + $headFileName = $sdf->getHeaderFileName(); $dataFileName = $sdf->getDataFileName(); $dataFileStatus = $sdf->getStatus(); @@ -3961,7 +4641,9 @@ class SurveyAdminSettings { if ($dataFileStatus== FILE_STATUS_NO_DATA || $dataFileStatus == FILE_STATUS_NO_FILE || $dataFileStatus == FILE_STATUS_SRV_DELETED){ + echo '
    '.$lang['srv_no_data'].''; Common::noDataAlert(); + echo '
    '; return false; } if ($_GET['m'] == 'excel') { @@ -3978,70 +4660,51 @@ class SurveyAdminSettings { $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '
    '; - echo '
      '; - - if($_GET['m'] != 'export_PDF'){ - echo '
    • '; - echo '' . $lang['srv_dsp_link'] . ''; - echo '
    • '; - } - - // profili statusov - SurveyStatusProfiles :: Init($this->anketa); - SurveyStatusProfiles :: DisplayLink(false); - - # div za profile variabel - SurveyVariablesProfiles :: Init($this->anketa, $global_user_id); - SurveyVariablesProfiles :: DisplayLink(false,false); - SurveyConditionProfiles :: Init($this->anketa, $global_user_id); - SurveyConditionProfiles::DisplayLink(false); - - # div za profile časov - SurveyTimeProfiles :: Init($this->anketa, $global_user_id); - SurveyTimeProfiles::DisplayLink(false,true); - - echo '
    '; - echo '
    '; - - if($_GET['m'] != 'export_PDF'){ if(session_id() == '') session_start(); - echo '
    '; + echo '
    '; + + echo '

    '.$lang['settings'].'

    '; + echo ''; + + + echo '
    '; // Izvozi identifikatorje - echo ''; - echo Help::display('exportSettings'); - - echo '
    '; - + ' onchange="exportChangeCheckbox(\'exportHiddenSystem\');"/>'; + echo '
    '; + // Izvozi podatke - echo '
    '; // Izvozi podatke in parapodatke - echo ''; - echo Help::display('srv_export_full_meta'); - - echo '
    '; - - echo '
    '; - - echo ''; + ' onchange="exportChangeCheckbox(\'exportFullMeta\');"/>'; echo '
    '; + + echo ''; + + echo '
    '; + echo ''; + echo '
    '; + + echo ''; + } # v odvisnosti od $_GET['m'] prikazemo podstran @@ -4049,61 +4712,110 @@ class SurveyAdminSettings { echo '
    '.$lang['srv_lnk_excel'].''; - echo $lang['srv_izvoz_Excel_note']; - echo $lang['srv_izvoz_Excel_note_2']; + echo $lang['srv_izvoz_Excel_note_a']; + echo '
    '; + echo ''; + echo '
    '; + echo '

    '.$lang['srv_izvoz_Excel_note_b'].'

    '; - echo '

    '.$lang['srv_izvoz_Excel_settings'].'

    '; - echo '

    '; - echo ''; - echo ''; - echo ''; - echo '

    '; + echo '

    '.$lang['srv_izvoz_Excel_note_2'].'

    '; - echo '

    '; - echo '

    '; - echo ''; - echo $lang['srv_export_replace1'].' '; - echo $lang['srv_export_replace2'].' '; - echo ''; - echo '
    '; - echo '
    '; - echo ''; - echo $lang['srv_export_replace1'].' '; - echo $lang['srv_export_replace2'].' '; - echo ''; - echo '
    '; - echo '

    '; + echo '
    '; + echo ''.$lang['srv_expor_excel_cell_delimiter'].Help::display('srv_izvozCSV_locitveni').':'; - echo '

    '; - echo ''; - echo '

    '; + echo '

    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; echo '
    '; } elseif ($_GET['m'] == M_EXPORT_EXCEL_XLS) { echo '
    '.$lang['srv_lnk_excel_xls'].''; - echo $lang['srv_izvoz_Excel_xls_note']; - echo $lang['srv_izvoz_Excel_xls_note_2']; + echo $lang['srv_izvoz_Excel_xls_note1']; + echo '
    '; + echo ''; + echo '
    '; + echo '

    '.$lang['srv_izvoz_Excel_note_b'].' '.$lang['srv_izvoz_Excel_xls_prirocnik'].'

    '; echo '
    '; } elseif ($_GET['m'] == M_EXPORT_SPSS) { echo '
    '.$lang['srv_lnk_spss'].''; - echo $lang['srv_izvoz_SPSS_faq']; - echo $lang['srv_izvoz_SPSS_note']; + echo '

    '.$lang['srv_izvoz_SPSS_faq'].'

    '; + echo '

    '.$lang['srv_izvoz_SPSS_note'].'

    '; + + + echo '

    '.$lang['srv_izvoz_step1'].'

    '; + echo '
    '; + echo '

    '.$lang['srv_izvoz_step1_SPSS'].'

    '; + echo '
    '; + echo ''; + echo '
    '; + echo '
    '; + + echo '

    '.$lang['srv_izvoz_step2'].'

    '; + echo '
    '; + echo '

    '.$lang['srv_izvoz_step2a_SPSS'].'

    '; + echo '
    '; + echo ''; + echo '
    '; + echo '

    '.$lang['srv_izvoz_step2b_SPSS'].'

    '; + echo '
    '; + + echo '

    '.$lang['srv_izvoz_step3'].'

    '; + echo '
    '; + echo '
      '; + echo '
    • '.$lang['srv_izvoz_step3a_SPSS'].'
    • '; + echo '
    • '.$lang['srv_izvoz_step3b_SPSS'].'
    • '; + echo '
    • '.$lang['srv_izvoz_step3c_SPSS'].'
    • '; + echo '
    '; + echo '
    '; + + echo '

    '.$lang['srv_izvoz_step4'].'

    '; + echo '
    '; + echo '

    '.$lang['srv_izvoz_step4_SPSS'].'

    '; + echo '
    '; + + echo '

    '.$lang['srv_izvoz_step5'].'

    '; + echo '
    '; + echo '

    '.$lang['srv_izvoz_step5_SPSS'].'

    '; + echo '
    '; + + + echo '
    '; } elseif ($_GET['m'] == M_EXPORT_SAV) { echo '
    '.$lang['srv_lnk_sav'].''; - echo $lang['srv_izvoz_SAV_note']; + echo $lang['srv_izvoz_SAV_note1']; + echo '
    '; + echo ''; + echo '
    '; + echo '

    '.$lang['srv_izvoz_SAV_note2a'].''.$lang['srv_izvoz_SAV_note2b'].''.$lang['srv_izvoz_SAV_note2c'].'

    '; + echo '
    '; } elseif ($_GET['m'] == M_EXPORT_TXT) { echo '
    '.$lang['srv_lnk_txt'].''; - echo $lang['srv_izvoz_txt_note']; + echo $lang['srv_izvoz_txt_note']; + echo '
    '; + echo ''; + echo '
    '; + echo '
    '; } elseif ($_GET['m'] == 'export_PDF') { @@ -4292,28 +5004,52 @@ class SurveyAdminSettings { global $global_user_id, $admin_type, $lang; $avtorRow = SurveyInfo::getInstance()->getSurveyRow(); + + echo '

    '.$lang['srv_dostop_users_list'].'

    '; // Prikazemo samo userje ki lahko urejajo anketo if($show_all == 0){ echo ' ' . "\n"; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; $sql1 = sisplet_query("SELECT u.name, u.surname, u.id, u.email FROM users u, srv_dostop d WHERE d.ank_id='$this->anketa' AND d.uid=u.id"); while ($row1 = mysqli_fetch_array($sql1)) { - - // Da ga ne pocistimo ce je disablan (sam sebe ne more odstranit in avtorja se ne sme odstranit) + + // Da ga ne pocistimo, ce je disablan (sam sebe ne more odstranit in avtorja se ne sme odstranit) if($avtorRow['insert_uid'] == $row1['id'] || $global_user_id == $row1['id']) echo ' ' . "\n"; - - echo '
    ' . "\n"; - echo '' . "\n"; - echo ' '; - echo '
    ' . "\n"; + + echo ''; + + echo ' '; + echo ' '; + echo ' '; + + // Avtor ne rabi ikone za urejanje + echo ' '; + + echo ''; } + + echo '
    '; + //echo ''; + echo '' . $lang['srv_dostop_users_username'] . '' . $lang['srv_dostop_users_email'] . '
    '.$row1['name'] . ($avtorRow['insert_uid'] == $row1['id'] ? ' (' . $lang['author'] . ')' : '') .''.$row1['email'].''; + if($avtorRow['insert_uid'] != $row1['id']) + echo '
    '; + echo '
    '; + + //echo ''.$lang['srv_dostop_users_removeselected'].''; + } - // Prikazemo vse userje, ki jih lahko uporabnig dodaja + // Prikazemo vse userje, ki jih lahko uporabnik dodaja else{ $sql1 = $this->db_select_users_forLevel($this->anketa); if ( mysqli_num_rows($sql1) > 0 ) { @@ -4349,7 +5085,7 @@ class SurveyAdminSettings { global $lang; global $admin_type; - echo '

    '; + echo '

    '; // Admini in managerji lahko dodajo dostop komurkoli if($admin_type == 0 || $admin_type == 1){ @@ -4368,28 +5104,29 @@ class SurveyAdminSettings { echo '

    '; echo ''; - - echo '

    '; - echo $lang['srv_dostop_adduserstxt_email'].'
    '; - echo ''; - echo '

    '; - - echo '

    '; - echo '
    '; - echo ''; - echo '

    '; - - echo '
    '; - echo '

    '.$lang['srv_dostop_adduserstxt_end'].'

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '

    '.$lang['srv_dostop_adduserstxt_end'].'

    '; + + //Opcijsko sporočilo + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo '
    '; + echo '
    '; // Gumb za dodajanje in posiljanje - echo '
    '; - - echo ''; - echo '
    '; - echo '
    '; + echo '
    '; + echo ''; + echo '
    '; } @@ -4451,18 +5188,18 @@ class SurveyAdminSettings { case 'finish_respondent_language': // respondent ki je zakljucil anketo v drugem jeziku (mu omogocimo nastavljanje custom maila za obvescanje) if ($isChecked) { - $p = new Prevajanje($anketa); + $p = new Prevajanje($this->anketa); $p->dostop(); $jeziki = $p->get_all_translation_langs(); if(!empty($jeziki)){ $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '
    '; foreach($jeziki as $key => $jezik){ - echo ''.$lang['srv_alert_respondent'].' - '.$jezik; - echo ' '; - echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; } } } @@ -4471,14 +5208,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 @@ -4488,7 +5226,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]'"); @@ -4497,48 +5235,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 ''; + echo ''; + echo ''; if ($email_ok && $ime_ok) { - echo $lang['srv_alert_respondent_note_ok_email_ime']; - echo ' ' . "\n\r"; - - echo ' '; + echo ' '; $sql1 = sisplet_query("SELECT finish_respondent_if FROM srv_alert WHERE ank_id='$this->anketa'"); $row1 = mysqli_fetch_array($sql1); echo ' '; if ($row1['finish_respondent_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_if']); } + + echo ''.$lang['srv_alert_respondent_note_ok_email_ime'].' '; } else { if ($ime_ok) { // pomeni da email ni ok! napaka - echo $lang['srv_alert_respondent_note_notok_email']; + echo ''.$lang['srv_alert_respondent_note_notok_email'].''; } else { - // email je ok, ime ni, uporabnika fprasamo ali hoce se ime - echo $lang['srv_alert_respondent_note_ok_email']; - - echo ' '; + // email je ok, ime ni, uporabnika vprasamo, ali hoce se ime + echo ''; $sql1 = sisplet_query("SELECT finish_respondent_if FROM srv_alert WHERE ank_id='$this->anketa'"); $row1 = mysqli_fetch_array($sql1); - echo ' '; + echo ' '; if ($row1['finish_respondent_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_if']); } + echo '

    '.$lang['srv_alert_respondent_note_ok_email'].'

    '; + if(!$forma){ - echo $lang['srv_alert_respondent_note_ime']; - echo '   '.$lang['srv_alert_respondent_note_link'].'' . "\n\r"; + echo '

    '.$lang['srv_alert_respondent_note_ime'].''; + echo ' '.$lang['srv_alert_respondent_note_link'].'

    '; } } } @@ -4546,13 +5284,15 @@ class SurveyAdminSettings { // preverimo sistemske nastavitve in spremenljivke ime } else { - echo ''; + echo ''; + echo ''; } break; case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo //respondent iz cms + echo ''; echo ''; if ($isChecked) { @@ -4561,34 +5301,49 @@ 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 ' ' . "\n\r"; - - echo ' '; + echo ' '; $sql1 = sisplet_query("SELECT finish_respondent_cms_if FROM srv_alert WHERE ank_id='$this->anketa'"); $row1 = mysqli_fetch_array($sql1); echo ' '; if ($row1['finish_respondent_cms_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['finish_respondent_cms_if']); } + echo ''.$lang['srv_alert_respondent_cms_note_ok'].' '; + } else { - echo $lang['srv_alert_respondent_cms_note']; - echo '   '.$lang['srv_alert_respondent_cms_note_link'].'' . "\n\r"; + echo '

    '.$lang['srv_alert_respondent_cms_note'].''; + echo ' '.$lang['srv_alert_respondent_cms_note_link'].'

    '; } } 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 = '$this->anketa'"); + if (!$sqlAlert) + echo mysqli_error($GLOBALS['connect_db']); + + if (mysqli_num_rows($sqlAlert) > 0) { + $rowAlert = mysqli_fetch_array($sqlAlert); + } + else { + SurveyAlert::getInstance()->Init($this->anketa, $global_user_id); + $rowAlert = SurveyAlert::setDefaultAlertBeforeExpire(); + } // avtor ankete - if($forma) - echo ''; - else + if($forma) { + echo ''; + echo ''; + } + else { + echo ''; echo ''; - + } if ($isChecked) { //$sql = sisplet_query("SELECT insert_uid, edit_uid FROM srv_anketa WHERE id='$this->anketa'"); //$row = mysqli_fetch_assoc($sql); @@ -4596,8 +5351,6 @@ class SurveyAdminSettings { $row = SurveyInfo::getInstance()->getSurveyRow(); - echo '
    '; - if ($what == 'finish_author') $db_field = 'alert_complete'; else if ($what == 'expire_author') @@ -4622,14 +5375,21 @@ class SurveyAdminSettings { $checked = ($row1[$db_field] == '1') ? ' checked="checked" ' : ''; } - echo '' . "\n\r"; - echo '' . "\n\r"; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + if ($what == 'finish_author') { - echo ' '; + echo ''; + echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } + echo ''; } - echo '' . "\n\r"; + echo '
    '; + + echo '
    '; } // polovimo avtorja pri ostalih obvestilih else{ @@ -4638,14 +5398,21 @@ 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 '' . "\n\r"; - echo '' . "\n\r"; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + if ($what == 'finish_author') { - echo ' '; + echo ''; + echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } + echo ''; } - echo '' . "\n\r"; + echo '
    '; + + echo '
    '; } @@ -4656,14 +5423,21 @@ class SurveyAdminSettings { if ($row1['id']) { // se zgodi da je prazno za metauserje // avtor je vedno chekiran $checked = ( $row1[$db_field] == '1') ? ' checked="checked"' : ''; - echo '' . "\n\r"; - echo '' . "\n\r"; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + if ($what == 'finish_author') { - echo ' '; + echo ''; + echo ' '; echo ' '; if ($row1['alert_complete_if']>0) { if ($b==null) $b = new Branching($this->anketa); $b->conditions_display($row1['alert_complete_if']); } + echo ''; } - echo '' . "\n\r"; + echo '
    '; + + echo '
    '; } } } @@ -4800,8 +5574,8 @@ class SurveyAdminSettings { } function anketa_diagnostika_note($diagnostics,$show_link = false) { global $lang; + $diagnostics->printNote($show_link); - } @@ -4816,6 +5590,8 @@ class SurveyAdminSettings { global $admin_type; global $global_user_id; + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; // Ni admin - nima pravic if ($admin_type != 0) { @@ -4838,93 +5614,107 @@ class SurveyAdminSettings { // SISTEMSKE NASTAVITVE (prej v settings_optional.php) echo '
    '.$lang['as_basic'].''; + + echo '
    '; + AppSettings::getInstance()->displaySettingsGroup('basic'); - echo '
    '; - // Kdo lahko ureja ankete - echo ''; + echo '
    '; + + echo ''; $result = sisplet_query("SELECT value FROM misc WHERE what='SurveyDostop'"); list ($SurveyDostop) = mysqli_fetch_row($result); - echo ''; echo ' '; echo ' '; echo ' '; echo ' '; echo ''; - echo '
    '; + echo '
    '; // Default trajanje piskotka - echo ''; + echo '
    '; + echo ''; $result = sisplet_query("SELECT value FROM misc WHERE what='SurveyCookie'"); list ($SurveyCookie) = mysqli_fetch_row($result); - echo ''; echo ' '; echo ' '; echo ' '; echo ' '; echo ''; - echo '
    '; + echo '
    '; + + echo '
    '; + echo '
    '; // INFO echo '
    '.$lang['as_info'].''; + echo '
    '; AppSettings::getInstance()->displaySettingsGroup('info'); + echo '
    '; echo '
    '; // OMEJITVE echo '
    '.$lang['as_limits'].''; + echo '
    '; AppSettings::getInstance()->displaySettingsGroup('limits'); + echo '
    '; echo '
    '; // SMTP NASTAVITVE echo '
    '.$lang['as_smtp'].''; + echo '
    '; AppSettings::getInstance()->displaySettingsGroup('smtp'); + echo '
    '; echo '
    '; // MODULI echo '
    '.$lang['as_modules'].''; + echo '
    '; AppSettings::getInstance()->displaySettingsGroup('modules'); + echo '
    '; echo '
    '; - - echo '
    '; - - + //UREJANJE OKEN S POMOČJO echo '
    '; echo '' . $lang['srv_edithelp'] . ''; - echo ''; + echo '

    ' . $lang['srv_edithelp'] . ' '.Help::display('srv_window_help').':

    '; Help :: edit_toggle(); echo ''; echo '
    '; - // Missingi + /* Missingi - zakomentirano, prenova po redizajnu $smv = new SurveyMissingValues(); $smv->SystemFilters(); + */ // save gumb - echo ' '; - - echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; // div za prikaz uspešnosti shranjevanja if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } @@ -4937,71 +5727,71 @@ class SurveyAdminSettings { */ function anketa_nastavitve_predvidenicasi () { global $lang; - + global $site_url; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; + echo '
    '; - echo $lang['srv_predvidenicasi_help']; - echo '
    '; - echo '
    '.$lang['srv_stran'].''; - echo '

    '.$lang['srv_timing_page'].': s

    '; - echo '
    '; + echo '
    '.$lang['srv_testiranje_predvidenicas'].''; + + echo '

    '.$lang['srv_predvidenicasi_help'].'

    '; + + echo '
    '; + echo ''; + echo '  s'; + echo '
    '; + + echo '

    '.$lang['srv_predvidenicasi_note'].'

    '; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; - echo '
    '.$lang['srv_vprasanja'].''; - echo '
    '.$lang['srv_question_type'].''.$lang['srv_timing_vprasanje'].''.$lang['srv_timing_kategorija'].''.$lang['srv_timing_kategorija_max'].'
    '; - echo ''; - for ($tip=1; $tip<= 21; $tip++) { if ($tip <= 8 || $tip >= 16) { - - echo ''; - echo ''; + for ($tip=1; $tip<= 21; $tip++) { - if ($tip<=3 || $tip==6 || $tip==16 || $tip==17 || $tip==18 || $tip==19 || $tip==20) - echo ''; - - if ($tip==3){ - $kategorija_max = GlobalMisc::getMisc('timing_kategorija_max_'.$tip); - echo ''; - } - echo ''; - - } } + if ($tip <= 8 || $tip >= 16) { + echo ''; + echo ''; + echo ''; + + if ($tip<=3 || $tip==6 || $tip==16 || $tip==17 || $tip==18 || $tip==19 || $tip==20) + echo ''; + else + echo ''; + + if ($tip==3){ + $kategorija_max = GlobalMisc::getMisc('timing_kategorija_max_'.$tip); + echo ''; + } + else + echo ''; + + echo ''; + + } + } echo '
    '.$lang['srv_timing_vprasanje'].''.$lang['srv_timing_kategorija'].''.$lang['srv_timing_kategorija_max'].'
    '.$lang['srv_vprasanje_tip_'.$tip].' s s s' - /*. ''*/ - . '
    '.$lang['srv_vprasanje_tip_'.$tip].'  s  s  s
    '; echo '
    '; - - echo '
    '; - echo ''.$lang['edit1337'].''; - echo '
    '; - - echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; echo '
    '; echo '
    '; } - - /** prikaze div da so nastavitve shranjene in ga nato skrije - * - */ - function displaySuccessSave() { - global $lang; - echo $lang['srv_success_save']; - } - function tabTestiranje () { global $lang; @@ -5031,14 +5821,14 @@ class SurveyAdminSettings { global $lang; $expected_time = array(); - $expected_time_block = array(); - $block_labels_by_number = array(); + $expected_time_block = array(); + $block_labels_by_number = array(); $expected_vprasanja = array(); $verjetnost = array(); - $verjetnost_block = array(); + $verjetnost_block = array(); - //from php 7.2 this helps to round numbers calculated in bcmod() - without it, it always rounds down to int - bcscale(1); + //from php 7.2 this helps to round numbers calculated in bcmod() - without it, it always rounds down to int + bcscale(1); $sql = sisplet_query("SELECT introduction FROM srv_anketa WHERE id = '$this->anketa'"); $row = mysqli_fetch_array($sql); @@ -5052,7 +5842,7 @@ class SurveyAdminSettings { $expected_time[0][0] = $expected_vprasanja[0][0] + GlobalMisc::getMisc('timing_stran'); $expected_time[0][1] = $expected_time[0][0]; - $block_spr_data = $this->get_block_data_by_spr_id(); + $block_spr_data = $this->get_block_data_by_spr_id(); $sql = sisplet_query("SELECT id, naslov, vrstni_red FROM srv_grupa g WHERE g.ank_id='$this->anketa' ORDER BY g.vrstni_red ASC"); while ($row = mysqli_fetch_array($sql)) { @@ -5080,49 +5870,56 @@ class SurveyAdminSettings { $expected_time[$row['vrstni_red']][1] += GlobalMisc::getMisc('timing_stran'); } - $sql = sisplet_query("SELECT * FROM srv_if as bl LEFT JOIN srv_branching as br ON br.parent = bl.id WHERE bl.enabled='0' AND bl.tip='1' AND br.ank_id = '$this->anketa' ORDER BY bl.number ASC, br.vrstni_red ASC"); - $last_block_st = -1; + $sql = sisplet_query("SELECT * FROM srv_if as bl LEFT JOIN srv_branching as br ON br.parent = bl.id WHERE bl.enabled='0' AND bl.tip='1' AND br.ank_id = '$this->anketa' ORDER BY bl.number ASC, br.vrstni_red ASC"); + $last_block_st = -1; while ($row = mysqli_fetch_array($sql)) { - $new_block = $last_block_st != $row['number']; - if($new_block){ - $last_block_st = $row['number']; - $label = $row['label'] ? $row['label']: $lang['srv_blok'].' '.$last_block_st; - $block_labels_by_number[$last_block_st] = $label; - $expected_time_block[$last_block_st-1][0] = 0; - $expected_time_block[$last_block_st-1][1] = 0; - } - - if(!$row['element_if']){ - $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row['element_spr']][0] * $expected_vprasanja[$row['element_spr']][1]; // dejanski - $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row['element_spr']][0]; // bruto - z vsemi vprasanji - - if ( $expected_vprasanja[$row['element_spr']][1] > $verjetnost_block[$last_block_st-1]) - $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row['element_spr']][1]; - } - else{ - $sql1 = sisplet_query("SELECT * FROM srv_branching WHERE parent='".$row['element_if']."' ORDER BY vrstni_red ASC"); - while ($row1 = mysqli_fetch_array($sql1)) { - $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row1['element_spr']][0] * $expected_vprasanja[$row1['element_spr']][1]; // dejanski - $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row1['element_spr']][0]; // bruto - z vsemi vprasanji - $expected_vprasanja[$row1['element_spr']][4] = $label; - if ( $expected_vprasanja[$row1['element_spr']][1] > $verjetnost_block[$last_block_st-1]) - $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row1['element_spr']][1]; - } - } - - if($new_block){ - $expected_time_block[$last_block_st-1][0] += GlobalMisc::getMisc('timing_stran') * $verjetnost_block[$last_block_st-1]; // pri dejanskem trajanju strani upostevamo verjetnost najverjetnejsega vprasanja na strani (stran se pojavi z najvisjo verjetnostjo vseh vprasanj na strani) - $expected_time_block[$last_block_st-1][1] += GlobalMisc::getMisc('timing_stran'); - } + $new_block = $last_block_st != $row['number']; + + if($new_block){ + $last_block_st = $row['number']; + $label = $row['label'] ? $row['label']: $lang['srv_blok'].' '.$last_block_st; + $block_labels_by_number[$last_block_st] = $label; + $expected_time_block[$last_block_st-1][0] = 0; + $expected_time_block[$last_block_st-1][1] = 0; + } + + if(!$row['element_if']){ + $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row['element_spr']][0] * $expected_vprasanja[$row['element_spr']][1]; // dejanski + $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row['element_spr']][0]; // bruto - z vsemi vprasanji + + if ( $expected_vprasanja[$row['element_spr']][1] > $verjetnost_block[$last_block_st-1]) + $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row['element_spr']][1]; + } + else{ + $sql1 = sisplet_query("SELECT * FROM srv_branching WHERE parent='".$row['element_if']."' ORDER BY vrstni_red ASC"); + while ($row1 = mysqli_fetch_array($sql1)) { + $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row1['element_spr']][0] * $expected_vprasanja[$row1['element_spr']][1]; // dejanski + $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row1['element_spr']][0]; // bruto - z vsemi vprasanji + $expected_vprasanja[$row1['element_spr']][4] = $label; + + if ( $expected_vprasanja[$row1['element_spr']][1] > $verjetnost_block[$last_block_st-1]) + $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row1['element_spr']][1]; + } + } + + if($new_block){ + $expected_time_block[$last_block_st-1][0] += GlobalMisc::getMisc('timing_stran') * $verjetnost_block[$last_block_st-1]; // pri dejanskem trajanju strani upostevamo verjetnost najverjetnejsega vprasanja na strani (stran se pojavi z najvisjo verjetnostjo vseh vprasanj na strani) + $expected_time_block[$last_block_st-1][1] += GlobalMisc::getMisc('timing_stran'); + } } // izpis za strani $max = 0; $total = 0; + $total_brez_pogojev = 0; foreach ($expected_time AS $key => $val) { - if ($val[1] > $max) $max = $val[1]; + + if ($val[1] > $max) + $max = $val[1]; + $total += $val[0]; + $total_brez_pogojev += $val[1]; } if ($max == 0) return; @@ -5131,45 +5928,56 @@ class SurveyAdminSettings { } $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + $skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s'; if ($samo_izracunaj_skupini_cas == 1) return $skupni_cas; - echo '
    '; - echo '
    '.$lang['srv_total_trajanje'].''; - echo '

    '.$lang['srv_dejansko_trajanje'].': '.$skupni_cas.'

    '; + echo '

    '.$lang['srv_dejansko_trajanje'].':

    '; + echo '

    '.$skupni_cas.'

    '; echo '
    '; - echo '
    '; - echo '
    '.$lang['srv_casi_po_straneh'].''; - echo ''; + echo '
    '; + + echo ''; + echo ''; + echo ''; + echo ''; + foreach ($expected_time AS $vrstni_red => $time) { $sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$vrstni_red' AND ank_id = '$this->anketa'"); $row = mysqli_fetch_array($sql); echo ''; - echo ''; - - echo ''; + + echo ''; + + echo ''; echo ''; } - echo ''; - echo ''; - + echo ''; echo '
    '.$lang['srv_casi_po_straneh_stran'].''.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'
    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; - echo '
     
    '; + echo '
    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; + echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; + echo ''; + echo '
    '; + + echo '
    '; if ((($time[1]-$time[0])/$max*85) > 0) - echo '
     
    '; - echo ' '.($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; + echo '
    '; + + echo '
    '; echo '
    '.$lang['srv_anl_suma1'].': '.(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s
    '.$lang['srv_casi_po_vprasanjih_skupaj'].''.$skupni_cas.' / '.$skupni_cas_brez_pogojev.'
    '; - echo '

     
    - '.$lang['srv_neto_t_cas'].''; - echo '
     
    - '.$lang['srv_bruto_t_cas'].'

    '; + echo '
    '; + echo '
    '.$lang['srv_neto_t_cas'].''; + echo '
    '.$lang['srv_bruto_t_cas'].''; + echo '
    '; echo '
    '; @@ -5185,15 +5993,21 @@ class SurveyAdminSettings { $prevstran = false; - echo '
    '; - echo '
    '.$lang['srv_casi_po_vprasanjih_strani'].''; - echo ''; - echo ''; + + echo '
    '.$lang['srv_bruto_v_cas'].''.$lang['srv_verjetnost_pojavitve'].''.$lang['srv_neto_v_cas'].'
    '; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + foreach ($expected_vprasanja AS $vprasanje) { if (!$prevstran || $prevstran != $vprasanje[3]) { - echo ''; + echo ''; $prevstran = $vprasanje[3]; } @@ -5201,102 +6015,156 @@ class SurveyAdminSettings { $verjetnost = $vprasanje[1]; $neto = $bruto * $verjetnost; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + + echo ''; + echo ''; } - echo ''; + echo ''; echo '
    '.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].''.$lang['srv_bruto_v_cas'].''.$lang['srv_verjetnost_pojavitve'].''.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].'
    '.$vprasanje[3].'
    '.$vprasanje[3].'
    '.skrajsaj($vprasanje[2], 30).''.round($bruto, 1).'s'.round($verjetnost*100, 2).'%'.round($neto, 1).'s'; - echo '
     
    '; - if (($bruto-$neto)/$max*85 > 0) - echo '
     
    '; - echo ' '.round($neto, 1).'s / '.round($bruto, 1).'s'; + echo '
    '.skrajsaj($vprasanje[2], 30).''.round($bruto, 1).'s'.round($verjetnost*100, 2).'%'; + echo round($neto, 1).'s / '.round($bruto, 1).'s'; echo ''; + echo '
    '; + + echo '
    '; + if (($bruto-$neto)/$max*85 > 0) + echo '
    '; + + echo '
    '; + echo '
    '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s
    '.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s
    '; + + echo '
    '; + echo '
    '.$lang['srv_neto_v_cas'].''; + echo '
    '.$lang['srv_bruto_v_cas_long'].''; + echo '
    '; + echo '
    '; - //CASI PO BLOKIH - if($block_spr_data){ - // izpis za bloke - $maxb = 0; - $totalb = 0; - foreach ($expected_time_block AS $key => $val) { - if ($val[1] > $maxb) $maxb = $val[1]; - $totalb += $val[0]; - } - - echo '
    '; - echo '
    '.$lang['srv_casi_po_blokih'].''; - echo ''; + //CASI PO BLOKIH + if($block_spr_data){ + // izpis za bloke + $maxb = 0; + $totalb = 0; + foreach ($expected_time_block AS $key => $val) { + if ($val[1] > $maxb) $maxb = $val[1]; + $totalb += $val[0]; + } + + echo '
    '.$lang['srv_casi_po_blokih'].''; + echo '
    '; - foreach ($expected_time_block AS $vrstni_red => $time) { - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; - echo ''; + foreach ($expected_time_block AS $vrstni_red => $time) { + echo ''; + echo ''; - echo ''; - } - echo ''; - echo ''; + echo ''; - echo '
    '.$block_labels_by_number[$vrstni_red+1].'
    '.$lang['srv_casi_po_blokih_blok'].''.$lang['srv_neto_t_cas'].' / '.$lang['srv_bruto_t_cas'].'
    '; - echo '
     
    '; - if ((($time[1]-$time[0])/$maxb*85) > 0) - echo '
     
    '; - echo ' '.($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; - echo '
    '.$block_labels_by_number[$vrstni_red+1].'
    '.$lang['srv_anl_suma1'].': '.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s
    '; + echo ($time[0]<60?round($time[0],1).'s ':round($time[0]/60,1).'min ').'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + if ((($time[1]-$time[0])/$maxb*85) > 0) + echo '
    '; + echo '
    '; + echo '
    '.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($totalb, 60, 0)>0?bcdiv($totalb, 60, 0).'min ':'').''.round(bcmod($totalb, 60), 0).'s
    '; - $prevstran = false; + echo '
    '; + echo '
    '.$lang['srv_neto_t_cas'].''; + echo '
    '.$lang['srv_bruto_t_cas'].''; + echo '
    '; - echo '
    '; + echo ''; + + + // izpis za vprasanja po blokih + $max = 0; + $bruto_total = 0; + $neto_total = 0; + foreach ($expected_vprasanja AS $vpr) { + if($vpr[4]){ + if ($vpr[0] > $max) $max = $vpr[0]; + $bruto_total += $vpr[0]; + $neto_total += $vpr[0] * $vpr[1]; + } + } - echo '
    '.$lang['srv_casi_po_vprasanjih_bloki'].''; - echo ''; - echo ''; - foreach ($expected_vprasanja AS $vprasanje) { - if($vprasanje[4]){ - if (!$prevstran || $prevstran != $vprasanje[4]) { - echo ''; - $prevstran = $vprasanje[4]; - } + $prevstran = false; - $bruto = $vprasanje[0]; - $verjetnost = $vprasanje[1]; - $neto = $bruto * $verjetnost; + echo '
    '.$lang['srv_casi_po_vprasanjih_bloki'].''; - echo '
    '; - echo ''; - echo ''; - } - } - echo ''; - echo '
    '.$lang['srv_bruto_v_cas'].''.$lang['srv_verjetnost_pojavitve'].''.$lang['srv_neto_v_cas'].'
    '.$vprasanje[4].'
    '.skrajsaj($vprasanje[2], 30).''.round($bruto, 1).'s'.round($verjetnost*100, 2).'%'.round($neto, 1).'s'; - echo '
     
    '; - if (($bruto-$neto)/$max*85 > 0) - echo '
     
    '; - echo ' '.round($neto, 1).'s / '.round($bruto, 1).'s'; - echo '
    '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s
    '; - echo '
    '; - } + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + foreach ($expected_vprasanja AS $vprasanje) { + + if($vprasanje[4]){ + if (!$prevstran || $prevstran != $vprasanje[4]) { + echo ''; + $prevstran = $vprasanje[4]; + } + + $bruto = $vprasanje[0]; + $verjetnost = $vprasanje[1]; + $neto = $bruto * $verjetnost; + + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + + echo ''; + + echo ''; + } + + } + echo ''; + echo '
    '.$lang['srv_casi_po_straneh_stran'].'/'.$lang['srv_casi_po_vprasanjih_vprasanje'].''.$lang['srv_bruto_v_cas'].''.$lang['srv_verjetnost_pojavitve'].''.$lang['srv_neto_v_cas'].'/'.$lang['srv_bruto_v_cas_long'].'
    '.$vprasanje[4].'
    '.skrajsaj($vprasanje[2], 30).''.round($bruto, 1).'s'.round($verjetnost*100, 2).'%'; + echo round($neto, 1).'s / '.round($bruto, 1).'s'; + echo ''; + echo '
    '; + + echo '
    '; + if (($bruto-$neto)/$max*85 > 0) + echo '
    '; + + echo '
    '; + echo '
    '.$lang['srv_casi_po_vprasanjih_skupaj'].''.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s'.(bcdiv($neto_total, 60, 0)>0?bcdiv($neto_total, 60, 0).'min ':'').''.round(bcmod($neto_total, 60), 0).'s / '.(bcdiv($bruto_total, 60, 0)>0?bcdiv($bruto_total, 60, 0).'min ':'').''.round(bcmod($bruto_total, 60), 0).'s
    '; + + echo '
    '; + echo '
    '.$lang['srv_neto_v_cas'].''; + echo '
    '.$lang['srv_bruto_v_cas_long'].''; + echo '
    '; + + echo ''; + } } /** @@ -5784,12 +6652,28 @@ class SurveyAdminSettings { // izpis - echo '
    '; + $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + $predviden_cas = (bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0); + + echo '
    '.$lang['srv_total_trajanje'].''; + echo '

    '.$lang['srv_dejansko_trajanje_real'].':

    '; + echo '

    '.$skupni_cas.'

    '; + echo '
    '; + echo '
    '.$lang['srv_dejanski_casi'].''; - echo ''; - echo ''; + + echo '

    '; + + echo '
    '; - echo ''; - echo ''.$lang['srv_stevilo_enot'].'
    '; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; foreach ($povprecni_casi AS $vrstni_red => $time) { @@ -5799,49 +6683,58 @@ class SurveyAdminSettings { $bruto = $povprecni_casi_bruto[$vrstni_red]; echo ''; - echo ''; - - echo ''; + echo ''; - echo ''; - - echo ''; - + echo ''; - echo ''; - - echo ''; - echo ''; - echo ''; + + echo '
    '; } + + echo ''; + echo ''; + + echo ''; + + echo ''; } - if ($_GET['predvideni'] != 1) - echo ''; - echo ''; + + echo ''; + + echo ''; echo '
    '.$lang['srv_casi_po_straneh_stran'].''.$lang['srv_neto_v_cas']; + if ($_GET['predvideni'] == 1) { + echo ' / '.$lang['srv_testiranje_predvidenicas_1']; + } + echo ''.$lang['srv_stevilo_enot'].'
    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; - echo '
     
    '; - //if ($bruto-$time > 0) - //echo '
     
    '; - echo ' '.($time<60?round($time,1).'s ':round($time/60,1).'min ')./*'/ '.($bruto<60?round($bruto,1).'s ':round($bruto/60,1).'min ').''.*/''; + echo '
    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''.($time<60 ? round($time,1).'s ' : round($time/60,1).'min '); + if ($_GET['predvideni'] == 1) { + if ($rezanje_preskocene == 1) + $time = $expected_time[$vrstni_red][0]; + else + $time = $expected_time[$vrstni_red][1]; + + echo ' / '.($time<60 ? round($time,1).'s ' : round($time/60,1).'min ').''; + } echo ''.$count[$vrstni_red]./*' / '.$count_bruto[$vrstni_red].''.*/'
    '; + echo '
    '; + echo '
    '; if ($_GET['predvideni'] == 1) { if ($rezanje_preskocene == 1) $time = $expected_time[$vrstni_red][0]; else $time = $expected_time[$vrstni_red][1]; - echo '
    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).''; - echo '
     
    '; - //if ((($time[1]-$time[0])/$max*85) > 0) - // echo '
     
    '; - echo ' '.($time<60?round($time,1).'s ':round($time/60,1).'min ')./*'/ '.($time[1]<60?round($time[1],1).'s ':round($time[1]/60,1).'min ').''.*/''; - echo '
    '.$count[$vrstni_red].'
    '.$lang['srv_anl_suma1'].': '.(bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; - if ($_GET['predvideni'] == 1) echo ' / '.$lang['srv_skupaj_predvideni'].': '.(bcdiv($total_predvideni, 60, 0)>0?bcdiv($total_predvideni, 60, 0).'min ':'').''.round(bcmod($total_predvideni, 60), 0).'s'; - echo '
    '.$lang['srv_anl_suma1'].''.$skupni_cas; + if ($_GET['predvideni'] == 1) { + if ($rezanje_preskocene == 1) + $time = $expected_time[$vrstni_red][0]; + else + $time = $expected_time[$vrstni_red][1]; + + echo ' / '.$predviden_cas.'s'; + } + echo '
    '; - - if ($_GET['predvideni'] == 1) { - echo '

     
    - '.$lang['srv_neto_t_cas'].''; - echo '
     
    - '.$lang['srv_testiranje_predvidenicas'].'

    '; - } + + echo '
    '; + echo '
    '.$lang['srv_neto_t_cas'].''; + if ($_GET['predvideni'] == 1) + echo '
    '.$lang['srv_testiranje_predvidenicas_1'].''; + echo '
    '; echo '
    '; @@ -5854,16 +6747,20 @@ class SurveyAdminSettings { // izpis histograma casov za vsako stran - echo '
    '.$lang['srv_frekvencna_porazdelitev'].''; - - echo '

    '; - echo ' '; - echo '

    '; + echo '
    '.$lang['srv_frekvencna_porazdelitev'].''; + + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; if ($rezanje_preskocene == 1) { - echo '

    '; + echo '

    '; echo ' '; - echo '

    '; + echo '
    '; } + + echo '
    '; // zdruzimo vse case po straneh na en graf if ($_GET['pages'] != '1') { @@ -5899,10 +6796,10 @@ class SurveyAdminSettings { if ($_GET['pages'] == '1') { $sql = sisplet_query("SELECT naslov FROM srv_grupa WHERE vrstni_red='$key' AND ank_id='$this->anketa'"); $row = mysqli_fetch_array($sql); - echo '

    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'

    '; + echo '

    '.($row['naslov']!=''?$row['naslov']:$lang['srv_intro_label']).'

    '; } - echo ''; + echo '
    '; $histogram = array(); for ($t=0; $t<=$max_time; $t++) $histogram[$t] = 0; @@ -5921,10 +6818,9 @@ class SurveyAdminSettings { for ($t=$t_min; $t<=$max_time; $t++) { - echo ''; } } @@ -5934,16 +6830,16 @@ class SurveyAdminSettings { if ($max_time <= 20) { for ($t=$t_min; $t<=$max_time; $t++) { - echo ''; + echo ''; } } else { if ($t_min == 0) - echo ''; + echo ''; else - echo ''; + echo ''; for ($t=10; $t<=$max_time; $t+=10) { - echo ''; + echo ''; } } @@ -6036,61 +6932,6 @@ class SurveyAdminSettings { } - function testiranje_komentarji_links($comment_count){ - global $lang; - global $site_url; - global $site_path; - global $admin_type; - global $global_user_id; - - - if($_GET['a'] == 'komentarji_anketa'){ - - // Gumb nazaj - echo ''; - - echo ' ('; - if($comment_count['question']['unresolved'] > 0) - echo ''; - echo $comment_count['question']['unresolved']; - if($comment_count['question']['unresolved'] > 0) - echo ''; - echo '/'.$comment_count['question']['all']; - echo ')'; - } - else{ - - echo ''; - - echo $lang['srv_komentarji_imate'].' '; - if($comment_count['question']['unresolved'] > 0) echo ''; - echo $this->string_format((int)$comment_count['question']['unresolved'], 'srv_cnt_komentarji'); - if($comment_count['question']['unresolved'] > 0) echo ''; - - echo ' '.$lang['srv_komentarji_odskupno'].' '; - echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs'); - - echo ''; - - - // Gumb splosni komentarji - echo ''; - - echo ' ('; - if($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved'] > 0) - echo ''; - echo ($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']); - if($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved'] > 0) - echo ''; - echo '/'.($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']); - echo ')'; - } - } - function string_format($cnt,$lang_root) { global $lang; @@ -6177,17 +7018,12 @@ class SurveyAdminSettings { $survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment'); $survey_comment_resp = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment_resp'); $comment_count = $this->testiranje_komentarji_count(); + $commentmarks_who = SurveySetting::getInstance()->getSurveyMiscSetting('commentmarks_who'); $rowa = SurveyInfo::getInstance()->getSurveyRow(); - echo '
    '; - - - echo '
    '; - - - echo ''; - + echo '
    '; + echo $lang['srv_komentarji_imate'].' '; if(($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']) > 0) echo ''; echo $this->string_format((int)($comment_count['survey_resp']['unresolved']+$comment_count['survey_admin']['unresolved']), 'srv_cnt_komentarji'); @@ -6195,18 +7031,12 @@ class SurveyAdminSettings { echo ' '.$lang['srv_komentarji_odskupno'].' '; echo $this->string_format((int)($comment_count['survey_resp']['all']+$comment_count['survey_admin']['all']), 'srv_cnt_komentarji_survey_od'); - echo ''; - - - echo ' '; - echo ' '.$lang['srv_survey_testdata'].''; - echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') '; - echo ''; - echo '' . $lang['srv_survey_testdata2'] . ': '.$lang['srv_testdata_text'].''; - echo '

    '.$lang['srv_preview_testdata_longtext'].'

    '; - echo ''; - echo '
    '; // expanded-tooltip bottom - echo '
    '; // tooltip + echo '
    '; + + + echo '
    '; + echo ' '.$lang['srv_survey_testdata'].''; + echo '
    '; # VV: privzeto naj bodo samo nerešeni komentarji @@ -6214,15 +7044,15 @@ class SurveyAdminSettings { $_GET['only_unresolved'] = 1; } - - echo ''; - # samo nerešeni komentarji if ($commentmarks == 0) { - echo ''; - } else { + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + } + else { echo $lang['move_show'].': '; } - echo ' '.Help::display('srv_comments_only_unresolved').'
    '; $only_unresolved = " "; switch($_GET['only_unresolved']){ @@ -6255,160 +7084,203 @@ class SurveyAdminSettings { break; } + echo '
    '; - echo ''; - // Splosni komentarji urednikov - levo echo '
    '; - echo ''.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')'; + echo '
    '.$lang['srv_comments_anketa_ured'].' ('.$comment_count['survey_admin']['unresolved'].'/'.$comment_count['survey_admin']['all'].')'; - echo '
    '; $sql = sisplet_query("SELECT * FROM post WHERE tid='$rowa[thread]' ".$only_unresolved." "); $rows = (mysqli_num_rows($sql) == 0) ? 0 : mysqli_num_rows($sql) - 1; if ($rows > 0){ - echo ''; - echo '
    '; $i=0; while ($row = mysqli_fetch_array($sql)) { if (($i != 0 && $sortpostorder==0) || ($i < $rows && $sortpostorder==1)) { - if ($row['ocena'] == 0) echo ''; - elseif ($row['ocena'] == 1) echo ''; - elseif ($row['ocena'] == 2) echo ''; - elseif ($row['ocena'] == 3) echo ''; - else echo ''; - echo ''.$f->user($row['uid']).' ('.$f->datetime1($row['time']).'):'; - - echo '
    '; - if ($commentmarks == 1) { - echo ' '; - } else { - // Checkbox za "Koncano" - echo '= 2?' checked':'').' />'; - echo ''; - } - echo '
    '; - - echo '
    '.$row['vsebina'].'
    '; + echo '
    '; - echo ''; + echo '
    '; + echo $lang['srv_comments_user'].''.$f->user($row['uid']).''.$lang['srv_comments_user2']; + echo '
    '; + + $datetime = strtotime($row['time']); + $datetime = date("d.m.Y G:i", $datetime); + + echo '
    '; + echo $datetime; + echo '
    '; + + echo '
    '; + echo $row['vsebina']; + echo '
    '; + + + if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { + + echo '
    '; + + if ($commentmarks == 1) { + echo ' '; + } + else { + + if ($row['ocena']==0) { + echo '

    '; + echo $lang['srv_comments_archive'].'

    '; + } + else { + echo '

    '.$lang['srv_comments_archived'].'

    '; + echo '

    '; + echo $lang['srv_comments_unarchive'].'

    '; + } + } + + echo '
    '; + } + + echo '
    '; } + $i++; - } + } } // Nimamo komentarja else{ // Ce so komentarji aktivirani if($survey_comment != ''){ - echo $lang['srv_no_comments_solved']; + echo '

    '.$lang['srv_no_comments_solved'].'

    '; } else{ - echo $lang['srv_no_comments']; + echo '

    '.$lang['srv_no_comments'].'

    '; } } - - echo '
    '; - + // Dodajanje novega komentarja - echo ''; - echo '

    '.$lang['srv_comments_add_comment'].'

    '; - echo '
    '; + echo ''; + echo $lang['srv_add_comment_toggle']; + echo '
    '; + + echo '
    '; + echo '
    '; $ba = new BranchingAjax($this->anketa); $ba->add_comment_field(0, '1', '4', false); - echo '

    '; - + echo '
    '; + echo '
    '; + + echo '
    '; echo '
    '; // Splosni komentarji respondentov - desno echo '
    '; - echo ''.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')'; - - echo '
    '; + echo '
    '.$lang['srv_comments_anketa_resp'].' ('.$comment_count['survey_resp']['unresolved'].'/'.$comment_count['survey_resp']['all'].')'; $sql = sisplet_query("SELECT * FROM srv_comment_resp WHERE ank_id='$this->anketa' ".$only_unresolved." ORDER BY comment_time $orderby, id $orderby"); if (mysqli_num_rows($sql) > 0) { - echo ''; - echo '
    '; - while ($row = mysqli_fetch_array($sql)) { - - if ($row['ocena'] == 0) echo ''; - elseif ($row['ocena'] == 1) echo ''; - elseif ($row['ocena'] == 2) echo ''; - elseif ($row['ocena'] == 3) echo ''; - else echo ''; - + + echo '
    '; + $datetime = strtotime($row['comment_time']); - $datetime = date("d.m G:i", $datetime); + $datetime = date("d.m.Y G:i", $datetime); if($row['usr_id'] == 0){ - $user = $lang['guest']; + echo '
    '; + echo 'Respondent '.$lang['srv_comments_user2']; + echo '
    '; } else{ $sqlU = sisplet_query("SELECT name FROM users WHERE id='$row[usr_id]'"); $rowU = mysqli_fetch_array($sqlU); $user = $rowU['name']; + + echo '
    '; + echo $lang['srv_comments_user'].''.$user.''.$lang['srv_comments_user2']; + echo '
    '; } - - echo ''.$user.' ('.$datetime.'):'; - - echo '
    '; - if ($commentmarks == 1) { - echo ' '; - } else { - // Checkbox za "Koncano" - echo '= 2?' checked':'').' />'; - echo ''; - } + + echo '
    '; + echo $datetime; + echo '
    '; + + echo '
    '; + echo $row['comment']; echo '
    '; - echo '
    '.$row['comment'].'
    '; - echo ''; + if ($admin_type <= 1 || $rowa['insert_uid']==$global_user_id || $commentmarks_who==0) { + + echo '
    '; + + if ($commentmarks == 1) { + echo ' '; + } + else { + + if ($row['ocena']==0) { + echo '

    '; + echo $lang['srv_comments_archive'].'

    '; + } + else { + echo '

    '.$lang['srv_comments_archived'].'

    '; + echo '

    '; + echo $lang['srv_comments_unarchive'].'

    '; + } + } + + echo '
    '; + } + + echo '
    '; + } } // Nimamo komentarja else{ // Ce so komentarji aktivirani if($survey_comment_resp != ''){ - echo $lang['srv_no_comments_solved']; + echo '

    '.$lang['srv_no_comments_solved'].'

    '; } else{ - echo $lang['srv_no_comments']; + echo '

    '.$lang['srv_no_comments'].'

    '; } } - - echo '
    '; - // Dodajanje novega komentarja - echo ''; - echo '

    '.$lang['srv_comments_add_comment'].'

    '; - echo '
    '; + echo ''; + echo $lang['srv_add_comment_toggle']; + echo '
    '; + + echo '
    '; + echo '
    '; $ba = new BranchingAjax($this->anketa); $ba->add_comment_field(0, '4', '5', false); - echo '

    '; - echo '
    '; - - + echo '
    '; - echo '
    '; + + echo ''; + echo '
    '; + + echo '
    '; // div.komentarji_anketa_holder + } function testiranje_komentarji_komentarji_na_anketo ($return = true) { @@ -6654,11 +7526,6 @@ class SurveyAdminSettings { $rowi = SurveyInfo::getInstance()->getSurveyRow(); - echo '
    '; - - - echo '
    '; - SurveySetting::getInstance()->Init($this->anketa); $question_resp_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment_viewadminonly'); $question_comment_viewadminonly = SurveySetting::getInstance()->getSurveyMiscSetting('question_comment_viewadminonly'); @@ -6675,7 +7542,7 @@ class SurveyAdminSettings { $comment_count = $this->testiranje_komentarji_count(); - echo ''; + echo '
    '; echo $lang['srv_komentarji_imate'].' '; if($comment_count['question']['unresolved'] > 0) echo ''; @@ -6685,18 +7552,20 @@ class SurveyAdminSettings { echo ' '.$lang['srv_komentarji_odskupno'].' '; echo $this->string_format((int)$comment_count['question']['all'], 'srv_cnt_komentar_na_vprs_od'); - echo ''; + echo '
    '; - echo ' '; - echo ' '.$lang['srv_survey_testdata'].''; - echo ' ('.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.') '; + /* - ZAČASNO ZAKOMENTIRAN TOOLTIP (prekriva vsebino za redizajn) @TGecho ' '; echo ''; echo '' . $lang['srv_survey_testdata2'] . ': '.$lang['srv_testdata_text'].''; echo '

    '.$lang['srv_preview_testdata_longtext'].'

    '; echo ''; echo '
    '; // expanded-tooltip bottom - echo '
    '; // tooltip + echo '
    '; // tooltip */ + + echo '
    '; + echo ''.$lang['srv_survey_testdata'].''; + echo '
    '; # VV: privzeto naj bodo samo nerešeni komentarji @@ -6712,19 +7581,21 @@ class SurveyAdminSettings { $show_survey_comment = 1; } - echo ''; - // vsa vprasanja - echo ''; - + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + # samo nerešeni komentarji if ($commentmarks == 0) { - echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + } else { echo $lang['move_show'].': '; } - echo ' '.Help::display('srv_comments_only_unresolved').''; - - - + echo '
    '; + // echo ' '.Help::display('srv_comments_only_unresolved').'
    '; // Nov nacin kjer se sprehodimo cez branching, ker imamo lahko tudi komentarje na ife in bloke @@ -6748,9 +7617,9 @@ class SurveyAdminSettings { $view = 1; - echo ''; - $b = new Branching($this->anketa); + + echo '
      '; foreach($branching_array AS $element){ @@ -6795,8 +7664,6 @@ class SurveyAdminSettings { if (($_GET['all_questions']=='1') OR (mysqli_num_rows($sqlt) > 0)) { $c++; - echo '
      '; - echo '
    • '; echo '
      '; @@ -6816,7 +7683,7 @@ class SurveyAdminSettings { echo '
      '; echo '
    • '; - echo '
      '; + echo '
      '; if ($addfieldposition == 1) { echo ''; @@ -6826,40 +7693,45 @@ class SurveyAdminSettings { $ba->add_comment_field($if_id, '1', '4', false); echo '

      '; } + + echo '
      '; // komentarji na vprasanje if ($row1['thread'] > 0) { if (mysqli_num_rows($sqlt) > 0) { - echo '

      '.$lang['srv_admin_comment'].''; - //$rowss = mysqli_num_rows($sql); - //if ($rowss > 0) - echo ''; - echo '

      '; - + echo '
      '; + + echo $lang['srv_admin_comment'].':'; + + echo '
      '; + $i = 0; while ($rowt = mysqli_fetch_array($sqlt)) { - if ($_GET['only_unresolved'] == 1) { - if ($rowt['ocena'] == 0) echo ''; - elseif ($rowt['ocena'] == 1) echo ''; - elseif ($rowt['ocena'] == 2) echo ''; - elseif ($rowt['ocena'] == 3) echo ''; - else echo ''; - } else { - if ($rowt['ocena'] == 0) echo ''; - elseif ($rowt['ocena'] == 1) echo ''; - elseif ($rowt['ocena'] == 2) echo ''; - elseif ($rowt['ocena'] == 3) echo ''; - else echo ''; - } - - echo ''.$f->user($rowt['uid']).' ('.$f->datetime1($rowt['time']).'):'; - + + echo '
      '; + + echo '
      '; + echo $lang['srv_comments_user'].''.$f->user($rowt['uid']).''.$lang['srv_comments_user2']; + echo '
      '; + + $datetime = strtotime($rowt['time']); + $datetime = date("d.m.Y G:i", $datetime); + + echo '
      '; + echo $f->datetime1($rowt['time']); + echo '
      '; + + echo '
      '; + echo $rowt['vsebina']; + echo '
      '; + + + echo '
      '; + if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { - echo '
      '; - if ($commentmarks == 1) { echo ' '; } else { - echo '= 2?' checked':'').' />'; + + if ($rowt['ocena']==0) { + + echo '

      '; + echo $lang['srv_comments_archive'].'

      '; + + echo '
      '; + echo ''.$lang['srv_comment_comment'].''; + echo '
      '; + } + + else { + + echo '

      '.$lang['srv_comments_archived'].'

      '; + echo '

      '; + echo $lang['srv_comments_unarchive'].'

      '; + + } } - echo '
      '.$lang['srv_comment_comment'].''; - echo '
      '; } - - echo '
      '.$rowt['vsebina'].'
      '; - echo ''; + + echo '
      '; // .bottom_options + echo '
      '; // comment_box + + + echo '
      '; + echo '
      '; } } } - + if ($addfieldposition == '' || $addfieldposition == 0) { - echo ''; - echo '

      '.$lang['srv_comments_add_comment'].'

      '; - echo ''; + + + echo '
      '; + echo ''; + echo $lang['srv_add_comment_toggle']; + echo '
      '; + + echo '
      '; + + echo '
      '; + $ba = new BranchingAjax($this->anketa); + $ba->add_comment_field($spr_id, '1', '4', false); + echo '
      '; + echo '
      '; + } + + echo '
      '; #editor + echo '
      '; //prazen, respondenti ne komentirajo na IFe in bloke echo '
      '; - echo '
      '; - echo '
      '; + echo '
      '; #question_comment_holder } } // Gre za navadno vprasanje else{ $spr_id = $element['spr_id']; - $sql1 = sisplet_query("SELECT thread, note FROM srv_spremenljivka WHERE id = '$spr_id'"); + $sql1 = sisplet_query("SELECT tip, thread, note FROM srv_spremenljivka WHERE id = '$spr_id'"); $row1 = mysqli_fetch_array($sql1); - $orderby = $sortpostorder == 1 ? 'DESC' : 'ASC' ; + $orderby = $sortpostorder == 1 ? 'DESC' : 'ASC'; $tid = $row1['thread']; $only_unresolved = " "; @@ -6927,22 +7829,21 @@ class SurveyAdminSettings { if ($admin_type <= $question_comment_viewadminonly) { // vidi vse komentarje $sqlt = sisplet_query("SELECT * FROM post WHERE vsebina NOT LIKE '%{$tema_vsebuje}%' AND tid='$tid' $only_unresolved ORDER BY time $orderby, id $orderby"); - } elseif ($question_comment_viewauthor==1) { // vidi samo svoje komentarje + } + elseif ($question_comment_viewauthor==1) { // vidi samo svoje komentarje $sqlt = sisplet_query("SELECT * FROM post WHERE vsebina NOT LIKE '%{$tema_vsebuje}%' AND tid='$tid' $only_unresolved AND uid='$global_user_id' ORDER BY time $orderby, id $orderby"); - } else { // ne vidi nobenih komentarjev + } + else { // ne vidi nobenih komentarjev $sqlt = sisplet_query("SELECT * FROM post WHERE 1=0"); } $sql2 = sisplet_query("SELECT COUNT(*) AS count FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2"); $row2 = mysqli_fetch_array($sql2); - - + if ( ($_GET['all_questions']=='1') OR ( mysqli_num_rows($sqlt) > 0 || $row2['count'] > 0 || $row1['note'] != '' ) ) { $c++; - echo '
      '; - - echo '
    • '; + echo '
    • '; $b->vprasanje($spr_id); echo '
    • '; @@ -6956,7 +7857,7 @@ class SurveyAdminSettings { } } - echo '
      '; + echo '
      '; if ($addfieldposition == 1) { echo ''; @@ -6966,40 +7867,43 @@ class SurveyAdminSettings { $ba->add_comment_field($spr_id, '1', '4', false); echo '

      '; } - - // komentarji na vprasanje + + echo '
      '; + + // komentarji urednikov if ($row1['thread'] > 0) { if (mysqli_num_rows($sqlt) > 0) { + + echo '
      '; + + echo $lang['srv_admin_comment'].':'; - echo '

      '.$lang['srv_admin_comment'].''; - //$rowss = mysqli_num_rows($sql); - //if ($rowss > 0) - echo ''; - echo '

      '; + echo '
      '; $i = 0; while ($rowt = mysqli_fetch_array($sqlt)) { - if ($_GET['only_unresolved'] == 1) { - if ($rowt['ocena'] == 0) echo ''; - elseif ($rowt['ocena'] == 1) echo ''; - elseif ($rowt['ocena'] == 2) echo ''; - elseif ($rowt['ocena'] == 3) echo ''; - else echo ''; - } else { - if ($rowt['ocena'] == 0) echo ''; - elseif ($rowt['ocena'] == 1) echo ''; - elseif ($rowt['ocena'] == 2) echo ''; - elseif ($rowt['ocena'] == 3) echo ''; - else echo ''; - } - - echo ''.$f->user($rowt['uid']).' ('.$f->datetime1($rowt['time']).'):'; - + + echo '
      '; + + echo '
      '; + echo $lang['srv_comments_user'].''.$f->user($rowt['uid']).''.$lang['srv_comments_user2']; + echo '
      '; + + $datetime = strtotime($rowt['time']); + $datetime = date("d.m.Y G:i", $datetime); + + echo '
      '; + echo $datetime; + echo '
      '; + + echo '
      '; + echo $rowt['vsebina']; + echo '
      '; + if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { - echo '
      '; - + echo '
      '; if ($commentmarks == 1) { echo ' '; } else { - echo '= 2?' checked':'').' />'; + + if ($rowt['ocena']==0) { + echo '

      '; + echo $lang['srv_comments_archive'].'

      '; + + echo '
      '; + echo ''.$lang['srv_comment_comment'].''; + echo '
      '; + } + else { + echo '

      '.$lang['srv_comments_archived'].'

      '; + echo '

      '; + echo $lang['srv_comments_unarchive'].'

      '; + } } - echo '
      '.$lang['srv_comment_comment'].''; + echo '
      '; } - - echo '
      '.$rowt['vsebina'].'
      '; - echo ''; + + echo '
      '; + + echo '
      '; + echo '
      '; } + } + } - + if ($addfieldposition == '' || $addfieldposition == 0) { - echo ''; - echo '

      '.$lang['srv_comments_add_comment'].'

      '; - echo '
      '; + echo ''; + echo $lang['srv_add_comment_toggle']; + echo '
      '; + + echo '
      '; + + echo '
      '; $ba = new BranchingAjax($this->anketa); $ba->add_comment_field($spr_id, '1', '4', false); - echo '

      '; + echo '
      '; + echo '
      '; } - + echo '
      '; + + echo '
      '; + // komentarji respondentov if ($row2['count'] > 0) { if ($admin_type <= $question_resp_comment_viewadminonly) { - echo '
      '; - echo '

      '.$lang['srv_repondent_comment'].'

      '; - + + echo '
      '; + echo $lang['srv_repondent_comment'].':'; + echo '
      '; + if ($_GET['only_unresolved'] == 1) $only_unresolved = " AND d.text2 <= 1 "; else $only_unresolved = " "; - $sqlt = sisplet_query("SELECT * FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2 ORDER BY id ASC"); + $sqlt = sisplet_query("SELECT * FROM srv_data_text".$this->db_table." WHERE spr_id='0' AND vre_id='$spr_id' $only_unresolved2 ORDER BY id $orderby"); if (!$sqlt) echo mysqli_error($GLOBALS['connect_db']); while ($rowt = mysqli_fetch_array($sqlt)) { + + echo '
      '; + + // Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja + $sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'"); + if(mysqli_num_rows($sqlTime) > 0){ + + $rowTime = mysqli_fetch_array($sqlTime); + + echo '
      '; + echo 'Respondent '.$lang['srv_comments_user2']; + echo '
      '; - if ($rowt['text2'] == 0) echo ''; - elseif ($rowt['text2'] == 1) echo ''; - elseif ($rowt['text2'] == 2) echo ''; - elseif ($rowt['text2'] == 3) echo ''; - else echo ''; - - + if ( strpos($rowt['text'], '__DATE__') !== false ) { + $rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']); + echo '
      '; + echo nl2br($rowt['text']); + echo '
      '; + } + else { + + $datetime = strtotime($rowTime['time_edit']); + $datetime = date("d.m.Y G:i", $datetime); + + echo '
      '; + echo $datetime; + echo '
      '; + + echo '
      '; + echo nl2br($rowt['text']); + echo '
      '; + } + } + else{ + if ( strpos($rowt['text'], '__DATE__') !== false ) { + $rowt['text'] = str_replace('__DATE__', '', $rowt['text']); + echo '
      '; + echo nl2br($rowt['text']); + echo '
      '; + } + else { + echo '
      '; + echo nl2br($rowt['text']); + echo '
      '; + } + } + if ($admin_type <= 1 || $rowi['insert_uid']==$global_user_id || $commentmarks_who==0) { - echo '
      '; + + echo '
      '; + if ($commentmarks == 1) { echo ' '; } else { - echo '= 2?' checked':'').' />'; + + if ($rowt['text2']==0) { + echo '

      '; + echo $lang['srv_comments_archive'].'

      '; + } + else { + echo '

      '.$lang['srv_comments_archived'].'

      '; + echo '

      '; + echo $lang['srv_comments_unarchive'].'

      '; + } } - echo '
      '; + echo '
      '; } - // Ce smo slucajno pobrisali testne vnose, nimamo casa vnosa komentarja - $sqlTime = sisplet_query("SELECT time_edit FROM srv_user WHERE id='".$rowt['usr_id']."'"); - if(mysqli_num_rows($sqlTime) > 0){ - - $rowTime = mysqli_fetch_array($sqlTime); - - if ( strpos($rowt['text'], '__DATE__') !== false ) { - $rowt['text'] = str_replace('__DATE__', $f->datetime1($rowTime['time_edit']), $rowt['text']); - echo ''.nl2br($rowt['text']).'
      '; - } - else { - echo ''.$f->datetime1($rowTime['time_edit']).':
      '; - echo ''.nl2br($rowt['text']).'
      '; - } - } - else{ - if ( strpos($rowt['text'], '__DATE__') !== false ) { - $rowt['text'] = str_replace('__DATE__', '', $rowt['text']); - echo ''.nl2br($rowt['text']).'
      '; - } - else { - echo ''.nl2br($rowt['text']).'
      '; - } - } - - echo '
      '; - + echo '
      '; } - echo '
      '; } } - - echo '
      '; - echo '
      '; - } + + echo '
      '; #div.question_comment.resp + + + echo '
      '; #div.question_comment_holder + } } + } - - echo ''; + + echo '
    '; if ($c == 0) { - echo '
    '; - echo $lang['srv_no_comments_solved'].'
    '; + echo '
    '; + echo $lang['srv_no_comments_solved']; #echo ''.$lang['srv_settings_komentarji'].''; echo '
    '; } } else { - echo '
    '; - echo $lang['srv_no_comments'].'
    '; + echo '
    '; + echo $lang['srv_no_comments']; echo '
    '; } echo '
    '; // branching echo '
    '; - echo '
    '; // placeholder } /** @@ -7960,17 +8918,33 @@ class SurveyAdminSettings { $total_rows = $row['count']; echo '
    '; - echo '

    '; - echo ''.$lang['srv_stevilo_vnosov'].': (max 1000) '; + + echo '

    '.$lang['srv_testiranje_vnosi'].''; + echo '

    '.$lang['srv_testni_nagovor'].'

    '; + + echo '
    '; + echo $lang['srv_stevilo_vnosov'].':'; + echo '
    '; + echo ''; + echo '(max 1000)'; + echo '
    '; + echo '
    '; + + echo '
    '; echo ''; - echo ''; - echo ''; - echo '

    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; + echo ''; - echo '

    '.$lang['srv_testni_nagovor'].'

    '; - - echo ''.$lang['srv_delete_testdata'].' ('.$total_rows.')'; + echo '

    '.$lang['srv_testni_nakonec'].'

    '; + + echo ''.$lang['srv_delete_testdata'].' ('.$total_rows.')'; if ($total_rows > 0) { @@ -7991,12 +8965,12 @@ class SurveyAdminSettings { } echo '
    '.$row['pagename'].''; - echo '
    '; + echo ''; - echo '
    '; - //echo ''.$t.''; + echo '
    '; echo '
    '.$t.($minute?'min':'s').''.$t.($minute?'min':'s').'0'.($minute?'min':'s').'0'.($minute?'min':'s').'2'.($minute?'min':'s').'2'.($minute?'min':'s').''.$t.''.$t.'
    '; + echo '
    '; $prevpage = $row['gru_id']; } - echo ''; + echo ''; // radio ali select, checkbox, textbox, textbox*, number, datum if ( ($row['tip']==1 || $row['tip']==3 || $row['tip']==2 || $row['tip']==4 || $row['tip']==21 || $row['tip']==7 || $row['tip']==8) ) { @@ -8064,9 +9038,11 @@ class SurveyAdminSettings { } } - echo ''; echo ''; @@ -8076,8 +9052,8 @@ class SurveyAdminSettings { echo '
    '.skrajsaj(strip_tags($row['naslov']),20).'
    '.skrajsaj(strip_tags($row['naslov']),50).''; - echo '
     
    '; - echo ' '.$p.'% ('.($total_rows-$rowc['count']).')'; + echo '
    '; + echo '
    '; + echo '
    '; + echo ' '.$p.'% ('.($total_rows-$rowc['count']).')'; + echo '
    '; echo '
    '; echo '
    '; - - echo '

    '.$lang['srv_testni_nakonec'].'

    '; + + echo '
    '; } } } @@ -8140,33 +9116,41 @@ class SurveyAdminSettings { $_expire = explode('-',$row['expire']); $expire = $_expire[2].'.'.$_expire[1].'.'.$_expire[0]; - echo '
    '.$lang['srv_activate_duration_2'].' '.Help::display('srv_activity_quotas').''; - echo '

    '; - echo '' . $lang['srv_activate_duration_manual_from'].''; - echo ''; - echo '

    '; - - echo '

    '; - echo '' . $lang['srv_activate_duration_manual_to'].''; - echo ''; - echo '

    '; - - echo '

    '; - echo '' . $lang['srv_trajna_anketa'].''; - echo ''; - echo '

    '; - echo '
    '; + echo '
    '; + echo ''.$lang['srv_activate_duration_2'].''; + echo '
    '; + echo '' . $lang['srv_activate_duration_manual_from'].''; + echo '
    '; + echo ''; + echo '
    '; echo '
    '; - #echo ''; + echo '
    '; + echo '' . $lang['srv_activate_duration_manual_to'].''; + echo '
    '; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; echo ' - '; + datepicker("#expireManual1");'; + + if($row['expire'] == PERMANENT_DATE) + echo '$("#expire").find(".ui-datepicker-trigger").addClass("disabled");'; + + echo ' }); + '; + } function DisplayNastavitveMaxGlasov() { @@ -8179,31 +9163,41 @@ class SurveyAdminSettings { $row = SurveyInfo::getInstance()->getSurveyRow(); //Nastavitev max stevila glasov - echo '
    '; echo '
    '; echo ''.$lang['srv_vote_quotas'].' '.Help::display('srv_activity_quotas').''; - echo '

    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo '    '; - echo ''; - echo '

    '; + echo '
    '; + echo '' . $lang['srv_vote_quotas_2'] . ':'; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + // Opozorilo, da je limit odgovorov presezen - echo '

    '; - echo $lang['srv_survey_voteLimit_warning'].':
    '; + echo '

    '; + + echo '
    '; + echo ''.$lang['srv_vote_count'].':'; + echo ''; + echo '
    '; + + echo '

    '.$lang['srv_survey_voteLimit_warning'].':

    '; $srv_survey_non_active_voteLimit = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_survey_non_active_voteLimit'); if ($srv_survey_non_active_voteLimit == '') $srv_survey_non_active_voteLimit = $lang['srv_survey_non_active_voteLimit']; - echo ''.$srv_survey_non_active_voteLimit.''; - - echo ' '.$lang['edit3'].''; - echo '

    '; - + echo '

    '.$srv_survey_non_active_voteLimit.'

    '; + echo '

    '; } @@ -8258,6 +9252,8 @@ class SurveyAdminSettings { if( !($admin_type == 1 || $admin_type == 0) ) return ''; + echo '

    '.$lang['srv_users_add_assigned'].'

    '; + // Na virtualkah imajo managerji omejitev st. dodeljenih uporabnikov - ZAENKRAT JE TO ONEMOGOCENO, KASNEJE SE LAHKO OMEJI NA PAKET if(false && isVirtual() && $admin_type == 1){ @@ -8273,56 +9269,89 @@ class SurveyAdminSettings { $managed_accounts_count = mysqli_num_rows($sql); - echo '

    '; - echo $lang['srv_users_add_assigned_max_1'].' '.$managed_accounts_limit.' '.$lang['srv_users_add_assigned_max_2']; + echo '

    '; + echo $lang['srv_users_add_assigned_max_1'].' '.$managed_accounts_limit.' '.$lang['srv_users_add_assigned_max_2'].'

    '; // Manager na virtualkah ima omejitev koliko uporabnikov lahko pregleduje if($managed_accounts_count >= $managed_accounts_limit){ - echo '

    '; + echo '

    '; echo $lang['srv_users_add_assigned_max_reached']; echo '

    '; return; } elseif($managed_accounts_count > 0){ - echo '

    '; - echo $lang['srv_users_add_assigned_current'].' '.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.''; + echo '

    '; + echo $lang['srv_users_add_assigned_current'].' '.$managed_accounts_count.' '.$lang['of'].' '.$managed_accounts_limit.'

    '; } - - echo '

    '; } echo '
    '; + echo '
    '; // Dodajanje novih uporabnikov - ustvari racun, doda uporabnika pod pregled in mu poslje mail + echo '
    '; echo '
    '; - echo '

    '.$lang['srv_users_add_assigned_title'].'

    '; - echo '

    '.(empty($_GET['add']) && $_GET['error']=='email'?''.$lang['srv_added_false'].'':'').'

    '; - echo '

    '; - echo '

    '; - echo '

    '.(empty($_GET['add']) && $_GET['error']=='pass'?''.$lang['pass_doesnt_match'].'':'').'

    '; - echo '

    '; - echo '

    '; - echo ' '.$lang['create_add'].''; - echo '

    '; + echo '

    '.$lang['srv_users_add_assigned_title'].'

    '; + echo '
    '; + + echo '
    '; + echo '
    '; + echo ''.$lang['name'].':'; + echo ''; + echo '
    '; + + echo '
    '; + echo ''.$lang['surname'].':'; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo '

    '.$lang['email'].':

    '; + echo ' '.(empty($_GET['add']) && $_GET['error']=='email'?''.$lang['srv_added_false'].'':''); + echo '
    '; + + echo '
    '; + echo '
    '; + echo '

    '.$lang['password'].':

    '; + echo ' '.(empty($_GET['add']) && $_GET['error']=='pass'?''.$lang['pass_doesnt_match'].'':''); + echo '
    '; + + echo '
    '; + echo '

    '.$lang['password_confirm'].':

    '; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; echo '
    '; + echo '
    '; // #dodajaje_left + + echo '
    '; + // admini si lahko dodajajo ze obstojece uporabnike if ($admin_type == 0) { - echo '


    '; - echo '
    '; - echo '

    '.$lang['srv_manager_add_user2'].'

    '; - echo '

    '; - - //echo '

    '; - echo '

    '; - echo ' '.$lang['add'].''; - echo '

    '; + echo '

    '.$lang['srv_manager_add_user2'].'

    '; + + echo '
    '; + echo '

    '.$lang['srv_manager_add_user_label'].':

    '; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo '
    '; echo '
    '; } @@ -8342,6 +9371,9 @@ class SurveyAdminSettings { }*/ echo '
    '; + echo '
    '; + echo '
    '; + } /** @@ -8351,9 +9383,10 @@ class SurveyAdminSettings { global $lang; global $admin_type; - echo ''; + echo '
    '; echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -8366,12 +9399,11 @@ class SurveyAdminSettings { echo ''; echo ''; echo ''; - echo ''; echo ''; echo '
    '.$lang['edit2'].'' . $lang['srv_survey_list_users_name'] . '' . $lang['srv_survey_list_users_email'] . '' . $lang['admin_type'] . '' . $lang['users_gdpr_title'] . '' . $lang['srv_survey_list_users_registred'] . '' . $lang['srv_survey_list_users_last_login'] . ''.$lang['edit2'].'
    '; - // Dodajanje uporabnikov + /*/ Dodajanje uporabnikov echo '
    '; // Admin lahko doda novega uporabnika v sistem (brez pregleda) @@ -8381,7 +9413,7 @@ class SurveyAdminSettings { echo ''; } - echo '
    '; + echo '
    ';*/ } /** @@ -8395,9 +9427,21 @@ class SurveyAdminSettings { $sqlU = sisplet_query("SELECT name, surname, email FROM users WHERE id='".$global_user_id."'"); $rowU = mysqli_fetch_array($sqlU); + + // Dodajanje uporabnikov + echo '
    '; - // Naslov - echo '

    '; + // Manager ali admin lahko doda novega uporabnika pod pregled + $this->dodeljeniUporabniki(); + + echo '

    '; + + + // PREGLED NAD UPORABNIKI - TABELA + echo '
    '; + + // Naslov + /*echo '

    '; if($admin_type == 0) echo $lang['administrator']; @@ -8410,15 +9454,15 @@ class SurveyAdminSettings { echo ' '; - echo '

    '; + echo ''; */ + echo '

    '.$lang['srv_users_assigned_title'].'

    '; // Tabela - echo '
    '.$lang['srv_users_assigned_title'].''; - //echo '

    '.$lang['srv_users_assigned_title'].'

    '; - echo ''; + echo '
    '; echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -8429,20 +9473,9 @@ class SurveyAdminSettings { echo ''; echo ''; echo ''; - echo ''; echo ''; echo '
    '.$lang['edit2'].'' . $lang['srv_survey_list_users_name'] . '' . $lang['srv_survey_list_users_email'] . '' . $lang['admin_type'] . '' . $lang['users_gdpr_title'] . '' . $lang['srv_survey_list_users_registred'] . '' . $lang['srv_survey_list_users_last_login'] . ''.$lang['edit2'].'
    '; - echo '
    '; - - - // Dodajanje uporabnikov - echo '
    '; - - // Manager ali admin lahko doda novega uporabnika pod pregled - echo '
    '.$lang['srv_users_add_assigned'].''; - $this->dodeljeniUporabniki(); - echo '
    '; echo '
    '; } @@ -8453,7 +9486,7 @@ class SurveyAdminSettings { public function deletedUsersList(){ global $lang; - echo ''; + echo '
    '; echo ''; echo ''; echo ''; @@ -8472,7 +9505,7 @@ class SurveyAdminSettings { public function unsignedUsersList(){ global $lang; - echo '
    '.$lang['srv_survey_list_users_name'].''.$lang['srv_survey_list_users_email'].'
    '; + echo '
    '; echo ''; echo ''; echo ''; @@ -8491,12 +9524,12 @@ class SurveyAdminSettings { echo '
    '.$lang['srv_survey_list_users_name'].''.$lang['srv_survey_list_users_email'].'
    '; echo ''; + echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; - echo ''; echo ''; echo '
    '.$lang['edit2'].''.$lang['srv_survey_list_users_name'].''.$lang['srv_survey_list_users_email'].''.$lang['admin_type'].''.$lang['lang'].''.$lang['registered'].''.$lang['edit2'].'
    '; } @@ -8574,14 +9607,17 @@ class SurveyAdminSettings { if ($_GET['a'] == 'uporabnost'){ - echo '
    '.$lang['srv_uporabnost'].''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_4_3'].''; + echo '
    '.$lang['srv_uporabnost'].Help::display('srv_evalvacija_strani').''; + + echo '

    '.$lang['srv_vrsta_survey_note_4_3'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    '; if(isset($modules['uporabnost'])){ $this->uporabnost(); @@ -8691,13 +9727,15 @@ class SurveyAdminSettings { elseif ($_GET['a'] == 'kviz'){ echo '
    '.$lang['srv_kviz'].''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_6_4'].''; + + echo '

    '.$lang['srv_vrsta_survey_note_6_4'].'

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    '; if(isset($modules['quiz'])){ $sq = new SurveyQuiz($this->anketa); @@ -8804,6 +9842,18 @@ class SurveyAdminSettings { echo '
    '; } elseif ($_GET['a'] == A_TELEPHONE){ + + echo '
    '; + if(isset($modules['phone'])){ + $ST = new SurveyTelephone($this->anketa); + $ST->action($_GET['m']); + } + echo '
    '; + + $hide_tel_fieldset = ''; + if ($_GET['m'] == 'recipients_lists') { + $hide_tel_fieldset = 'displayNone'; + } // Ce je anketar ne vidi teh nastavitev $isAnketar = Common::isUserAnketar($this->anketa, $global_user_id); @@ -8815,46 +9865,46 @@ class SurveyAdminSettings { // Ce se nimamo nobene stevilke v bazi, pustimo da se lahko ugasne if($rowT['cnt'] == 0){ - echo '
    '.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_7_3'].''; + echo '
    '.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '

    '.$lang['srv_vrsta_survey_note_7_3'].'

    '; echo '
    '; } - else{ + /*else{ echo ''.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help'); echo '
    '; - } + }*/ } else{ - echo '
    '.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_7_3'].''; + echo '
    '.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '

    '.$lang['srv_vrsta_survey_note_7_3'].'

    '; echo '
    '; } - - echo '
    '; } - - echo '
    '; - if(isset($modules['phone'])){ - $ST = new SurveyTelephone($this->anketa); - $ST->action($_GET['m']); - } - echo '
    '; } elseif ($_GET['a'] == A_CHAT){ global $site_path; echo '
    '.$lang['srv_vrsta_survey_type_14'].''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_14_1'].''; + + echo '

    '.$lang['srv_vrsta_survey_note_14_1'].'

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    '; if(isset($modules['chat'])){ $sc = new SurveyChat($this->anketa); @@ -8866,13 +9916,15 @@ class SurveyAdminSettings { global $site_path; echo '
    '.$lang['srv_vrsta_survey_type_15'].''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_15_1'].''; + echo '

    '.$lang['srv_vrsta_survey_note_15_1'].'

    '; + echo '

    '.$lang['srv_vrsta_survey_note_15_1a'].'

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; - echo '
    '; - echo '
    '; if(isset($modules['panel'])){ $sp = new SurveyPanel($this->anketa); @@ -8942,19 +9994,20 @@ class SurveyAdminSettings { if ($_GET['m'] == 'respondenti' || $_GET['m'] == "") { echo '
    '.$lang['srv_vrsta_survey_type_8'].''; - echo ''; - echo '
    '.$lang['srv_vrsta_survey_note_8_3'].''; - echo '
    '; - - echo '
    '; - + + echo '

    '.$lang['srv_vrsta_survey_note_8_3'].'

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; - // urejanje respondentov if(isset($modules['social_network'])){ $this->SN_Settings(); } echo '
    '; + + echo '
    '; } } elseif ($_GET['a'] == A_360){ @@ -9174,7 +10227,10 @@ class SurveyAdminSettings { } function globalUserSettings () { - global $lang, $global_user_id, $admin_type; + global $lang, $global_user_id, $admin_type, $site_url; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; # polovimo nastavitve uporabnika UserSetting::getInstance()->Init($global_user_id); @@ -9216,83 +10272,102 @@ class SurveyAdminSettings { $sql = sisplet_query("SELECT lang FROM users WHERE id = '$global_user_id'"); $row = mysqli_fetch_array($sql); $lang_admin = $row['lang']; - echo ''.$lang['lang'] . ':'; echo ''; echo ''; echo ''; - - echo '
    '; + echo '
    '; - // Napredni vmesnik (star design za moje ankete) - echo ''; + echo '
    '; + echo ''.$lang['srv_settings_interfaceshow'] . ':'; - echo '
    '; + // Prikaži ikono za jezik v navigacijski vrstici ankete, desno zgoraj - TE NASTAVITVE NE UPOSTEVAMO VEC + /*echo '
    '; + echo ''; + echo ''; + echo ''; + echo '
    ';*/ - // Prikaži ikono za jezik v navigacijski vrstici ankete, desno zgoraj - echo ''; - - echo '
    '; - // Opcija enklik ustvarjanja ankete (v mojih anketah) - echo '
    '; echo '
    '; echo '
    '.$lang['srv_survey_settings'].''; - + + echo '
    '; + echo ''.$lang['srv_settings_oncreation'] . ':'; + // Aktivna anketa ob aktivaciji - TO PUSTIMO SAMO ADMINOM ZARADI GDPR OPOZORILA OB AKTIVACIJI if($admin_type == '0'){ - echo '
    '; + + echo '
    '; + echo ''.$lang['srv_settings_onactivation'] . ':'; + + // Zaklep urejanja ob aktivaciji + echo '
    '; + echo ''; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; echo '
    '; @@ -9300,11 +10375,14 @@ class SurveyAdminSettings { // API avtentikacija - echo '
    '.$lang['srv_api'].''; - - echo ''.$lang['srv_api_auth'].': '; - echo ''.$lang['srv_api_auth2'].''; - echo '

    '; + echo '
    '.$lang['srv_api'].Help::display('srv_nastavitve_API').''; + + echo '

    '.$lang['srv_api_auth'].':

    '; + + echo '
    '; + echo ''; + echo '
    '; + echo $lang['additional_info_api']; @@ -9312,14 +10390,15 @@ class SurveyAdminSettings { // save gumb - echo ' '; - - echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; // div za prikaz uspešnosti shranjevanja if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } echo '
    '; @@ -9338,26 +10417,34 @@ class SurveyAdminSettings { echo ' ' . "\n\r"; echo ' ' . "\n\r"; - echo '
    '.$lang['edit_data'].''; - - echo '
    '.$lang['logged_in_as'].': '.$row['name'].' '.$row['surname'].'
    '; + echo '
    '.$lang['edit_data'].''; + + //Prijavljeni kot, status, zadnja prijava, aktivni paket + echo '
    '; + if($row['type'] == '0') $type = $lang['admin_admin']; elseif($row['type'] == '1') $type = $lang['admin_manager']; else $type = $lang['admin_narocnik']; - echo '
    '.$lang['your_status'].': '.$type.'
    '; - - // Zadnja prijava - echo '
    '.$lang['srv_last_login'].': '.date('j.n.Y', strtotime($row['last_login'])).' '.$lang['ob'].' '.date('H:i', strtotime($row['last_login'])).'
    '; - - - // Trenutni paket funkcionalnosti + + echo ''; + + echo '
    '; } else{ $rowA = mysqli_fetch_array($sqlA); + $userAccess = UserAccess::getInstance($global_user_id); + $package_name = $userAccess->getPackageName($rowA['package_id']); // Ce ima paket 2 ali 3 - if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){ + if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){ // Ce je paket ze potekel - if(strtotime($rowA['time_expire']) < time()){ + if(strtotime($rowA['time_expire']) < time()){ - $package_string = ''; - $package_string .= $rowA['package_name']; + $package_string = ''; + $package_string .= $package_name; $package_string .= ' ('.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')'; $package_string .= ''; - - $package_string .= ' - '.$lang['srv_narocila_extend'].''; + + $package_string .= '
    '; } else{ - $package_string = $rowA['package_name']; + $package_string = $package_name; $package_string .= ' ('.$lang['srv_access_package_valid'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')'; - $package_string .= ' - '.$lang['srv_narocila_extend'].''; - - $package_string .= '
    '.$lang['srv_access_package_all'].''; + $package_string .= '
    '; } } else{ - $package_string = $rowA['package_name']; + $package_string = $package_name; $package_string .= ' ('.$lang['srv_access_package_free'].')'; - $package_string .= ' - '.$lang['srv_narocila_buy'].''; + $package_string .= '
    '; } } - - echo '
    '.$lang['srv_access_package'].': '.$package_string.'
    '; + echo '
    '.$package_string.'
    '; } - - echo '
    '; + echo '
    '; + + echo '
    '; // AAI nima moznosti spreminjanja imena, priimka, emaila, gesla... if(isAAI()){ echo ''.$lang['srv_profil_aai_warning'].''; } else{ - echo '
    '.$lang['name'].':'; - echo '
    '; - - echo '
    '.$lang['surname'].' :'; - echo '
    '; - echo '
    '.$lang['email'].' : '; - echo ' '; - echo ' '; - echo '  '; - - $alternativni_emaili = User::getInstance()->allEmails('brez primarnega'); - - echo ''; - if(!empty($alternativni_emaili)){ - foreach($alternativni_emaili as $email) { - echo '
     '; - echo ''; - echo ''; - echo 'active == 1 ? 'checked="checked"' : '').'> '; - } + echo '

    '.$lang['srv_profil_settings_text'].'

    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + $alternativni_emaili = User::getInstance()->allEmails('brez primarnega'); + + echo '
    '; + echo ''; + echo '
    '; + echo ''; + if(!empty($alternativni_emaili)) + echo 'primaryEmail() == $row['email'] ? 'checked="checked"' : '').'>'; + echo '
    '; + echo '
    '; + + //Alternativni maili + if(!empty($alternativni_emaili)){ + foreach($alternativni_emaili as $email) { + echo '
    '; + echo ''; + echo '
    '; + echo ''; + echo '
    '; + echo 'active == 1 ? 'checked="checked"' : '').'> '; + echo '
    '; + echo '
    '; } - echo '

    '; + } - echo ''; + echo '
    '; + echo '
    '.$lang['srv_profil_settings_addemail'].'
    '; + echo '
    '; + + echo ''; // Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo if (Common::checkModule('gorenje')){ @@ -9454,25 +10569,44 @@ class SurveyAdminSettings { echo '

    '.$lang['gorenje_password_warning'].'

    '; } - // Obveščanje - echo '
    '.$lang['password'].':'; - echo '
    '; - - echo '
    '.$lang['again'].':'; - echo '
    '; + // Geslo + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; // Prejemanje obvestil - $red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : ''; - echo '
    '.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').''; - echo ' '; - echo '
    '; + + echo '
    '; + echo ''.$lang['srv_gdpr_user_options'].' '.Help::display('srv_gdpr_user_options').''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; // Google 2 FA $user_option = User::option($global_user_id, 'google-2fa-secret'); $user_option_validate = User::option($global_user_id, 'google-2fa-validation'); - echo '
    '.$lang['google_2fa'].': '.Help::display('srv_google_2fa_options').''; - echo ' '; - echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; if (empty($user_option)) { $google2fa = new \Sonata\GoogleAuthenticator\GoogleAuthenticator(); @@ -9485,7 +10619,7 @@ class SurveyAdminSettings { echo '
    '.$lang['google_2fa_admin_enabled'].''.$googleSecret.'
    '; echo '
    '.$lang['google_2fa_admin_enabled_2'].'
    '; echo ''; - echo '
    '; + echo '
    '; echo '
    Ko boste shranili nastavitve, bo nastavitev obveljala.
    '; echo ''; } elseif (! empty($user_option) && $user_option_validate == 'NOT') { @@ -9505,28 +10639,30 @@ class SurveyAdminSettings { echo '
    '.$lang['google_2fa_user_error_code'].'
    '; echo ''; } + + echo '
    '; + echo ''; + echo '
    '; } - echo '
    '; + echo '
    '; - echo ' '; + echo ''; // Save gumb - ce ni AAI if(!isAAI()){ - echo ' '; - echo ' '; - - echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; // div za prikaz uspešnosti shranjevanja if ($_GET['s'] == '1') { echo '
    '; - echo ''; + echo ''; } - - echo '

    '; } @@ -9534,7 +10670,7 @@ class SurveyAdminSettings { echo '
    '.$lang['srv_login_tracking_title'].''; echo ''; - echo ''; + echo ''; $result = sisplet_query ("SELECT IP, kdaj FROM user_login_tracker WHERE uid='".$global_user_id."' ORDER BY kdaj desc"); if (mysqli_num_rows($result) == 0) { @@ -9543,10 +10679,9 @@ class SurveyAdminSettings { else { $count = 0; while ($row = mysqli_fetch_array ($result)) { - echo '= 5 ? ' class="hide"' : '').'>'; + echo '= 5 ? ' class="displayNone"' : '').($count == 4 ? ' class="show_as_last_row"' : '').'>'; echo ''; - echo ''; - echo ''; + echo ''; echo ''; $count++; @@ -9554,10 +10689,10 @@ class SurveyAdminSettings { } echo ''; - if(mysqli_num_rows($result) > 25){ - echo ''; - echo '

    '; - } + //Gumb za izpis vseh prijav v tabeli - update v 2. fazi @TG + /**if(mysqli_num_rows($result) > 25){ + echo ''; + }**/ echo '
    '; @@ -9592,15 +10727,16 @@ class SurveyAdminSettings { $lockSurvey = (int)UserSetting::getInstance()->getUserSetting('lockSurvey'); if ($admin_type == '0' || $admin_type == '1') { - echo '

    '; - echo ''; - echo '

    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; } if ((int)$lockSurvey > 0) { - echo '

    '.$lang['srv_unlock_popup'].'

    '; + echo '

    '.$lang['srv_unlock_popup'].'

    '; } } @@ -9653,8 +10789,13 @@ class SurveyAdminSettings { $error = true; $msg = $lang['srv_mail_test_smtp_not_possible']; } - } + } + + echo '
    '; + echo '

    '.$lang['srv_mail_test_smtp'].'

    '; + echo ''; + // če imamo napake jo izpišemo if ($error == true){ echo $lang['srv_mail_test_smtp_error'].': '. $msg; @@ -9662,23 +10803,17 @@ class SurveyAdminSettings { else{ echo $lang['srv_mail_test_smtp_sent'].': '.$email; } - + #vsebino shranimo v buffer $content = ob_get_clean(); + + echo $content; + + echo '
    '; + echo ''; + echo '
    '; - $popUp = new PopUp(); - #$popUp->setId('divSurveySmtp'); - $popUp->setHeaderText($lang['srv_mail_test_smtp']); - - #dodamo vsebino - $popUp->setContent($content); - - # dodamo gumb Prekliči - $button = new PopUpCancelButton(); - $button->setCaption($lang['srv_zapri'])->setTitle($lang['srv_zapri']); - $popUp->addButton($button); - - echo $popUp; + echo '
    '; } } ?> \ No newline at end of file diff --git a/admin/survey/ajax.php b/admin/survey/ajax.php index 4bea1db17..a31cdf8e9 100644 --- a/admin/survey/ajax.php +++ b/admin/survey/ajax.php @@ -14,6 +14,10 @@ if (isDebug()){ error_reporting(E_ALL ^ E_NOTICE); ini_set('display_errors', '1'); } +else{ + error_reporting(E_ALL ^ E_NOTICE ^ E_STRICT); + ini_set('display_errors', '0'); +} Common::start(); @@ -502,6 +506,10 @@ elseif ($_GET['t'] == 'library') { $l = new Library(); $l->ajax(); } +elseif ($_GET['t'] == 'libraryBranching') { + $lb = new LibraryBranching($anketa); + $lb->ajax(); +} elseif ($_GET['t'] == 'help') { $h = new Help(); $h->ajax(); diff --git a/admin/survey/api/api_test.php b/admin/survey/api/api_test.php index 353215f24..6e292c5c4 100644 --- a/admin/survey/api/api_test.php +++ b/admin/survey/api/api_test.php @@ -7,23 +7,27 @@ // Nastavimo url api-ja -//$api_url = 'http://localhost/admin/survey/api/api.php'; -$api_url = 'http://test.1ka.si/admin/survey/api/api.php'; +//$api_url = 'http://test.1ka.si/admin/survey/api/api.php'; //$api_url = 'https://www.1ka.si/admin/survey/api/api.php'; // Nastavimo identifier in key userja $identifier = 'a1c3b90fdae3c45d'; $private_key = 'e60032141a7aae518f9938636b963fc14d58d40025dc7b6b82f4e69b8a42599e'; +$api_url = 'http://localhost/admin/survey/api/api.php'; +$identifier = '0d712128f7fe5707'; +$private_key = 'd0ea50f1deabe2d9d9082c4c2a25c7db3648cab59f7a19939c808f602bdbc1be'; + // Nastavimo parametre -$ank_id = '8086'; -$action = 'getSurveyQuestions'; +//$ank_id = '8086'; +//$action = 'getSurveyQuestions'; +$action = 'createSurvey'; // Izvedemo klic (GET ali POST) -$result = executeGET(); -//$result = executePOST(); +//$result = executeGET(); +$result = executePOST(); @@ -82,7 +86,7 @@ function executePOST(){ // GET params $params = 'action='.$action; // Funkcija, ki jo želimo izvesti - $params .= '&ank_id='.$ank_id; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...) + //$params .= '&ank_id='.$ank_id; // ostali parametri potrebni za klic funkcije (id ankete, vprašanja...) // POST data $post_data = array( @@ -99,6 +103,19 @@ function executePOST(){ "param_string" => "rekid=5406729&dnid=10352449&brand=MORA&ser=Žiak Pavel Žiak - GOREMO (Víglaš)&serenota=Pavel Žiak - GOREMO&sercenter=SC Slovakia&drzava=Slovakia" );*/ + $post_data = array( + "naslov_vprasalnika" => "naslovovoovvo", + "survey_type" => 0, + "besedilo_vprasanja" => "text vprasasa", + "vrsta_vprasanja" => 0, + "other" => "Other:", + "Odgovori" => array( + "Text of option 1", + "Text of option 2", + "Text of option 3" + ) + ); + // Pripravimo podatke za hashiranje $request_method = 'POST'; diff --git a/admin/survey/api/class.ApiSurvey.php b/admin/survey/api/class.ApiSurvey.php index e8484ff20..c8a769caa 100644 --- a/admin/survey/api/class.ApiSurvey.php +++ b/admin/survey/api/class.ApiSurvey.php @@ -2150,15 +2150,16 @@ class ApiSurvey { // GLASOVANJE if ($survey_type == 0) { - $sql = sisplet_query("INSERT INTO srv_anketa (id, hash, naslov, akronim, db_table, starts, expire, dostop, insert_uid, insert_time, edit_uid, edit_time, cookie, text, url, intro_opomba, survey_type, lang_admin, lang_resp, active, skin, show_intro, show_concl, locked, mobile_created) " . - "VALUES ('', '".$hash."', $naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '0', '$lang_admin', '$lang_resp', '0', '1kaBlue', '0', '0', '0', '$mobile_created')"); + $sql = sisplet_query("INSERT INTO srv_anketa + (id, hash, naslov, akronim, db_table, starts, expire, dostop, insert_uid, insert_time, edit_uid, edit_time, cookie, text, url, intro_opomba, survey_type, lang_admin, lang_resp, active, skin, show_intro, show_concl, locked, mobile_created) + VALUES + ('', '".$hash."', '$naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '0', '$lang_admin', '$lang_resp', '0', '1kaBlue', '0', '0', '0', '$mobile_created')"); if (!$sql) { $error = mysqli_error($GLOBALS['connect_db']); } $anketa = mysqli_insert_id($GLOBALS['connect_db']); - if ($anketa > 0) { $url .= 'a/' . $hash; @@ -2223,7 +2224,7 @@ class ApiSurvey { $show_concl = ($zakljucek['hide_zakljucek'] == '1') ? 0 : 1; $sql = sisplet_query("INSERT INTO srv_anketa (id, hash, naslov, akronim, db_table, starts, expire, dostop, insert_uid, insert_time, edit_uid, edit_time, cookie, text, url, intro_opomba, survey_type, lang_admin, lang_resp, active, skin, introduction, conclusion, show_intro, show_concl, locked, mobile_created) " . - "VALUES ('', '".$hash."', $naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '2', '$lang_admin', '$lang_resp', '$autoActiveSurvey', '1ka', '$uvod_besedilo', '$zakljucek_besedilo', '$show_intro', '$show_concl', '1', '$mobile_created')"); + "VALUES ('', '".$hash."', '$naslov', '$akronim', '1', $starts, $expire, '0', '$global_user_id', NOW(), '$global_user_id', NOW(), '$SurveyCookie', '', '$url', '', '2', '$lang_admin', '$lang_resp', '$autoActiveSurvey', '1ka', '$uvod_besedilo', '$zakljucek_besedilo', '$show_intro', '$show_concl', '1', '$mobile_created')"); if (!$sql) { $error = mysqli_error($GLOBALS['connect_db']); } @@ -3531,7 +3532,7 @@ class ApiSurvey { if ($add) { $f = @fopen($site_path . '.htaccess', 'a'); if ($f !== false) { - fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}"); + fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}"); fclose($f); $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')"); @@ -3638,7 +3639,7 @@ class ApiSurvey { if ($add) { $f = @fopen($site_path . '.htaccess', 'a'); if ($f !== false) { - fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}"); + fwrite($f, "\nRewriteRule ^" . $nice_url . '\b(?!-)(.*) ' . $link . "&foo=\$1&%{QUERY_STRING}"); fclose($f); $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')"); diff --git a/admin/survey/classes/class.AppSettings.php b/admin/survey/classes/class.AppSettings.php index 5268066c7..16008ad5d 100644 --- a/admin/survey/classes/class.AppSettings.php +++ b/admin/survey/classes/class.AppSettings.php @@ -178,24 +178,28 @@ class AppSettings { // Display app settings public function displaySettingsGroup($group){ - echo '
    '; - $setting_variables = $this->variables[$group]; + foreach($setting_variables as $what){ $this->displaySetting($what); - } + } + } // Display app single setting public function displaySetting($what){ global $lang; - - echo ''; - - echo ''; - echo '
    '; + echo '
    '; + + echo ''; + + echo ''; + + echo '
    '; + + } } diff --git a/admin/survey/classes/class.Cache.php b/admin/survey/classes/class.Cache.php index 78c1be98e..746e3b239 100644 --- a/admin/survey/classes/class.Cache.php +++ b/admin/survey/classes/class.Cache.php @@ -207,32 +207,95 @@ class Cache $result['tip'] = $lang['srv_sklop_posebna_short'] . ' - ' . $lang['srv_vprasanje_tip_' . $spremenljivka['tip']]; break; } + + //$result['izrazanje'] = $spremenljivka['tip']; - preverjanje manjkajočih tipov za switch spodaj. Če je vse ok, se lahko odstrani @TG + switch ($spremenljivka['tip']) { case 1 : // radio + $result['izrazanje'] = $lang['srv_vprasanje_radio']; + break; case 2 : // check + $result['izrazanje'] = $lang['srv_vprasanje_checkbox']; + break; case 3 : // drop - case 6 : // mradio - case 16 : // mcheck - case 17 : // razvrščanje - $result['izrazanje'] = $lang['srv_analiza_vrsta_kate']; + $result['izrazanje'] = $lang['srv_vprasanje_dropdown']; break; case 4 : // text - case 19 : // mtext - case 21 : // text* - $result['izrazanje'] = $lang['srv_analiza_vrsta_bese']; - break; - case 7 : // number - case 18 : // vsota - case 20 : // mnumber - case 22 : // kalkulacija - case 25 : // kvota - $result['izrazanje'] = $lang['srv_analiza_vrsta_stev']; - break; - case 8 : // datum - $result['izrazanje'] = $lang['srv_analiza_vrsta_stev']; + $result['izrazanje'] = $lang['srv_vprasanje_text']; break; case 5 : // nagovor - $result['izrazanje'] = $lang['srv_analiza_vrsta_nago']; + $result['izrazanje'] = $lang['srv_vprasanje_label']; + break; + case 6 : // mradio + $result['izrazanje'] = $lang['srv_vprasanje_multigrid']; + break; + case 7 : // number + $result['izrazanje'] = $lang['srv_vprasanje_number']; + break; + case 8 : // datum + $result['izrazanje'] = $lang['srv_vprasanje_datum']; + break; + + + //SOCIAL NETWORK VPRAŠANJA + case 9 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_9']; + break; + case 10 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_10']; + break; + case 11 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_11']; + break; + case 12 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_12']; + break; + case 13 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_13']; + break; + + + //AW + case 14 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_14']; + break; + case 15 : + $result['izrazanje'] = $lang['srv_vprasanje_tip_15']; + break; + + + case 16 : // mcheck + $result['izrazanje'] = $lang['srv_vprasanje_multicheckbox']; + break; + case 17 : // razvrščanje + $result['izrazanje'] = $lang['srv_vprasanje_ranking']; + break; + case 18 : // vsota + $result['izrazanje'] = $lang['srv_vprasanje_vsota']; + break; + case 19 : // mtext + $result['izrazanje'] = $lang['srv_vprasanje_multitext']; + break; + case 20 : // mnumber + $result['izrazanje'] = $lang['srv_vprasanje_multinumber']; + break; + case 21 : // text* + $result['izrazanje'] = $lang['srv_vprasanje_text']; + break; + case 22 : // kalkulacija + $result['izrazanje'] = $lang['srv_vprasanje_tip_22']; + break; + case 24 : // kombinirana tabela + $result['izrazanje'] = $lang['srv_vprasanje_tip_24']; + break; + case 25 : // kvota + $result['izrazanje'] = $lang['srv_vprasanje_tip_25']; + break; + case 26 : // lokacija + $result['izrazanje'] = $lang['srv_vprasanje_tip_26']; + break; + case 27 : // heatmap + $result['izrazanje'] = $lang['srv_vprasanje_heatmap']; break; } diff --git a/admin/survey/classes/class.Common.php b/admin/survey/classes/class.Common.php index 081365687..0d5883616 100644 --- a/admin/survey/classes/class.Common.php +++ b/admin/survey/classes/class.Common.php @@ -1112,7 +1112,7 @@ class Common { while (!feof($f)) { $r = fgets($f); - if (strpos($r, "^".$nice_url.'\b(.*) ') !== false && strpos($r, "?anketa=".$ank_id."") !== false) { + if (strpos($r, "^".$nice_url.'\b') !== false && strpos($r, "?anketa=".$ank_id."") !== false) { // kao pobrisemo vrstico } else { $output[] = $r; @@ -1152,7 +1152,7 @@ class Common { while($rowS = mysqli_fetch_array($sqlS)){ - if (strpos($r, "^".$rowS['link'].'\b(.*) ') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) { + if (strpos($r, "^".$rowS['link'].'\b') !== false && strpos($r, "?anketa=".$ank_id."&skupina=".$rowS['vre_id']."") !== false) { // pobrisemo vrstico in vnos v bazi $sqlD = sisplet_query("DELETE FROM srv_nice_links_skupine WHERE ank_id='$ank_id' AND nice_link_id='$row[id]' AND vre_id='$rowS[vre_id]'"); @@ -2129,11 +2129,56 @@ class Common { } // Izpise obvestilo, da ni podatkov - static function noDataAlert() { + static function noDataAlert($location='') { global $lang; + global $anketa; echo '
    '; - echo $lang['srv_data_no_data']; + + if($lang['id'] == '1') + echo ''; + else + echo ''; + + if($location == 'status') { + echo '

    '.$lang['srv_dashboard_no_data'].'

    '; + } + else { + echo '

    '.$lang['srv_data_no_data'].'

    '; + } + + echo '
    '; + if($location == 'status') { + echo '

    '.$lang['srv_data_no_data3'].'

    '; + } + else { + echo '

    '.$lang['srv_data_no_data2'].'

    '; + } + echo '
    '; + + if($location == 'status') { + $buttonA = 'index.php?anketa='.$anketa.'&a=branching'; //urejanje + $buttonB = 'index.php?anketa='.$anketa.'&a=testiranje'; //testiranje + $textA = $lang['edit2']; + $textB = $lang['srv_testiranje']; + $textC = $lang['srv_vabila']; + } + else { + $buttonA = 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki'; //avtomatski testni vnos + $buttonB = SurveyInfo::getSurveyLink() . '?preview=on&testdata=on'; //ročni testni vnos + $textA = $lang['srv_testiranje_vnosi2']; + $textB = $lang['srv_archive_test_data_text2a']; + $textC = $lang['srv_anketa_share']; + } + + $buttonC = 'index.php?anketa='.$anketa.'&a=vabila'; //objava + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; } diff --git a/admin/survey/classes/class.Dostop.php b/admin/survey/classes/class.Dostop.php index 979b04a43..7829333cc 100644 --- a/admin/survey/classes/class.Dostop.php +++ b/admin/survey/classes/class.Dostop.php @@ -501,7 +501,8 @@ class Dostop { echo ''; - echo '

    '; + echo '
    '; + echo ''; if ($r['type'] == 2 || $r['type'] == 3) { echo $lang['admin_narocnik']; @@ -515,7 +516,7 @@ class Dostop { $r['email'] = iconv("iso-8859-2", "utf-8", $r['email']); - echo ': ' . $r['name'] . ' ' . $r['surname'] . ' (' . $r['email'] . ')

    '; + echo ': ' . $r['name'] . ' ' . $r['surname'] . ' (' . $r['email'] . ')'; if ($r['type'] >= 2) { @@ -524,49 +525,77 @@ class Dostop { $dostop = explode(',', $row['dostop']); echo '
    '; echo ''; - echo ''; - echo '

    '; - echo '

    '; - echo '

    '; - echo '

    '; - echo '

    '; - echo '

    '; - - echo '

    '; - + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; // Nastavitev, da ne more odklenit ankete - echo '

    '; - + echo '
    '; + echo ''; + echo ''; + echo '
    '; // Je anketar - ne more poceti nicesar razen izvajati telefonsko anketo (ob kliku se ostale avtomatsko ugasnejo in disablajo) - echo '

    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo ''; // Če gre za Hierarhijo if (SurveyInfo::checkSurveyModule('hierarhija', $this->anketa)) { $tip = sisplet_query("SELECT type FROM srv_hierarhija_users WHERE user_id='" . $uid . "' AND anketa_id='" . $this->anketa . "'", "obj"); if (!empty($tip) && !empty($tip->type)) { - echo '

    '; - echo '

    '; + echo '
    '; + echo 'Uporabnik hierarhije s pravicami:'; + echo ''; + echo '
    '; } } - - echo '
    '; - // Ce je katerikoli od treh checkboxou ugasnjen imamo enablano editiranje samo posameznega jezik $enable_lang = (!in_array('edit', $dostop) || !in_array('test', $dostop) || !in_array('publish', $dostop)) ? TRUE : FALSE; $sqll = sisplet_query("SELECT * FROM srv_language WHERE ank_id = '$this->anketa'"); - if (mysqli_num_rows($sqll) > 0) { - echo '

    ' . $lang['srv_passive_multilang'] . '

    '; + echo '
    '; + + if (mysqli_num_rows($sqll) > 0) { + echo '' . $lang['srv_passive_multilang'] . ':'; + echo ''; } + while ($rowl = mysqli_fetch_array($sqll)) { $sqldl = sisplet_query("SELECT * FROM srv_dostop_language WHERE ank_id = '$this->anketa' AND uid = '$uid' AND lang_id='$rowl[lang_id]'"); @@ -579,16 +608,18 @@ class Dostop { $checked = ''; } - echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; } echo '
    '; echo ''; - - echo ''; } - // Manager - brez moznosti uporabe 1ka streznika + + // Manager - brez moznosti uporabe 1ka streznika elseif ($r['type'] == 1) { $sql = sisplet_query("SELECT dostop FROM srv_dostop WHERE ank_id='$this->anketa' AND uid='$uid'"); @@ -633,8 +664,6 @@ class Dostop { echo ''; echo '

    (' . $lang['srv_dostop_edit'] . ', ' . $lang['srv_dostop_data'] . ', ' . $lang['srv_dostop_export'] . ')

    '; - - echo ''; } // Ostali ne morejo managerju nicesar spreminjati else { @@ -646,7 +675,10 @@ class Dostop { echo '

    (' . $lang['srv_dostop_edit'] . ', ' . $lang['srv_dostop_data'] . ', ' . $lang['srv_dostop_export'] . ')

    '; } - echo ''; + echo '
    '; + echo ''; + echo ''; + echo '
    '; } function ajax_anketa_user_dostop_save() { @@ -697,7 +729,8 @@ class Dostop { echo '
    '; - echo '

    ' . $lang['edit_user'] . '

    '; + echo '

    ' . $lang['edit_user'] . '

    '; + echo ''; // Segment tip uporabnika echo '
    '; @@ -706,35 +739,65 @@ class Dostop { // Emaila ne more vec editirat, ker je prevec problemov (izgubi ankete...) echo ''; - echo '

    '.$row['name'].' '.$row['surname'].' ('.$row['email'].')

    '; + + echo '
    '; + echo '' . $lang['user2'] . ': '.$row['name'].' '.$row['surname'].' ('.$row['email'].')'; + echo '
    '; // Admin lahko spreminja tip vseh userjev if ($admin_type == 0) { - echo '

    '; echo ''; echo ''; echo ''; - echo '

    '; + echo ''; + echo '
    '; } else { echo ''; } - echo '

    '; - + echo '
    '; + echo '' . $lang['status'] . ''; + echo ''; + echo '
    '; + echo '
    '; // Segment osnovni podatki echo '
    '; } /** Funkcija za prikaz seznam referalov @@ -1787,9 +1933,7 @@ class SurveyStatistic { $email_filter_string = ' AND inv_res_id is NULL '; } } - - echo '
    '.$lang['srv_statistic_referals_list'].Help :: display('srv_statistic_referals_list').'
    '; - + // še podatke o uporabniku $sql_userInfo = sisplet_query("SELECT referer, COUNT(*) as cnt FROM srv_user WHERE ank_id = '".$this->getSurveyId()."' AND preview = '0' AND deleted='0' AND time_insert BETWEEN '".$this->startDate."' AND '".$this->endDate."' + INTERVAL 1 ".$email_filter_string ." DAY GROUP BY referer"); if (mysqli_num_rows($sql_userInfo) > 0) { @@ -1804,7 +1948,8 @@ class SurveyStatistic { } } echo ''; - } else { + } + else { echo $lang['srv_statistic_show_no_referals']; } } @@ -1826,10 +1971,8 @@ class SurveyStatistic { # IP-je lovimo preko ajaxa $string_sql = "SELECT COUNT(id) AS count, ip FROM srv_user WHERE ank_id='".$this->getSurveyId()."' AND preview = '0' AND deleted='0' AND (time_insert BETWEEN '".$this->startDate."' AND '".$this->endDate."' + INTERVAL 1 DAY) ".$email_filter_string." GROUP BY ip ORDER BY count DESC, ip ASC"; $sql = sisplet_query($string_sql); - - echo '
    '.$lang['srv_statistic_IP_list'].Help :: display('srv_statistic_IP_list').'
    '; - if (mysqli_num_rows($sql) > 0) { - #echo '
    '.$lang[''].'
    '; + + if (mysqli_num_rows($sql) > 0) { echo ''; while ($row = mysqli_fetch_array($sql)) { @@ -1884,34 +2027,41 @@ class SurveyStatistic { function DisplayFilters () { global $lang; + echo '
    '; + // Kumulativa - echo ''; - echo $lang['srv_statistic_hide_null']; - echo 'hideNullValues_dates ? ' checked="checked"' : '').' autocomplete="off">'; - echo ''; + echo '
    '; + echo ' hideNullValues_dates ? ' checked="checked"' : '').' autocomplete="off">'; + echo ' '; + echo '
    '; // Skrij 0 - echo ''; - echo ''; - echo 'timelineDropDownType == 1 ? ' checked="checked"' : '').' autocomplete="off" style="margin:0px!important;" onclick="statisticDropdownChange();" >'; - echo ''; - - echo '
    '; + echo '
    '; + echo ' timelineDropDownType == 1 ? ' checked="checked"' : '').' autocomplete="off" style="margin:0px!important;" onclick="statisticDropdownChange();" >'; + echo ' '; + echo '
    '; + echo '
    '; + + + echo '
    '; + // Osnova - echo ''; + echo '
    '; $this->DisplayTimelineDropdowns(); - echo ''; + echo '
    '; // Oblika - echo ''; - echo ':'."\n"; - echo ''; foreach ( $this->periods as $key => $_period) { - echo ''."\n"; + echo ' '; } - echo ''."\n"; - echo ''; + echo ' '; + echo '
    '; + + echo ''; } function DisplayTimelineDropdowns() { @@ -1920,25 +2070,25 @@ class SurveyStatistic { echo $lang['srv_statistic_answer_state_base'].': '; if ($this->timelineDropDownType == 0) { - echo ''; echo ''; echo ''; - echo ''."\n"; - echo ''."\n"; + echo ''; + echo ''; echo ''; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; - echo ''."\n"; + echo ''; } else { $order = array( @@ -1947,7 +2097,7 @@ class SurveyStatistic { '5ll'=>TYPE_STATUS_KUMULATIVE_5ll, 5=>TYPE_STATUS_KUMULATIVE_5, 6=>TYPE_STATUS_KUMULATIVE_6,); - echo ''; foreach ($order as $key => $value) { echo ''; } @@ -1964,34 +2114,39 @@ class SurveyStatistic { $this->maxValue *= GRAPH_REDUCE; $cnt=0; - echo '
    '."\n"; + echo '
    '; if ($this->arrayRange) { foreach ($this->arrayRange as $key => $value) { $label = $this->formatStatsString($key, $this->period); - echo ''."\n"; - echo ''."\n"; + echo ''; + + echo ''; + $width = ($this->maxValue && $value) ? (round($value / $this->maxValue * 100, 0)) : "0"; - echo ''."\n"; - echo ''."\n"; + echo ''; + + echo ''; $cnt+=$value; } // dodamo sumo - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''."\n"; + echo ''; + echo ''; + echo ''; + echo ''; } else { - echo ''."\n"; + echo ''; } - echo '
    ' . $label . '
    ' . $label . '
     
    '.$value.'
     
    '; + echo ''.$value.''; + echo '
    ' . $lang['srv_statistic_redirection_sum'] . ''.$cnt.'
    '.$lang['srv_statistic_redirection_sum'].''.$cnt.'
    '.$lang['srv_no_data'].'
    '.$lang['srv_no_data'].'
    '."\n"; + echo ''; } // pomozne funkcije @@ -2210,14 +2365,18 @@ class SurveyStatistic { * * @param HTML $data */ - function WriteToCacheFile($data,$timestamp) { + function WriteToCacheFile($data, $timestamp) { global $site_path; + if ($this->surveyId !== null && $data !== null && $data !== '') { + # če imamo default filtre zapišemo v datoteko; Prav tako mora bit izbran osnovni profil intervala z id = 0 if ( $this->isDefaultFilters == true) { + # nastavimo folder $folder = $site_path . EXPORT_FOLDER.'/'; $fileToUse = $folder . 'export_dashboard_'.$this->surveyId.'.html'; + # pobrišemo morebitne predhodne header datoteke ankete if (file_exists($fileToUse)) { unlink($fileToUse); @@ -2239,10 +2398,13 @@ class SurveyStatistic { */ function ReadCacheFile() { global $site_path; + if ($this->surveyId !== null) { + # nastavimo folder $folder = $site_path . EXPORT_FOLDER.'/'; $dashboardFile = null; + # prebermo fajl: foreach (glob($folder . 'export_dashboard_'.$this->surveyId.'.html') as $filesToUse) { if ( $dashboardFile == null) { @@ -2255,123 +2417,13 @@ class SurveyStatistic { $data = fread($df, filesize($dashboardFile)); fclose($df); + return $data; } + return null; } - - - /** Funkcija klice funkcije za prikaz statistike - * DisplayInfoView - prikaze panelo z osnovnimi informacijami - * DisplayStatusView - prikaze panelo z kliki po statusih - * DisplayReferalsView - prikaze panelo z redirekcijami in referali - * DisplayDataView - prikate panelo z kliki po datumih - */ - function WriteDashboardToFile($sid,$timestamp) { - - global $lang, $site_url; - if ((int)$sid > 0) { - - # spodnje ehote shranimo v spremenljivko ki jo popotrebi keširanja shranimo v datoteko. - - // preverimo ali ima anketa kakšne vnose - $str_qry_all_users = "SELECT count(u.id) AS user_count FROM srv_user AS u " . "WHERE u.ank_id = '".$this->getSurveyId()."' AND preview = '0' AND deleted='0' "; - $qry_all_users = sisplet_query($str_qry_all_users); - $row_all_users = mysqli_fetch_assoc($qry_all_users); - $allUserCount = $row_all_users['user_count']; - - ob_start(); - - #echo '
    '.$lang['srv_dashboard_updated'].date("d.m.Y, H:i").'
    '; - - if ($allUserCount == 0) { // nimamo še vnosov - - // zgornji boxi - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '; - echo '
    '."\n"; - $this -> DisplayInfoView(); - echo '
    '; - echo '
    '; - - // 1) če ankete še nima nobenega klika, naj se pri poročilu ne prikaže nobena od šestih analiza, - // ampak naj pise: Anketa nima še nobenega vnosa« zreaven naj bo v SIVEM zavihka UREJANJE - // 2) Če nima anketa nobenega klika in ni niti aktivirana, pa napisite: - // Anketa še ni aktivvirajna. Zraven naj bo sta siva zavihkja Urejanje vprašalnika in Objave&vabila - - - } else { - - // imamo vnose, prikažemo statistiko - $this->PrepareDateView(); - $this->PrepareStatusView(); - - echo ''; - echo ''; - - // zgornji boxi - echo ''; - - echo ''; - - echo ''; - echo ''; - - // spodnji boxi - echo ''; - echo ''; - - echo ''; - - echo ''; - - echo ''; - echo '
    '; - echo '
    '."\n"; - $this -> DisplayInfoView(); - echo '
    '; - echo '
    '; - echo '
    '."\n"; - $this -> DisplayStatusView(); - echo '
    '; - echo '
    '; - echo '
    '."\n"; - $this -> DisplayAnswerStateView(); - echo '
    '; - echo '
    '; - echo '
    '; - $this -> DisplayReferalsView(); - echo '
    '; - echo '
    '; - echo '
    '; - echo ''.$lang['srv_statistic_timeline_title'].''.Help :: display('srv_statistic_timeline_title'); - echo '
    '."\n"; - // echo '
    '."\n"; - $this -> DisplayFilters(); - // echo '
    '; - echo '
    '; - echo '
    '; - - echo '
    '."\n"; - $this -> DisplayDateView(); - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - $this -> DisplayPagesStateView(); - echo '
    '; - echo '
    '; - } - - # HTML zapišemo v spremenljivko - $dashboardHtml = ob_get_clean(); - $this->WriteToCacheFile($dashboardHtml,$timestamp); - } - } - + function changeInvitationFilter() { $this->emailInvitationFilter($_POST['filter_email_status']); } @@ -2430,7 +2482,7 @@ class SurveyStatistic { // zgornji boxi echo ''; - echo '
    '."\n"; + echo '
    '; { $lang_array = array(); @@ -2441,13 +2493,20 @@ class SurveyStatistic { $lang_array[$rowl['lang_id']] = $rowl['language']; } - echo ''.$lang['srv_statistic_lang_title'].''; - echo '
    '; + echo '
    '.$lang['srv_statistic_lang_title'].'
    '; + + echo ''; - echo ''; - foreach ($this->respondentLangArray as $key => $cnt) { + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + foreach ($this->respondentLangArray as $key => $cnt) { $allCnt+=$cnt; - echo ''; + echo ''; #frekvenca echo ''; #procenti @@ -2459,10 +2518,13 @@ class SurveyStatistic { echo ''; echo ''; } - echo ''; - #frekvenca + + echo ''; + + #frekvenca echo ''; - #procenti + + #procenti echo ''; echo ''; + echo '
    '.$lang['srv_statistic_lang'].''.$lang['srv_statistic_answer_state_frequency'].''.$lang['srv_statistic_answer_state_percent'].'
    '.$lang['srv_statistic_lang'].''.$lang['srv_statistic_answer_state_frequency'].''.$lang['srv_statistic_answer_state_percent'].'
    '.$lang_array[$key].'
    '.$lang_array[$key].''.(int)$cnt.'
    '.$lang['srv_statistic_sum'].'
    '.$lang['srv_statistic_sum'].''.(int)$allCnt.''; $percent = 100; echo $this->formatNumber((int)$percent,NUM_DIGIT_PERCENT,'%'); @@ -2474,8 +2536,8 @@ class SurveyStatistic { echo ''; echo '
    '; - } } ?> \ No newline at end of file diff --git a/admin/survey/classes/class.SurveyStatusProfiles.php b/admin/survey/classes/class.SurveyStatusProfiles.php index a0eb91ae0..64d1a7073 100644 --- a/admin/survey/classes/class.SurveyStatusProfiles.php +++ b/admin/survey/classes/class.SurveyStatusProfiles.php @@ -136,13 +136,15 @@ class SurveyStatusProfiles if (($_podstran == A_COLLECT_DATA && $_GET['m'] == 'quick_edit') || $_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 +155,22 @@ 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 smo preklopili default ustrezni iz status 5,6 na 6 ali obratno + elseif(self::$currentProfileId == 2 || self::$currentProfileId == 3){ + self::$currentProfileId = self::$survayDefaultUstrezni; + } } # 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; } } @@ -197,29 +205,46 @@ class SurveyStatusProfiles #vsebino shranimo v buffer ob_start(); - if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) { - echo '
    '; - echo $lang['srv_not_default_setting']; - echo '

    '; - } echo ''; - echo '
    '; + + if ( self::$currentProfileId != SSP_DEFAULT_PROFILE ) { + echo ''; + } + + + echo ''; ?> '; - } static function new_theme_alert ($name, $css=false) { @@ -233,29 +237,33 @@ class SurveyThemeEditor { $sql = sisplet_query("SELECT value FROM srv_theme_editor".$this->mobile." WHERE profile_id='$this->profile' AND id='$id' AND type='$type'"); $row = mysqli_fetch_array($sql); - echo '

    '; - // pisava if ($type == 1) { + + echo '

    '; - echo ''.$lang['srv_te_font_family'].': '; + echo ''; foreach (self::$fonts AS $key => $val) { echo ''; } echo ' '; - + if ($row['value'] != '') - echo ''; + echo ''; + + echo '
    '; // barva pisave, barva ozadja } elseif (($type == 3 && $id != 1) || in_array($type, [2, 9, 10, 13, 15, 16])) { if ($row['value'] == '') $value = '#000000'; else $value = $row['value']; + echo '
    '; + if ($type == 2 || $type == 9) echo ''.$lang['srv_te_font_color'].': '; - elseif ($type == 3) + elseif($type == 3) echo ''.$lang['srv_te_background_color'].': '; elseif($type == 10) echo ''.$lang['srv_te_custom_border_color'].': '; @@ -266,17 +274,23 @@ class SurveyThemeEditor { elseif($type == 16) echo ''.$lang['srv_te_custom_icon_mobile_color'].': '; - if ($row['value'] == '') echo ''.$lang['srv_te_default'].' '; + if ($row['value'] == '') echo ''; - echo ''; - echo ' '; - echo ''; - echo ''; + echo '
    '; + echo ' '; + echo '
    '; + + if ($row['value'] != '') + echo ''; + + echo '
    '; // velikost pisave } elseif ($type == 4) { + + echo '
    '; - echo ''.$lang['srv_te_font_size'].': '; echo ''; for ($i=50; $i<=200; $i+=10) { echo ''; @@ -284,25 +298,33 @@ class SurveyThemeEditor { echo ' '; if ($row['value'] != '') - echo ''; - + echo ''; + + echo '
    '; + // border vprasanja } elseif ($type == 5) { if ($row['value'] == '') $value = '1'; else $value = $row['value']; - echo $lang['srv_te_question_border'].': '; + echo ''; echo ''; echo ''; echo ''; echo ' '; + echo '
    '; // izbira custom checkbox/radio gumbov } elseif($type == 7 ) { + + echo '
    '; + echo $lang['srv_te_custom_icon_pc'] . ': '; - echo ' + @@ -312,13 +334,14 @@ class SurveyThemeEditor { - '; +
    '; } elseif($type == 8) { + echo '
    '; echo $lang['srv_te_custom_icon_mobile'] . ': '; - echo ' + @@ -327,44 +350,55 @@ class SurveyThemeEditor { - '; +
    '; // Izpišemo border opcije } elseif($type == 11) { + echo '
    '; + echo $lang['srv_te_custom_border_size'].': '; - echo ''; echo ''; for ($i=1; $i<=6; $i++) { echo ''; } echo ' '; + echo '
    '; } elseif($type == 12) { + echo '
    '; + echo $lang['srv_te_custom_border_radius'].': '; - echo ''; echo ''; for ($i=5; $i<=30; $i+=5) { echo ''; } echo ' '; + echo '
    '; // Stil pisave bold, italic, underline } elseif($type == 14) { + echo '
    '; + echo $lang['srv_te_custom_font_style_keywords'].': '; - echo ''; echo ''; echo ''; echo ''; echo ''; echo ' '; + echo '
    '; // Accessibility checkbox (radio/checkboxi niso obarvani) } elseif($type == 17) { + echo '
    '; + echo ''; + echo '
    '; } - echo '

    '; } function preview () { diff --git a/admin/survey/classes/class.SurveyTimeProfiles.php b/admin/survey/classes/class.SurveyTimeProfiles.php index e4681fb39..e57a46775 100644 --- a/admin/survey/classes/class.SurveyTimeProfiles.php +++ b/admin/survey/classes/class.SurveyTimeProfiles.php @@ -361,13 +361,9 @@ class SurveyTimeProfiles { $css = ($izbranProfil == STP_DEFAULT_PROFILE ? ' gray' : ''); if ($hideAdvanced == false || $izbranProfil != STP_DEFAULT_PROFILE) { - if ($showseperator == true) { - echo '
  •  
  • '; - } echo '
  • '; - echo '' . $lang['srv_time_profile_link'] . ''; + echo ' ' . $lang['srv_time_profile_link'] . ''; echo '
  • '; - } } @@ -390,25 +386,30 @@ class SurveyTimeProfiles { $currentFilterProfile = $_all_profiles[$current_pid]; if ( $current_pid != STP_DEFAULT_PROFILE ) { - echo '
    '; + echo '
    '; + echo '
    '; } - echo '
    '; - echo '
    '; - # zlistamo vse profile - echo '
    '; + echo ''; + + echo ''; + + echo '
    '; - echo '
    '; - echo '
    '; + echo '
    '; self::DisplayProfileData($current_pid); echo '
    '; // time_profile_content - echo '
    '; // time_profile_right + + + echo '
    '; - echo '
    '; + echo '
    '; if ($current_pid == 0) { - echo ''; -# echo ''; - echo ''; - echo ''; - } else if ($current_pid == -1) { - echo ''; - echo ''; - echo ''; - } else { - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + } + else if ($current_pid == -1) { + echo ''; + echo ''; + } + else { + echo ''; + echo ''; + echo ''; } - echo '
    '; // time_profile_button_right_holder + echo '
    '; // cover Div echo '
    '; // div za kreacijo novega - echo '
    '.$lang['srv_missing_profile_name'].': '; - echo ''; - echo ''.$lang['srv_analiza_arhiviraj_save'].''; - echo ''.$lang['srv_close_profile'].''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; // div za preimenovanje - echo '
    '.$lang['srv_missing_profile_name'].': '; - echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; echo ''; - echo ''.$lang['srv_rename_profile_yes'].''; - echo ''.$lang['srv_close_profile'].''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; echo '
    '; - + + echo '
    '; + // div za brisanje - echo '
    '.$lang['srv_missing_profile_delete_confirm'].': ' . $currentFilterProfile['name'] . '?'; + echo '
    '; + echo $lang['srv_missing_profile_delete_confirm'].': ' . $currentFilterProfile['name'] . '?'; echo ''; - echo ''.$lang['srv_delete_profile_yes'].''; - echo ''.$lang['srv_close_profile'].''; - echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + } /** Funkcija prikaze osnovnih informacije profila @@ -499,22 +528,30 @@ class SurveyTimeProfiles { $time = $p_data['interval_txt']; } - echo ''; - echo ' '; - echo ''; - echo ''; - echo ' '; - echo '' . "\n" ; - echo '
    '; - echo '

    '.$lang['srv_statistic_period_label'].':'; - echo ''; + echo ' '; + echo ''; + echo ''; + echo ' '; + echo '' . "\n" ; + echo '

    '; + + echo '
    '; + echo ''; + echo ''; - echo '

    '; - + echo '
    '; + + echo '
    '; + echo ''.NEW_LINE; - echo '
    '.NEW_LINE; - echo '
    '.NEW_LINE; - echo '
    '.NEW_LINE; - if ((int)$pid < 0 ) {// pri seji in sistemskem ne pustimo shranjevanja - echo ''.$lang['srv_run_as_session_profile'].''.NEW_LINE; - } else { - echo ''.$lang['srv_save_and_run_profile'].''.NEW_LINE; - echo ''.$lang['srv_run_as_session_profile'].''.NEW_LINE; + echo '
    '; + + + echo '
    '.NEW_LINE; + + echo ''.NEW_LINE; + + // pri seji in sistemskem ne pustimo shranjevanja + if ((int)$pid < 0 ) { + echo ''.NEW_LINE; + } + else { + echo ''.NEW_LINE; + echo ''.NEW_LINE; } - - echo ''.$lang['srv_save_new_profile'].''.NEW_LINE; - echo ''.$lang['srv_close_profile'].''.NEW_LINE; - + echo '
    '.NEW_LINE; + + echo '
    '.NEW_LINE; // div za shranjevanje novega profila - echo '
    '.$lang['srv_missing_profile_name'].': '.NEW_LINE; - echo ''.NEW_LINE; - echo ''.$lang['srv_close_profile'].''.NEW_LINE; - echo ''.$lang['srv_save_profile'].''.NEW_LINE; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '.NEW_LINE; // div za preimenovanje - echo '
    '.$lang['srv_missing_profile_name'].': '.NEW_LINE; - echo ''.NEW_LINE; - echo ''.NEW_LINE; - echo ''.$lang['srv_rename_profile_yes'].''.NEW_LINE; - echo ''.$lang['srv_close_profile'].''.NEW_LINE; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; echo '
    '.NEW_LINE; // div za brisanje - echo '
    '.$lang['srv_missing_profile_delete_confirm'].': ' . self::$profiles[$pid]['name'] . '?'.NEW_LINE; - echo ''.NEW_LINE; - echo ''.$lang['srv_delete_profile_yes'].''.NEW_LINE; - echo ''.$lang['srv_close_profile'].''.NEW_LINE; + echo '
    '; + + echo $lang['srv_missing_profile_delete_confirm'].': ' . self::$profiles[$pid]['name'] . '?'; + echo ''; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '.NEW_LINE; } diff --git a/admin/survey/classes/class.SurveyZoom.php b/admin/survey/classes/class.SurveyZoom.php index 9495d3ad8..8d3009244 100644 --- a/admin/survey/classes/class.SurveyZoom.php +++ b/admin/survey/classes/class.SurveyZoom.php @@ -122,11 +122,9 @@ class SurveyZoom $css = (self::$currentProfileId == 0 ? ' gray' : ''); if ($hideAdvanced == false || self::$currentProfileId != 0) { - echo '
  •  
  • '; echo '
  • '; - echo ''.$lang['srv_zoom_setting'].''; + echo ' '.$lang['srv_zoom_setting'].''; echo '
  • '; - } } @@ -216,23 +214,30 @@ class SurveyZoom $currentFilterProfile = self::$profiles[$current_pid]; if ( self::$currentProfileId != ZOOM_DEFAULT_PROFILE ) { - echo '
    '; + echo '
    '; + echo '
    '; } - echo '
    '; - echo ''; + + echo ''; $this->edit_reminder_min_checkbox($checkbox_min_limit); } @@ -3330,21 +3617,20 @@ class Vprasanje { $spremenljivkaParams = new enkaParameters($row['params']); $checkbox_min_limit_reminder = ($spremenljivkaParams->get('checkbox_min_limit_reminder') ? $spremenljivkaParams->get('checkbox_min_limit_reminder') : 0); - if($checkbox_min_limit){ - $displayReminder = " "; - }else{ - $displayReminder = "none"; - } + $displayReminder = ($checkbox_min_limit) ? '' : 'style="display:none"'; - echo '

    '; - echo ''.$lang['srv_checkbox_min_limit_reminder'].':'; - //echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // editiranje radio tipa (1) - navaden, horizontalen, dropdown, semanticni diferencial @@ -3354,22 +3640,29 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''.$lang['srv_orientacija'].': '; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + + echo ' '; + + echo ' '; + + echo '
    '; + + echo '
    '; } // editiranje orientacije chackboxa @@ -3379,24 +3672,26 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''.$lang['srv_orientacija'].':'; - //echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; //image hotspot - if ($admin_type == 0){ - //echo ''; + echo '

    '; - } - //echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo ' '; + + echo ' '; + echo ' '; + + echo '
    '; + + echo '
    '; } // navaden number ali slider @@ -3405,20 +3700,18 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''.$lang['srv_number_insert'].':'; - // //echo ''; - // echo ''; - // echo ''; - // echo ''; - //echo '

    '; - echo ''; - echo ''; - echo ''; + echo '

    '; - //echo '

    '; - echo '

    '; + echo '
    '; + echo ' '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // navaden number ali slider @@ -3427,23 +3720,18 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''.$lang['srv_number_insert'].':'; - // echo ''; - //echo '

    '; - echo ''; - echo ''; - echo '

    '; - + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // prikaz statistike @@ -3452,13 +3740,15 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''; - //echo ''.$lang['no1']; - //echo ''.$lang['yes']; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // upload pri tekstovnem polju @@ -3473,15 +3763,18 @@ class Vprasanje { $disabled = ($row['signature']==1 || $captcha==1 || $emailVerify==1) ? ' disabled="disabled"' : ''; - echo '

    '; - echo ''.$lang['srv_vprasanje_upload_type'].':'; - - //novo, dropdown s fotografijami onChange="change_upload(\'' . $row['id'] . '\', this.value);" - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // podpis pri tekstovnem polju @@ -3501,16 +3794,20 @@ class Vprasanje { $emailVerify = ($spremenljivkaParams->get('emailVerify') ? $spremenljivkaParams->get('emailVerify') : 0); $disabled = ($row['upload']>0 || $captcha==1 || $emailVerify==1) ? ' disabled="disabled"' : ''; - - echo '

    '; - echo ''.$lang['srv_tip_standard_996'].':'; - - echo ''; - echo ''; - echo ''; - echo ''; - - echo '

    '; + + + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitev timerja @@ -3519,15 +3816,24 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''; - echo ''; - echo ' 0) ? ' checked="checked" ' : '').' onchange="show_timer(this.value);" />'; - echo '

    '; - echo '

    '; - echo ' '; - echo ''; + echo ' 0) ? ' checked="checked" ' : '').' onchange="show_timer(this.value);" />'; + echo ' '; + echo '

    '; + + echo '
    '; + + + echo '
    '; + + echo '
    '; + echo ' '; + + echo ' '; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; } // nastavitev celih in decimalnih mest (number, multinumber, vsota) @@ -3567,24 +3875,33 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '
    '.$lang['srv_num_limits'].''; - echo '

    '; - - echo $lang['srv_cela'].':'; - echo ''; - echo '

    '; - echo ''.$lang['srv_decimalna'].':'; - echo ''; - - echo '

    '; - echo '
    '; - + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitev za obliko generatorja imen @@ -3594,15 +3911,21 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); // Design generatorja - echo '

    '; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitve za generator imen @@ -3611,33 +3934,37 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); $spremenljivkaParams = new enkaParameters($row['params']); - + // Max odgovorov - samo pri 2. designu - echo ''; + echo ''; // Antonuccijev krog - echo '

    '; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; if($spremenljivkaParams->get('NG_cancelButton') == '1'){ @@ -3652,36 +3979,48 @@ class Vprasanje { } // Text za dodajanje nove osebe - $addText = ($spremenljivkaParams->get('NG_addText') ? $spremenljivkaParams->get('NG_addText') : $lang['srv_NG_addText']); - echo ''; } // nastavitev sirine text polja (besedilo*, multitext, multinumber, number) @@ -3873,83 +4366,103 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); $spremenljivkaParams = new enkaParameters($row['params']); - echo '

    '; - $taWidth = ($spremenljivkaParams->get('taWidth') ? $spremenljivkaParams->get('taWidth') : -1); $taHeight = ($spremenljivkaParams->get('taHeight') ? $spremenljivkaParams->get('taHeight') : 1); - echo $lang['srv_textAreaWidth'].': '; - //sirina za multitext in multinumber + // sirina za multitext in multinumber if($row['tip'] == 19 || $row['tip'] == 20){ - $size = $row['grids']; + + $size = $row['grids']; $missing_count = 0; - # če imamo missinge size povečamo za 1 + številomissingov + + # če imamo missinge size povečamo za 1 + številomissingov $sql_grid_mv = sisplet_query("SELECT * FROM srv_grid WHERE spr_id='".$this->spremenljivka."' AND other != 0"); $missing_count = mysqli_num_rows($sql_grid_mv); - if ($missing_count > 0) { - $size += $missing_count + 1; - } - - echo ''; + echo ' '; for($i=1; $i<$maxWidth; $i++){ - echo ''; + echo ' '; } - echo ''; + echo ' '; + echo '

    '; // multitext ima tudi nastavitev visine if ($row['tip'] == 19) { - - echo ''.$lang['srv_textAreaHeight'].': '; - echo ''; for($i=1; $i<=$maxHeight; $i++){ - echo ''; + echo ' '; } - echo ''; + echo ' '; + echo '
    '; } + + echo '
    '; } //sirina za number elseif($row['tip'] == 7){ + $sql1 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id = '$this->spremenljivka' ORDER BY vrstni_red ASC"); $row1 = mysqli_fetch_array($sql1); $id1 = $row1['id']; $row1 = mysqli_fetch_array($sql1); $id2 = $row1['id']; - echo ''; + echo ' '; for($i=5; $i<50; $i+=5){ - echo ''; + echo ' '; } for($i=50; $i<=100; $i+=10){ - echo ''; + echo ' '; } - echo ''; + echo ''; + echo '
    '; + + echo '
    '; } //sirina za besedilo* elseif($row['tip'] == 21){ - echo ''; + echo ' '; for($i=5; $i<50; $i+=5){ - echo ''; + echo ' '; } for($i=50; $i<=100; $i+=10){ - echo ''; + echo ' '; } - echo ''; + echo ' '; + echo '
    '; + + echo '
    '; $this->edit_height(); } - - echo '

    '; } // nastavitev visine text polja (besedilo*) @@ -3958,23 +4471,26 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); $spremenljivkaParams = new enkaParameters($row['params']); - - //echo '

    '; - + $taSize = ($spremenljivkaParams->get('taSize') ? $spremenljivkaParams->get('taSize') : 1); - echo ''.$lang['srv_textAreaSize'].''; - echo ''; - - //echo '

    '; + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } /** @@ -3985,12 +4501,15 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo ''; - echo '

    '; - echo ''; - - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } @@ -4000,21 +4519,26 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); $spremenljivkaParams = new enkaParameters($row['params']); - $display = ( ($row['tip'] == 2)) ? ' style="display:none;"' : ''; - echo '

    '; + + $display = ( ($row['tip'] == 2)) ? ' style="display:none;"' : ''; $gridWidth = ($spremenljivkaParams->get('gridWidth') ? $spremenljivkaParams->get('gridWidth') : 1); - echo $lang['srv_gridAreaSize'].':'; - echo ''; - - echo '

    '; + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitve za besedilo* (st. kosov in polozaj besedila) @@ -4023,28 +4547,36 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - //stevilo kosov - echo ''.$lang['srv_kosov'].': '; - echo ''; - - //polozaj besedila - echo ''.$lang['srv_polozaj'].': '; - echo ''; - - echo '

    '; - - + // stevilo kosov + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + // polozaj besedila + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitve za number (st. polj) @@ -4059,13 +4591,17 @@ class Vprasanje { $row1 = mysqli_fetch_array($sql1); $id2 = $row1['id']; - echo '

    '; - - echo $lang['srv_kategorij'].': '; - echo ''; + echo '

    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitve za number (enota/brez enote) @@ -4080,17 +4616,19 @@ class Vprasanje { $row1 = mysqli_fetch_array($sql1); $id2 = $row1['id']; - - - //polje za enoto - echo ''.$lang['srv_enota'].': '; - echo ''; - - echo '

    '; + // polje za enoto + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitev za ranking (moznosti) @@ -4099,15 +4637,19 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''.$lang['srv_ranking_type'].':'; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitev za ranking (moznosti) @@ -4119,15 +4661,19 @@ class Vprasanje { $sqls = sisplet_query("SELECT * FROM srv_vrednost WHERE spr_id='$this->spremenljivka'"); $count = mysqli_num_rows($sqls); - echo '
    '; - echo '

    '.$lang['srv_ranking_k'].':'; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // nastavitev za nagovor - crta za vprasanjem @@ -4138,37 +4684,30 @@ class Vprasanje { $spremenljivkaParams = new enkaParameters($row['params']); $nagovorLine = ($spremenljivkaParams->get('nagovorLine') ? $spremenljivkaParams->get('nagovorLine') : 0); - echo '

    '.$lang['srv_nagovorLine'].':'; - echo '

    '; + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } /** * prikaze gumbe */ - function edit_buttons () { + private function edit_buttons () { global $lang; - echo '
    '; - - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; - - /*echo ''; - echo ''.$lang['srv_close_profile'].''."\n\r"; - echo '';*/ - - echo ''; - echo ''.$lang['srv_brisispremenljivko'].''."\n\r"; - echo ''; - - //echo '
    '.$lang['srv_more'].'
    '; - - echo '
    '; + echo ''; } /** @@ -4194,10 +4733,15 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '.Help::display('srv_dropdown_quickedit'); - echo ''; - echo '

    '; - + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } function edit_onchange_submit() { @@ -4206,14 +4750,14 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); // pri multigridu ga prikazemo samo ce imamo vklopljeno postopno resevanje - echo '
    2 ? ' style="display:none;"':'').'>'; - - echo '

    '; - //echo ''.$lang['no']; - //echo ''.$lang['yes'].'

    '; - echo ''; - echo '

    '; - + echo '
    2 ? ' style="display:none;"':'').'>'; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; } @@ -4222,8 +4766,18 @@ class Vprasanje { $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '.$lang['srv_hidden_default'].':'.$lang['no'].''.$lang['yes'].'

    '; - + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; + echo' '.$lang['no'].''; + echo ' '.$lang['yes'].''; + echo '
    '; + + echo '
    '; } function edit_captcha () { @@ -4237,11 +4791,22 @@ class Vprasanje { $disabled = ($row['upload']>0 || $row['signature']==1 || $emailVerify==1) ? ' disabled="disabled"' : ''; - echo '

    '.$lang['srv_captcha_edit'].':'; - echo ''; - echo ''; - echo '
    '.$lang['srv_captcha_edit_note'].'

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '.$lang['srv_captcha_edit_note'].''; + echo '
    '; + + echo '
    '; } function edit_email_verify () { @@ -4255,19 +4820,38 @@ class Vprasanje { $disabled = ($row['upload']>0 || $row['signature']==1 || $captcha==1) ? ' disabled="disabled"' : ''; - echo '

    '.$lang['srv_email_edit'].':'; - echo ''; - echo ''; - echo '
    '.$lang['srv_email_edit_note'].'

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' '.$lang['srv_email_edit_note'].''; + echo '
    '; + + echo '
    '; } function edit_showOnAllPages () { global $lang; $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''; - echo '

    '; + + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } @@ -4279,10 +4863,15 @@ class Vprasanje { $spremenljivkaParams = new enkaParameters($row['params']); $hideRadio = ($spremenljivkaParams->get('hideRadio') ? $spremenljivkaParams->get('hideRadio') : 0); - echo '

    '; - echo ''; - echo '

    '; - + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } // Prednastavljena vrednost (pri radio ali tabela - radio) @@ -4308,22 +4897,26 @@ class Vprasanje { || ($row['tip'] == 2 && in_array($row['orientation'], array(0,1,2,7))) || ($row['tip'] == 6 && in_array($row['enota'], array(0,1,8)))) $show = ''; - echo '

    '; - - echo ''; + echo ' '; while($rowV = mysqli_fetch_array($sqlV)){ $naslov = (strlen($rowV['naslov']) > 20) ? substr($rowV['naslov'], 0, 20).'...' : $rowV['naslov']; $naslov = strip_tags($naslov); $naslov = ($naslov == '') ? '' : '('.$naslov.')'; - - echo ' '; + echo ' '; } - echo ''; - - echo '

    '; + echo ' '; + echo '
    '; + + echo '
    '; } // Urejanje velikosti polja drugo @@ -4334,49 +4927,57 @@ class Vprasanje { // Ce imamo kaken odgovor drugo $sql = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id='$row[id]' AND other='1'"); - //if(mysqli_num_rows($sql) > 0){ - - $spremenljivkaParams = new enkaParameters($row['params']); - - $otherWidth = ($spremenljivkaParams->get('otherWidth') ? $spremenljivkaParams->get('otherWidth') : -1); - $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1); - - //echo '
    '.$lang['srv_other_size'].''; - //echo '
    '.$lang['srv_other_size'].''; - //echo '
    '.$lang['srv_other_size'].''; - if(mysqli_num_rows($sql) > 0){ //ce je prisotna moznost Drugo, - echo '
    '.$lang['srv_other_size'].''; //pokazi fieldset - } - else{ //drugace - echo '
    '; - echo '
    '; - echo '

    '.$lang['srv_select_box_prva_vrstica'].':'; - echo ''; - - echo ''; - echo ''; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; - echo '
    '; - echo '

    '.$lang['srv_select_box_prva_vrstica'].':'; - echo ''; - - echo ''; - - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + echo '
    '; - } // Nastavitev text vprasanja, da se pod njim prikazejo odgovori prejsnjih respondentov @@ -4461,11 +5076,15 @@ class Vprasanje { $spremenljivkaParams = new enkaParameters($row['params']); $prevAnswers = ($spremenljivkaParams->get('prevAnswers') ? $spremenljivkaParams->get('prevAnswers') : 0); - echo '

    '; - echo ''; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } /** @@ -4483,33 +5102,39 @@ class Vprasanje { $customRadioNumber = ($spremenljivkaParams->get('customRadioNumber') ? $spremenljivkaParams->get('customRadioNumber') : '5'); $customRadio = $spremenljivkaParams->get('customRadio'); - echo '
    '; - echo '

    '.$lang['srv_custom-picture_radio_label'].':'; - echo ''; - echo '

    '; - $preveriOdgovore = sisplet_query("SELECT spr_id FROM srv_data_vrednost" . $this->db_table. " WHERE spr_id='".$this->spremenljivka."'"); - $stOdgovorov=1; - if(mysqli_num_rows($preveriOdgovore)){ - $stOdgovorov = $customRadioNumber; - } + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; - if($row['tip'] != 6) { - echo '

    ' . $lang['srv_custom-picture_number_label'] . ':'; - echo ''; - echo '

    '; + $preveriOdgovore = sisplet_query("SELECT spr_id FROM srv_data_vrednost" . $this->db_table. " WHERE spr_id='".$this->spremenljivka."'"); + $stOdgovorov=1; + if(mysqli_num_rows($preveriOdgovore)){ + $stOdgovorov = $customRadioNumber; + } + + if($row['tip'] != 6) { + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + } + echo '
    '; } @@ -4526,32 +5151,38 @@ class Vprasanje { $vizualnaSkalaNumber = ($spremenljivkaParams->get('vizualnaSkalaNumber') ? $spremenljivkaParams->get('vizualnaSkalaNumber') : '5'); - echo '

    '.$lang['srv_custom-picture_number_label'].':'; - echo ''; for($n=2; $n<8; $n++){ echo ''; } - echo ''; - echo '

    '; + echo ' '; + echo '
    '; + echo '
    '; } - // nastavitev za lokacijo podtip + // nastavitev za lokacijo podtip function edit_subtype_map() { global $lang; $row = Cache::srv_spremenljivka($this->spremenljivka); - echo '

    '; - echo ''.$lang['srv_vprasanje_podtip_map'].':'; - echo ''; - echo ''; - echo '

    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; } /** @@ -4566,18 +5197,18 @@ class Vprasanje { $newParams = new enkaParameters($row['params']); $input = $newParams->get('multi_input_type') ? $newParams->get('multi_input_type') : 'marker'; - echo '

    '; - echo ''.$lang['srv_vprasanje_input_type_map'].': '; - echo ''; + echo '

    '; - //roleta - echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; - echo ''; - echo '

    '; + echo '
    '; } /** @@ -7385,8 +8016,9 @@ class Vprasanje { } if ($row['tip'] == 20) { - + echo '
    '.$lang['srv_num_limits'].''; $this->edit_number(); + echo '
    '; } // Prikaz podtabele glede na tip respondenta (admin, manager...) @@ -7679,7 +8311,7 @@ class Vprasanje { if($row['enota'] == 1 || $row['enota'] == 0){ $display_trak = 'block'; if($diferencial_trak == 1){ - $display_trak_starting_num = 'block'; + $display_trak_starting_num = 'flex'; } else{ $display_trak_starting_num = 'none'; @@ -7690,22 +8322,37 @@ class Vprasanje { $display_trak_starting_num = 'none'; } - //koda za izris moznosti za vklop/izklop traku - echo '
    '; - echo '

    '; - echo ''; - echo ''; - echo ''; - echo '

    '; - echo '
    '; + + // koda za izris moznosti za vklop/izklop traku + echo '
    '; + + echo '
    '; + echo ' '; + + echo ' '; + echo ' '; + echo ' '; + + echo ' '; + echo '
    '; //koda za izris moznosti za vklop/izklop traku - konec + //koda za izris polja za vnos zacetne stevilke traku - echo '

    ' . $lang['srv_diferencial_trak_starting_num'] . ':

    '; + echo '
    '; - echo '
    '; - echo '

    '.$lang['srv_trak_num_of_titles'].':'; - echo ''; + echo ' '; + + echo '

    '; + + + echo '
    '; + + echo ' '; + echo ' '; - echo '

    '; - echo '
    '; + + echo '
    '; + + + echo '
    '; } //posodobi skrite vrednosti odgovorov za diferencial trak @@ -7811,17 +8461,19 @@ class Vprasanje { $display = ( ( $row['tip'] == 6 && ($row['enota'] == 0 || $row['enota'] == 1) ) || ( $row['tip'] == 16 && ($row['enota'] == 0 || $row['enota'] == 1) ) ) && ($diferencial_trak == 0) ? '' : 'style="display:none;"'; - echo '
    '; + echo '
    '; - echo '

    '.$lang['srv_custom_column_labels_presentation'].':'; + echo '

    '; - echo ''; + echo ' '; - echo '

    '; + echo ' '; + + echo '
    '; echo '
    '; } @@ -7835,19 +8487,22 @@ class Vprasanje { $grid_repeat_header = ($spremenljivkaParams->get('grid_repeat_header') ? $spremenljivkaParams->get('grid_repeat_header') : 0); - echo '
    '; + + echo '
    '; + + echo '
    '; - echo '

    '.$lang['srv_grid_repeat_header'].':'; + echo ' '; - echo ''; + echo ' '; - echo '

    '; + echo '
    '; echo '
    '; } @@ -7895,16 +8550,17 @@ class Vprasanje { $spr_id = $row['id']; + //preveri, ce je kaksno obmocje shranjeno v bazi - //$sqlR = sisplet_query("SELECT * FROM srv_hotspot_regions WHERE spr_id = $spr_id"); $sqlR = sisplet_query("SELECT region_index, vre_id, region_name FROM srv_hotspot_regions WHERE spr_id = $spr_id"); - //$rowR = mysqli_fetch_array($sql); if($row['tip'] == 1 || $row['tip'] == 2){ $enota_orientation = $row['orientation']; - }else if($row['tip'] == 6){ + } + else if($row['tip'] == 6){ $enota_orientation = $row['enota']; } + ?> - '.$lang['srv_vprasanje_heatmap_num_clicks'].':'.Help::display('srv_hotspot_visibility').' '; - echo ''; - echo '

    '; - //roleta za izbiro najvecjega stevila klikov na sliko - konec - - //checkbox za "Pokazi stevec klikov" - echo ''; - //checkbox za "Pokazi stevec klikov" - konec - - //checkbox za "Pokazi klike" - echo ''; - //checkbox za "Pokazi klike" - konec - - //dodatne nastavitve, ce morajo biti kliki vidni - - echo '
    '; - - //Izbira barve klika - if ($heatmap_click_color == '') { - $value = '#000000'; - echo '

    '.$lang['srv_vprasanje_heatmap_clicks_color'].': '.$lang['srv_te_default'].'

    '; - }else{ - $value = $heatmap_click_color; - } - echo '

    '.$lang['srv_vprasanje_heatmap_clicks_color'].': '; - echo ''; - echo '

    '; - - echo '
    '; - //Izbira barve klika - konec - - //Izbira radija/velikosti klika - echo '

    '.$lang['srv_vprasanje_heatmap_clicks_size'].': '.$heatmap_click_size.'

    '; - //Izbira radija/velikosti klika - konec - //Izbira oblike klika $heatmap_click_shape - echo '

    '.$lang['srv_vprasanje_heatmap_clicks_shape'].': '; - echo ''; - echo '

    '; - //Izbira oblike klika - konec + echo '
    '.$lang['srv_hot_spot_settings'].''; + + // roleta za izbiro najvecjega stevila klikov na sliko + echo '
    '; + echo '
    '; + echo ' '; + echo ' '; + + echo '
    '; + + // checkbox za "Pokazi stevec klikov" + echo '
    '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo '
    '; + + echo '
    '; + // roleta za izbiro najvecjega stevila klikov na sliko - konec + + + //checkbox za "Pokazi klike" + echo '
    '; + + echo '
    '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo '
    '; + echo '
    '; - //dodatne nastavitve, ce morajo biti kliki vidni - konec + //checkbox za "Pokazi klike" - konec + + + // dodatne nastavitve, ce morajo biti kliki vidni + echo '
    '; + + //Izbira barve klika + if ($heatmap_click_color == '') { + $value = '#000000'; + echo '

    '.$lang['srv_vprasanje_heatmap_clicks_color'].': '.$lang['srv_te_default'].'

    '; + } + else{ + $value = $heatmap_click_color; + } + echo '

    '.$lang['srv_vprasanje_heatmap_clicks_color'].': '; + echo ''; + echo '

    '; + + echo '
    '; + //Izbira barve klika - konec + + //Izbira radija/velikosti klika + echo '
    '; + echo ' '; + echo ' '.$heatmap_click_size.''; + echo '
    '; + //Izbira radija/velikosti klika - konec + + //Izbira oblike klika $heatmap_click_shape + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + //Izbira oblike klika - konec + + echo '
    '; + //dodatne nastavitve, ce morajo biti kliki vidni - konec + + + echo '
    '; + //fieldset Obmocja - zacasno skrivanje echo '
    '.$lang['srv_hot_spot_regions_menu'].''; - if (mysqli_num_rows($sqlR) != 0){ - //pokazi shranjena obmocja - while ($rowR = mysqli_fetch_array($sqlR)) { - echo '
    '.$rowR['region_name'].'

    '; - } - } - //Sporocilo ob odsotnosti slike - echo '

    '.$lang['srv_hotspot_message'].'

    '; - //Sporocilo ob odsotnosti slike - konec - - //Dodajanje območja - gumb - echo '

    '; - - //*************************** SKRIVANJE NASTAVITEV OBMOCJA - $display_regions_menu = 'style="display:none;"'; //skrivanje nastavitev obmocja + v js datotekah - //*************************** - //div za nastavitve obmocja - echo '
    '; - //Izbira barve obmocja - if ($hotspot_region_color == '') { - $value = '#000000'; - echo ''.$lang['srv_hotspot_region_color_text'].': '.$lang['srv_te_default'].' '; - }else{ - $value = $hotspot_region_color; - } - - echo ''.$lang['srv_hotspot_region_color_text'].': '; - echo ''; - echo ''; - - echo '
    '; - //Izbira barve obmocja - konec - - //Regions visibility options - echo '

    '.$lang['srv_hotspot_visibility_options_title'].':'.Help::display('srv_hotspot_visibility').' '; - echo ''; - echo '

    '; - //Regions visibility options - konec - - //Tooltips options - if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox - $srv_hotspot_tooltip = 'srv_hotspot_tooltip'; - }else if($row['tip'] == 6){ - $srv_hotspot_tooltip = 'srv_hotspot_tooltip_grid'; - } - echo '

    '.$lang['srv_hotspot_tooltips_options_title'].':'.Help::display($srv_hotspot_tooltip).' '; - echo ''; - echo '

    '; - //Tooltips options - konec - echo '
    '; - //div za nastavitve obmocja - konec + echo '
    '; + + //pokazi shranjena obmocja + while ($rowR = mysqli_fetch_array($sqlR)) { + echo '
    '; + echo '
    '.$rowR['region_name'].'

    '; + echo '
    '; + } + + echo '
    '; + } + + //Sporocilo ob odsotnosti slike + echo '
    '; + echo '
    '; + echo ' '.$lang['srv_hotspot_message'].''; + echo '
    '; + echo '
    '; + //Sporocilo ob odsotnosti slike - konec + + + //Dodajanje območja - gumb + echo '
    '; + echo '
    '; + echo ' '; + echo '
    '; + echo '
    '; + + //*************************** SKRIVANJE NASTAVITEV OBMOCJA + $display_regions_menu = 'style="display:none;"'; //skrivanje nastavitev obmocja + v js datotekah + //*************************** + //div za nastavitve obmocja + echo '
    '; + //Izbira barve obmocja + if ($hotspot_region_color == '') { + $value = '#000000'; + echo ''.$lang['srv_hotspot_region_color_text'].': '.$lang['srv_te_default'].' '; + }else{ + $value = $hotspot_region_color; + } + + echo ''.$lang['srv_hotspot_region_color_text'].': '; + echo ''; + echo ''; + + echo '
    '; + //Izbira barve obmocja - konec + + //Regions visibility options + echo '

    '.$lang['srv_hotspot_visibility_options_title'].':'.Help::display('srv_hotspot_visibility').' '; + echo ''; + echo '

    '; + //Regions visibility options - konec + + //Tooltips options + if($row['tip'] == 1 || $row['tip'] == 2){ //ce je radio ali checkbox + $srv_hotspot_tooltip = 'srv_hotspot_tooltip'; + }else if($row['tip'] == 6){ + $srv_hotspot_tooltip = 'srv_hotspot_tooltip_grid'; + } + + echo '

    '.$lang['srv_hotspot_tooltips_options_title'].':'.Help::display($srv_hotspot_tooltip).' '; + echo ''; + echo '

    '; + //Tooltips options - konec + echo '
    '; + //div za nastavitve obmocja - konec echo '
    '; //fieldset Obmocja - konec - } } diff --git a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php index a33491ad2..706dfe138 100644 --- a/admin/survey/classes/mobile/class.MobileSurveyAdmin.php +++ b/admin/survey/classes/mobile/class.MobileSurveyAdmin.php @@ -25,7 +25,6 @@ class MobileSurveyAdmin{ $this->first_action = $navigationArray['first_action']; $this->second_action = $navigationArray['second_action']; $this->third_action = $navigationArray['third_action']; - } // Izris glave z menijem - znotraj ankete @@ -278,7 +277,7 @@ class MobileSurveyAdmin{ // Odjava na nov nacin preko frontend/api echo '
    '; - echo ' ' . $lang['logout'] . ''; + echo ' ' . $lang['logout'] . ''; echo '
    '; echo '
    '; @@ -749,11 +748,6 @@ class MobileSurveyAdmin{ 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=settings', 'active' => ($_GET['a'] == A_VABILA && ($_GET['m'] == '' || $_GET['m'] == 'settings') ? 'active' : '') ), - array( - 'title' => $lang['srv_publication_url'], - 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_VABILA . '&m=url', - 'active' => ($_GET['a'] == A_VABILA && $_GET['m'] == 'url' ? 'active' : '') - ), array( 'title' => $lang['srv_inv_nav_invitations'], 'url' => 'index.php?anketa=' . $this->surveyAdminClass->anketa . '&a=' . A_INVITATIONS . '&m=settings', @@ -1017,19 +1011,19 @@ class MobileSurveyAdmin{ // Anketa je zaklenjena if($row['locked'] == 1){ echo '
    '; - echo ' '; + echo ' '; echo '
    '; return; } echo ''; @@ -1043,9 +1037,7 @@ class MobileSurveyAdmin{ echo '
    '.$lang['srv_vprasanje_tip_5'].'
    '; echo '
    '.$lang['srv_vprasanje_tip_6'].'
    '; - echo ' '; - echo ' Zapri'; - echo ' '; + echo ' '; echo '
    '; } @@ -1058,10 +1050,10 @@ class MobileSurveyAdmin{ echo ''; echo ''; } @@ -1070,7 +1062,7 @@ class MobileSurveyAdmin{ global $lang; echo ''; } } diff --git a/admin/survey/classes/objects/obj.PopUp.php b/admin/survey/classes/objects/obj.PopUp.php index 85eb7c635..396c977f6 100644 --- a/admin/survey/classes/objects/obj.PopUp.php +++ b/admin/survey/classes/objects/obj.PopUp.php @@ -85,51 +85,50 @@ class PopUp return $this; } - public function display() - { + public function display(){ + $this->_displayed = true; #začnemo osnovni div echo '_id != null) - { + if ($this->_id != null){ echo ' id="'.$this->_id.'"'; } - if (count($this->_css) > 0) - { + if (count($this->_css) > 0){ echo ' class="'. implode(' ',$this->_css).'"'; } echo '>'; + #dodamo header - if ($this->_headerText != null) - { + if ($this->_headerText != null){ echo '
    '; echo $this->_headerText; echo '
    '; #PM_top + + echo ''; } + #dodamo vsebino - content - echo '
    '; + echo ''; # class="divPopUp_content" + echo '
    '; - # začnemo div z gumbi - echo '
    '; - - # izrišemo gumbe + + # div z gumbi + echo '
    '; if (count($this->_buttons) > 0) { - foreach ($this->_buttons AS $button) - { + foreach ($this->_buttons AS $button){ echo $button; } } - - #zaključimo div z gumbi - echo '
    '; #class="inv_FS_btm clr" - - #zaključimo div z gumbi echo '
    '; + + + #zaključimo osnovni div + echo '
    '; + return $this; } diff --git a/admin/survey/classes/objects/obj.PopUpButton.php b/admin/survey/classes/objects/obj.PopUpButton.php index 711e54f68..6ff04fee8 100644 --- a/admin/survey/classes/objects/obj.PopUpButton.php +++ b/admin/survey/classes/objects/obj.PopUpButton.php @@ -51,7 +51,7 @@ class PopUpButton private $_float = 'floatLeft'; private $_space = 'spaceLeft'; - private $_buttonColor = 'gray'; + private $_buttonColor = 'white-blue'; private $_actions = array(); public function __construct($caption = null) @@ -99,11 +99,15 @@ class PopUpButton { switch ($buttonColor) { case 'orange': - $this->_buttonColor = 'orange'; + $this->_buttonColor = 'blue'; break; + case 'white-black': + $this->_buttonColor = 'white-black'; + break; + default: - $this->_buttonColor = 'gray'; + $this->_buttonColor = 'white-blue'; break; } @@ -121,13 +125,10 @@ class PopUpButton } public function __toString() { - $str = '
    '; - $str .= ''; - $str .= '
    '; + $str = ''; + return $str; } } diff --git a/admin/survey/classes/objects/obj.PopUpCancelButton.php b/admin/survey/classes/objects/obj.PopUpCancelButton.php index a4e7ab72c..ca2787e27 100644 --- a/admin/survey/classes/objects/obj.PopUpCancelButton.php +++ b/admin/survey/classes/objects/obj.PopUpCancelButton.php @@ -53,5 +53,6 @@ class PopUpCancelButton extends PopUpButton global $lang; parent::__construct($lang['srv_cancel']); $this -> addAction('onClick',"$('#fade').fadeOut('slow');$('#fullscreen').fadeOut('slow').html(''); return false;"); + $this -> setButtonColor('white-black'); } } \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.html b/admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.html deleted file mode 100644 index c94627450..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.html +++ /dev/null @@ -1,363 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - Spol
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    - (Moški)
    333.3%33.3%33.3%
     
    2
    - (Ženski)
    666.7%66.7%100.0%
    Veljavni () -  () - Skupaj9100.0%100.0% 
    ManjkajočiSkupaj   -    - -
    100.0%
    -
    -
    00.0%  
    SKUPAJ 9100.0%  
    - -
    - - - - - - - - - - - - - -   - - - - - -   - - - - - -   - - - - - -   - - - - - -   - - - - - -   - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Q2Dohodek
    OdgovoriFrekvencaOdstotekKumulativa
    900
    111.1%11.1%
    1000
    111.1%22.2%
    1300
    333.3%55.6%
    1500
    111.1%66.7%
    1600
    111.1%77.8%
    1700
    111.1%88.9%
    2000
    111.1%100.0%
    Veljavni () -  () - Skupaj9100.0% 
    ManjkajočiSkupaj   -    - -
    100.0%
    -
    -
    00.0% 
    SKUPAJ 9100.0% 
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Q3Država
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    - (Slovenija)
    222.2%22.2%22.2%
     
    2
    - (Hrvaška)
    222.2%22.2%44.4%
     
    3
    - (Avstrija)
    222.2%22.2%66.7%
     
    4
    - (Italija)
    111.1%11.1%77.8%
     
    5
    - (Madžarska)
    222.2%22.2%100.0%
    Veljavni () -  () - Skupaj9100.0%100.0% 
    ManjkajočiSkupaj   -    - -
    100.0%
    -
    -
    00.0%  
    SKUPAJ 9100.0%  
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.min.html deleted file mode 100644 index 0ebaca2b8..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledFrekvence.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    Spol
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    (Moški)
    333.3%33.3%33.3%
     
    2
    (Ženski)
    666.7%66.7%100.0%
    Veljavni ()  () Skupaj9100.0%100.0% 
    ManjkajočiSkupaj    
    100.0%
    00.0%  
    SKUPAJ 9100.0%  

           
    Q2Dohodek
    OdgovoriFrekvencaOdstotekKumulativa
    900
    111.1%11.1%
    1000
    111.1%22.2%
    1300
    333.3%55.6%
    1500
    111.1%66.7%
    1600
    111.1%77.8%
    1700
    111.1%88.9%
    2000
    111.1%100.0%
    Veljavni ()  () Skupaj9100.0% 
    ManjkajočiSkupaj    
    100.0%
    00.0% 
    SKUPAJ 9100.0% 

    Q3Država
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    (Slovenija)
    222.2%22.2%22.2%
     
    2
    (Hrvaška)
    222.2%22.2%44.4%
     
    3
    (Avstrija)
    222.2%22.2%66.7%
     
    4
    (Italija)
    111.1%11.1%77.8%
     
    5
    (Madžarska)
    222.2%22.2%100.0%
    Veljavni ()  () Skupaj9100.0%100.0% 
    ManjkajočiSkupaj    
    100.0%
    00.0%  
    SKUPAJ 9100.0%  
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.html b/admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.html deleted file mode 100644 index dddfcfa08..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.html +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     Spol (Q2) -
    Moški
    - ( 1 ) -
    Ženska
    - ( 2 ) -
     Starost (Q3) - Starost (Q3) -
    pod 20
    - ( 1 ) -
    20 - 40
    - ( 2 ) -
    nad 40
    - ( 3 ) -
    pod 20
    - ( 1 ) -
    20 - 40
    - ( 2 ) -
    nad 40
    - ( 3 ) -
    Država (Q1) - Slovenija
    - ( 1 ) -
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    1
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    0
    Hrvaška
    - ( 2 ) -
    - - - - - -
    4
    - - - - - -
    1
    - - - - - -
    1
    - - - - - -
    2
    - - - - - -
    0
    - - - - - -
    0
    Avstrija
    - ( 3 ) -
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    2
    - - - - - -
    3
    Italija
    - ( 4 ) -
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    0
    Madžarska
    - ( 5 ) -
    - - - - - -
    0
    - - - - - -
    2
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    0
    - - - - - -
    0
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.min.html deleted file mode 100644 index 801bc2c3a..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledMultitabele.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
     Spol (Q2)
    Moški
    ( 1 )
    Ženska
    ( 2 )
     Starost (Q3)Starost (Q3)
    pod 20
    ( 1 )
    20 - 40
    ( 2 )
    nad 40
    ( 3 )
    pod 20
    ( 1 )
    20 - 40
    ( 2 )
    nad 40
    ( 3 )
    Država (Q1)Slovenija
    ( 1 )
    1
    0
    1
    1
    0
    0
    Hrvaška
    ( 2 )
    4
    1
    1
    2
    0
    0
    Avstrija
    ( 3 )
    1
    0
    0
    0
    2
    3
    Italija
    ( 4 )
    0
    0
    0
    0
    0
    0
    Madžarska
    ( 5 )
    0
    2
    1
    0
    0
    0
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.html b/admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.html deleted file mode 100644 index 8b3fa1ed5..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.html +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    VariablaVprašanjeVeljavni-1 (Ni odgovoril)-2 (Preskok (if))-3 (Prekinjeno)-4 (Naknadno vprasanje)-5 (Prazna enota)-97 (Neustrezno)-98 (Zavrnil)-99 (Ne vem)UstrezniVse enoteNS
    Q1Spol1034000000044530.8
    23%77%0%0%0%0%0%0%0%
    Q2Dohodek1529000000044530.7
    34%66%0%0%0%0%0%0%0%
    Q3Država638000000044530.9
    14%86%0%0%0%0%0%0%0%
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.min.html deleted file mode 100644 index 6625b217c..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledNeodgovori.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    VariablaVprašanjeVeljavni-1 (Ni odgovoril)-2 (Preskok (if))-3 (Prekinjeno)-4 (Naknadno vprasanje)-5 (Prazna enota)-97 (Neustrezno)-98 (Zavrnil)-99 (Ne vem)UstrezniVse enoteNS
    Q1Spol1034000000044530.8
    23%77%0%0%0%0%0%0%0%
    Q2Dohodek1529000000044530.7
    34%66%0%0%0%0%0%0%0%
    Q3Država638000000044530.9
    14%86%0%0%0%0%0%0%0%
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledOpisne.html b/admin/survey/classes/staticHtml/AnalizaPredogledOpisne.html deleted file mode 100644 index a7ece3ac7..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledOpisne.html +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     SpremenljivkaVprašanjeVeljavnoŠt. - enot - Povprečje
    / odstotek
    Std. - Odklon - MinimumMaksimum
    Q1Spol991.670.5012
    Q2Dohodek  
    v €991,400.00342.789002000
    Q3Država992.891.5415
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledOpisne.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledOpisne.min.html deleted file mode 100644 index 5d70fd458..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledOpisne.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
     SpremenljivkaVprašanjeVeljavnoŠt. enotPovprečje
    / odstotek
    Std. OdklonMinimumMaksimum
    Q1Spol991.670.5012
    Q2Dohodek  
    v €991,400.00342.789002000
    Q3Država992.891.5415
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.html b/admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.html deleted file mode 100644 index a526c43ba..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    SpolDohodek
    cv €
    PovprečjeŠt. - enot
    Moški ( - 1 )1,500.0003
    Ženski ( - 2 )1,350.0006
    Skupaj1,400.0009
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.min.html deleted file mode 100644 index ab081a960..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledPovprecja.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    SpolDohodek
    cv €
    PovprečjeŠt. enot
    Moški ( 1 )1,500.0003
    Ženski ( 2 )1,350.0006
    Skupaj1,400.0009
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.html b/admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.html deleted file mode 100644 index 860b82afa..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.html +++ /dev/null @@ -1,62 +0,0 @@ -
    - - - - - - - - - - - - - - - - - - -
    Spol(Q1)Dohodek(Q2)
    v €(Q2)
    Moški1,500.00
    Ženski1,350.00
    -
    -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Spol(Q1)Država(Q3)
    Slovenija(1)Hrvaška(2)Avstrija(3)Italija(4)Madžarska(5)povprečje
    Moški101102.67
    Ženski121023.00
    -
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.min.html deleted file mode 100644 index 46f4e9488..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledRazbitje.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    Spol(Q1)Dohodek(Q2)
    v €(Q2)
    Moški1,500.00
    Ženski1,350.00

    Spol(Q1)Država(Q3)
    Slovenija(1)Hrvaška(2)Avstrija(3)Italija(4)Madžarska(5)povprečje
    Moški101102.67
    Ženski121023.00
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.html b/admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.html deleted file mode 100644 index 19b0095a0..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.html +++ /dev/null @@ -1,303 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Q1Spol
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    - (Moški)
    333.3%33.3%33.3%
     
    2
    - (Ženski)
    666.7%66.7%100.0%
    Veljavni () -  () - Skupaj9100.0%100.0% 
    ManjkajočiSkupaj   -    - -
    100.0%
    -
    -
    00.0%  
    SKUPAJ 9100.0%  
     
     Povprečje1.67Std. - Odklon0.50
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Q2Dohodek
    PodvprašanjaVeljavnoŠt. - enotPovprečjeStd. - OdklonMinimumMaksimum
    Q2_1v €991,400.00342.789002000
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Q3Država
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    - (Slovenija)
    222.2%22.2%22.2%
     
    2
    - (Hrvaška)
    222.2%22.2%44.4%
     
    3
    - (Avstrija)
    222.2%22.2%66.7%
     
    4
    - (Italija)
    111.1%11.1%77.8%
     
    5
    - (Madžarska)
    222.2%22.2%100.0%
    Veljavni () -  () - Skupaj9100.0%100.0% 
    ManjkajočiSkupaj   -    - -
    100.0%
    -
    -
    00.0%  
    SKUPAJ 9100.0%  
     
     Povprečje2.89Std. - Odklon1.54
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.min.html deleted file mode 100644 index 6d2c2a9fe..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledSumarnik.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    Q1Spol
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    (Moški)
    333.3%33.3%33.3%
     
    2
    (Ženski)
    666.7%66.7%100.0%
    Veljavni ()  () Skupaj9100.0%100.0% 
    ManjkajočiSkupaj    
    100.0%
    00.0%  
    SKUPAJ 9100.0%  
     
     Povprečje1.67Std. Odklon0.50

    Q2Dohodek
    PodvprašanjaVeljavnoŠt. enotPovprečjeStd. OdklonMinimumMaksimum
    Q2_1v €991,400.00342.789002000

    Q3Država
    OdgovoriFrekvencaOdstotekVeljavniKumulativa
     
    1
    (Slovenija)
    222.2%22.2%22.2%
     
    2
    (Hrvaška)
    222.2%22.2%44.4%
     
    3
    (Avstrija)
    222.2%22.2%66.7%
     
    4
    (Italija)
    111.1%11.1%77.8%
     
    5
    (Madžarska)
    222.2%22.2%100.0%
    Veljavni ()  () Skupaj9100.0%100.0% 
    ManjkajočiSkupaj    
    100.0%
    00.0%  
    SKUPAJ 9100.0%  
     
     Povprečje2.89Std. Odklon1.54
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledTTest.html b/admin/survey/classes/staticHtml/AnalizaPredogledTTest.html deleted file mode 100644 index 5e76987de..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledTTest.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    (Q1)Spol(Q2) v €
    nxse(x) - ±1,96×se(x) - dse(d)t
    Moški31,500.000200.000115.470226.321150.000201.2460.745
    Ženski61,350.000403.733164.823323.053
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledTTest.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledTTest.min.html deleted file mode 100644 index 44c9216a4..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledTTest.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    (Q1)Spol(Q2) v €
    nxse(x) ±1,96×se(x) dse(d)t
    Moški31,500.000200.000115.470226.321150.000201.2460.745
    Ženski61,350.000403.733164.823323.053
    \ No newline at end of file diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledTabele.html b/admin/survey/classes/staticHtml/AnalizaPredogledTabele.html deleted file mode 100644 index a827a946b..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledTabele.html +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Spol (Q1)Država (Q3) 
    Slovenija
    - ( 1 ) -
    Hrvaška
    - ( 2 ) -
    Avstrija
    - ( 3 ) -
    Italija
    - ( 4 ) -
    Madžarska
    - ( 5 ) -
    Skupaj
    Moški
    - ( 1 ) -
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    1
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    3
    Ženski
    - ( 2 ) -
    - - - - - -
    1
    - - - - - -
    2
    - - - - - -
    1
    - - - - - -
    0
    - - - - - -
    2
    - - - - - -
    6
    Skupaj - - - - - -
    2
    - - - - - -
    2
    - - - - - -
    2
    - - - - - -
    1
    - - - - - -
    2
    - - - - - -
    9
    diff --git a/admin/survey/classes/staticHtml/AnalizaPredogledTabele.min.html b/admin/survey/classes/staticHtml/AnalizaPredogledTabele.min.html deleted file mode 100644 index d47f0958f..000000000 --- a/admin/survey/classes/staticHtml/AnalizaPredogledTabele.min.html +++ /dev/null @@ -1,2 +0,0 @@ - -
    Spol (Q1)Država (Q3) 
    Slovenija
    ( 1 )
    Hrvaška
    ( 2 )
    Avstrija
    ( 3 )
    Italija
    ( 4 )
    Madžarska
    ( 5 )
    Skupaj
    Moški
    ( 1 )
    1
    0
    1
    1
    0
    3
    Ženski
    ( 2 )
    1
    2
    1
    0
    2
    6
    Skupaj
    2
    2
    2
    1
    2
    9
    \ No newline at end of file diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php index b8dd14e23..f2139e11e 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php @@ -187,7 +187,6 @@ class SurveyAnalysis { if ( self::$dataFileStatus == FILE_STATUS_NO_DATA || self::$dataFileStatus == FILE_STATUS_SRV_DELETED) { if (self::$podstran != M_ANALYSIS_ARCHIVE) Common::noDataAlert(); - return false; } @@ -444,9 +443,9 @@ class SurveyAnalysis { } - if (self::$dataFileStatus == FILE_STATUS_OLD && self::$podstran != M_ANALYSIS_ARCHIVE) { + /*if (self::$dataFileStatus == FILE_STATUS_OLD && self::$podstran != M_ANALYSIS_ARCHIVE) { echo "Posodobljeno: ".date("d.m.Y, H:i:s", strtotime(self::$dataFileUpdated)); - } + }*/ # krostabe naredimo if(self::$podstran == M_ANALYSIS_CROSSTAB ) { @@ -534,96 +533,102 @@ class SurveyAnalysis { #preberemo HEADERS iz datoteke self::$_HEADERS = unserialize(file_get_contents(self::$headFileName)); - # odstranimo sistemske variable tipa email, ime, priimek, geslo - self::removeSystemVariables(); + # odstranimo sistemske variable tipa email, ime, priimek, geslo + self::removeSystemVariables(); - # polovimo frekvence - self::getDescriptives(); + # polovimo frekvence + self::getDescriptives(); - # izpišemo opisne statistike - $vars_count = count(self::$_FILTRED_VARIABLES); - $line_break = ''; + # izpišemo opisne statistike + $vars_count = count(self::$_FILTRED_VARIABLES); + $line_break = ''; - # dodamo še kontrolo če kličemo iz displaySingleVar - if (isset($_spid) && $_spid !== null) { - self::$_HEADERS = array($_spid => self::$_HEADERS[$_spid]); + # dodamo še kontrolo če kličemo iz displaySingleVar + if (isset($_spid) && $_spid !== null) { + self::$_HEADERS = array($_spid => self::$_HEADERS[$_spid]); + } + + # ali prikazujemo spremenljivke brez veljavnih odgovorov + $show_spid = array(); + foreach (self::$_HEADERS AS $spid => $spremenljivka) { + # preverjamo ali je meta + if ($spremenljivka['tip'] != 'm' + && ( count(self::$_FILTRED_VARIABLES) == 0 || (count(self::$_FILTRED_VARIABLES) > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) )) + && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES) ){ + $only_valid = 0; + + $show_enota = false; + # preverimo ali imamo samo eno variablo in če iammo enoto + if ((int)$spremenljivka['enota'] != 0 || $spremenljivka['cnt_all'] > 1 ) { + $show_enota = true; + } + + # izpišemo glavno vrstico z podatki + $_sequence = null; + # za enodimenzijske tipe izpišemo podatke kar v osnovni vrstici + if (!$show_enota) { + $variable = $spremenljivka['grids'][0]['variables'][0]; + $_sequence = $variable['sequence']; # id kolone z podatki + $only_valid += (int)self::$_DESCRIPTIVES[$_sequence]['validCnt']; + } else { + if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 3) { + $variable = $spremenljivka['grids'][0]['variables'][0]; + $_sequence = $variable['sequence']; # id kolone z podatki + $show_enota = false; + } + #zloopamo skozi variable + $_sequence = null; + $grd_cnt=0; + if (count($spremenljivka['grids']) > 0) + foreach ($spremenljivka['grids'] AS $gid => $grid) { + + # dodamo dodatne vrstice z albelami grida + if (count ($grid['variables']) > 0) + foreach ($grid['variables'] AS $vid => $variable ){ + # dodamo ostale vrstice + $do_show = ($variable['other'] !=1 && ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 3 || $spremenljivka['tip'] == 5 || $spremenljivka['tip'] == 8 )) + ? false + : true; + if ($do_show) { + $only_valid += (int)self::$_DESCRIPTIVES[$variable['sequence']]['validCnt']; + } + } + } + } //else: if (!$show_enota) + + if (SurveyDataSettingProfiles :: getSetting('hideEmpty') == 1 && $only_valid == 0 && self::$_forceShowEmpty == false) { + $show_spid[$spid] = false; + } else { + $show_spid[$spid] = true; + } + + } } - - # ali prikazujemo spremenljivke brez veljavnih odgovorov - $show_spid = array(); - foreach (self::$_HEADERS AS $spid => $spremenljivka) { - # preverjamo ali je meta - if ($spremenljivka['tip'] != 'm' - && ( count(self::$_FILTRED_VARIABLES) == 0 || (count(self::$_FILTRED_VARIABLES) > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) )) - && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES) ){ - $only_valid = 0; - $show_enota = false; - # preverimo ali imamo samo eno variablo in če iammo enoto - if ((int)$spremenljivka['enota'] != 0 || $spremenljivka['cnt_all'] > 1 ) { - $show_enota = true; - } - # izpišemo glavno vrstico z podatki - $_sequence = null; - # za enodimenzijske tipe izpišemo podatke kar v osnovni vrstici - if (!$show_enota) { - $variable = $spremenljivka['grids'][0]['variables'][0]; - $_sequence = $variable['sequence']; # id kolone z podatki - $only_valid += (int)self::$_DESCRIPTIVES[$_sequence]['validCnt']; - } else { - if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 3) { - $variable = $spremenljivka['grids'][0]['variables'][0]; - $_sequence = $variable['sequence']; # id kolone z podatki - $show_enota = false; - } - #zloopamo skozi variable - $_sequence = null; - $grd_cnt=0; - if (count($spremenljivka['grids']) > 0) - foreach ($spremenljivka['grids'] AS $gid => $grid) { - - # dodamo dodatne vrstice z albelami grida - if (count ($grid['variables']) > 0) - foreach ($grid['variables'] AS $vid => $variable ){ - # dodamo ostale vrstice - $do_show = ($variable['other'] !=1 && ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 3 || $spremenljivka['tip'] == 5 || $spremenljivka['tip'] == 8 )) - ? false - : true; - if ($do_show) { - $only_valid += (int)self::$_DESCRIPTIVES[$variable['sequence']]['validCnt']; - } - } - } - } //else: if (!$show_enota) + echo ''; - if (SurveyDataSettingProfiles :: getSetting('hideEmpty') == 1 && $only_valid == 0 && self::$_forceShowEmpty == false) { - $show_spid[$spid] = false; - } else { - $show_spid[$spid] = true; - } + echo ''; - } - } - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + foreach (self::$_HEADERS AS $spid => $spremenljivka) { # dajemo v bufer, da da ne prikazujemo vprašanj brez veljavnih odgovorov če imamo tako nastavljeno @@ -685,6 +690,7 @@ class SurveyAnalysis { } //else: if (!$show_enota) } // end if $spremenljivka['tip'] != 'm' } // end foreach self::$_HEADERS + echo '
     '.'' . $lang['srv_analiza_opisne_variable'] .''.'' . $lang['srv_analiza_opisne_variable_text'] .''.' '.'' . $lang['srv_analiza_opisne_variable'] .''.'' . $lang['srv_analiza_opisne_variable_text'] .''.'' . $lang['srv_analiza_opisne_variable_type'] .''.'' . $lang['srv_analiza_opisne_variable_expression'] .''.'' . $lang['srv_analiza_opisne_variable_skala'] .''.'' . $lang['srv_analiza_opisne_variable_type'] .''.'' . $lang['srv_analiza_opisne_variable_expression'] .''.'' . $lang['srv_analiza_opisne_variable_skala'] .''.'' . $lang['srv_analiza_opisne_m'] .''.'' . $lang['srv_analiza_num_units'] .''.'' . $lang['srv_analiza_opisne_povprecje_odstotek'] .''.'' . $lang['srv_analiza_opisne_odklon'] .''.'' . $lang['srv_analiza_opisne_min'] .''.'' . $lang['srv_analiza_opisne_max'] .''.'' . $lang['srv_analiza_opisne_m'] .''.'' . $lang['srv_analiza_num_units'] .''.'' . $lang['srv_analiza_opisne_povprecje_odstotek'] .''.'' . $lang['srv_analiza_opisne_odklon'] .''.'' . $lang['srv_analiza_opisne_min'] .''.'' . $lang['srv_analiza_opisne_max'] .''.'
    '; // Izrisemo ikone na dnu @@ -706,7 +712,9 @@ class SurveyAnalysis { $cssBack = $variable['other'] != 1 ? ' anl_bck_desc_2' : ' anl_bck_desc_3'; $cssMove = $variable['other'] != 1 ? ' anl_tin' : ' anl_tin1'; $cssBack .= (int)$grid['new_grid'] == 1 ? ' anl_bt ' : ' anl_bt_dot '; + $_sequence = $variable['sequence']; # id kolone z podatki + if ($_sequence != null) { $_desc = self::$_DESCRIPTIVES[$_sequence]; } @@ -714,43 +722,40 @@ class SurveyAnalysis { # pokličemo objekt SpremenljivkaSkala $objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']); + # če smo na začetku grida dodamo podatke podvprašanja if ($variable['var_cnt'] == 0 && in_array($spremenljivka['tip'],array(16,19,20) ) ) { - echo ''; - echo ' '; - echo ''; + echo ''; + + echo ' '; + + echo ''; echo $grid['variable']; echo ''; - echo ''; + + echo ''; echo $grid['naslov']; echo ''; - /* - if (self::$_SHOW_LEGENDA) { - echo ' '; - echo ' '; - echo ' '; - } - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - */ + echo ''; } - echo ''; - echo ''; + + + echo ''; + + echo ''; echo ' '; echo ''; - echo ''; + + echo ''; echo $variable['variable']; echo ''; - echo ''; - //echo $grid['naslov'] . ' - ' .$variable['naslov']; + + echo ''; echo $variable['naslov']; echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : ''; echo ''; + if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -759,16 +764,18 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.' '.''; - echo ''.$_tip.''; - echo '' .$_oblika. ''; + + echo ''.' '.''; + echo ''.$_tip.''; + echo '' .$_oblika. ''; } + #veljavno - echo ''.(int)$_desc['validCnt'].''; + echo ''.(int)$_desc['validCnt'].''; #ustrezno - echo ''.(int)$_desc['allCnt'].''; - echo ''; + echo ''.(int)$_desc['allCnt'].''; + echo ''; if ( isset($_desc['avg']) && (int)$objectSkala->getSkala() !== 1 ) { @@ -777,17 +784,17 @@ class SurveyAnalysis { echo self::formatNumber($_desc['avg']*100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),' %'); } echo ''; - echo ''; + echo ''; if (isset($_desc['div']) && (int)$objectSkala->getSkala() !== 1) { echo self::formatNumber($_desc['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); } echo ''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; echo ''; - } + /** Izriše vrstico z opisnimi * * @param unknown_type $spremenljivka @@ -795,7 +802,9 @@ class SurveyAnalysis { */ static function displayDescriptivesSpremenljivkaRow($spid,$spremenljivka,$show_enota,$_sequence = null) { global $lang; + $cssBack = " anl_bck_desc_1"; + if ($_sequence != null) { $_desc = self::$_DESCRIPTIVES[$_sequence]; } @@ -803,15 +812,20 @@ class SurveyAnalysis { # pokličemo objekt SpremenljivkaSkala $objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']); - echo ''; - echo ''; + + echo ''; + + echo ''; self::showIcons($spid,$spremenljivka,'desc'); echo ''; - echo ''; + + echo ''; self::showVariable($spid,$spremenljivka['variable']); echo ''; - echo ''; + + echo ''; echo ($spremenljivka['naslov']) . ''; + if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -820,100 +834,111 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''. - self::getSpremenljivkaLegenda($spremenljivka,'tip') - .''; - echo ''.(!$show_enota ? $_tip : ' ').''; - echo ''.(!$show_enota ? $_oblika : ' '). ''; + echo ''.self::getSpremenljivkaLegenda($spremenljivka,'tip').''; + echo ''.(!$show_enota ? $_tip : ' ').''; + echo ''.(!$show_enota ? $_oblika : ' '). ''; } - #veljavno - echo ''.(!$show_enota ? (int)$_desc['validCnt'] : ' ') .''; - #ustrezno - echo ''.(!$show_enota ? (int)$_desc['allCnt'] : ' ').''; - echo ''; + #veljavno + echo ''.(!$show_enota ? (int)$_desc['validCnt'] : ' ') .''; + + #ustrezno + echo ''.(!$show_enota ? (int)$_desc['allCnt'] : ' ').''; + + echo ''; if (isset($_desc['avg']) && (int)$objectSkala->getSkala() !== 1) { echo self::formatNumber($_desc['avg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); } echo ''; - echo ''; + + echo ''; if (isset($_desc['div']) && (int)$objectSkala->getSkala() !== 1) { echo self::formatNumber($_desc['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); } echo ''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; + + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; + + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; echo ''; - } + /** Izrišemo fekvence * */ static function displayFrequency($_spid = null) { global $site_path, $lang; + # preberemo header if (self::$headFileName !== null ) { + #preberemo HEADERS iz datoteke self::$_HEADERS = unserialize(file_get_contents(self::$headFileName)); - # odstranimo sistemske variable tipa email, ime, priimek, geslo - self::removeSystemVariables(); - - # polovimo frekvence - self::getFrequencys(); - $vars_count = count(self::$_FILTRED_VARIABLES); - $line_break = ''; - foreach (self::$_HEADERS AS $spid => $spremenljivka) { - # preverjamo ali je meta - if (($spremenljivka['tip'] != 'm' - && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES )) - && (!isset($_spid) || (isset($_spid) && $_spid == $spid))) { - # ali imamo sfiltrirano spremenljivko - if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) { - # prikazujemo v odvisnosti od kategorije spremenljivke - switch ($spremenljivka['tip']) { - case 1: # radio - prikjaže navpično - case 2: #checkbox če je dihotomna: - case 3: # dropdown - prikjaže navpično - case 6: # multigrid - case 4: # text - case 7:# variabla tipa »število« - case 8: # datum - case 16: #multicheckbox če je dihotomna: - case 17: #razvrščanje če je ordinalna - case 18: # vsota - case 19: # multitext - case 20: # multi number - case 21: # besedilo* - case 22: # kalkulacija - case 25: # kvota - case 26: # lokacija - self::frequencyVertical($spid); - break; - case 5: - # nagovor - self::sumNagovor($spid,'freq'); - break; - - } + # odstranimo sistemske variable tipa email, ime, priimek, geslo + self::removeSystemVariables(); + + # polovimo frekvence + self::getFrequencys(); - } + $vars_count = count(self::$_FILTRED_VARIABLES); + $line_break = ''; + + foreach (self::$_HEADERS AS $spid => $spremenljivka) { - } // end if $spremenljivka['tip'] != 'm' - } // end foreach self::$_HEADERS + # preverjamo ali je meta + if (($spremenljivka['tip'] != 'm' + && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES )) + && (!isset($_spid) || (isset($_spid) && $_spid == $spid))) { - // Izrisemo ikone na dnu - if ( (!isset($_spid) || $_spid == null) && (count(self::$_LOOPS) == 0 || self::$_CURRENT_LOOP['cnt'] == count(self::$_LOOPS)) && ($_GET['m'] != 'analysis_creport') ) - self::displayBottomSettings('freq'); + # ali imamo sfiltrirano spremenljivko + if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) { + + # prikazujemo v odvisnosti od kategorije spremenljivke + switch ($spremenljivka['tip']) { + + case 1: # radio - prikjaže navpično + case 2: #checkbox če je dihotomna: + case 3: # dropdown - prikjaže navpično + case 6: # multigrid + case 4: # text + case 7:# variabla tipa »število« + case 8: # datum + case 16: #multicheckbox če je dihotomna: + case 17: #razvrščanje če je ordinalna + case 18: # vsota + case 19: # multitext + case 20: # multi number + case 21: # besedilo* + case 22: # kalkulacija + case 25: # kvota + case 26: # lokacija + self::frequencyVertical($spid); + break; + + case 5: + # nagovor + self::sumNagovor($spid,'freq'); + break; + } + } + + } // end if $spremenljivka['tip'] != 'm' + + } // end foreach self::$_HEADERS + + // Izrisemo ikone na dnu + if ( (!isset($_spid) || $_spid == null) && (count(self::$_LOOPS) == 0 || self::$_CURRENT_LOOP['cnt'] == count(self::$_LOOPS)) && ($_GET['m'] != 'analysis_creport') ) + self::displayBottomSettings('freq'); } // end if else ($_headFileName == null) } - /** Izriše frekvence v vertikalni obliki - * - * @param unknown_type $spid - */ + /** Izriše frekvence v vertikalni obliki + * + * @param unknown_type $spid + */ static function frequencyVertical($spid) { global $lang; @@ -972,18 +997,23 @@ class SurveyAnalysis { # koliko zapisov prikažemo naenkrat $num_show_records = self::getNumRecords(); echo '
    '; - self::displaySpremenljivkaIcons($spid); + + self::displaySpremenljivkaIcons($spid); + # tekst vprašanja - echo ''; + echo '
    '; + # naslovna vrstica - echo ''; + echo ''; + #variabla - echo ''; + #odgovori - echo ''; + echo ''; - echo ''; + + + echo ''; + #variabla - echo ''; - #odgovori - echo ''; + #odgovori + echo ''; + if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; // konec naslovne vrstice - // zeleno vrstico prikažemo samo skupaj z legendo - if (self::$_SHOW_LEGENDA && $inline_legenda && in_array($spremenljivka['tip'],array(1,4,8)) ) { - $css_bck = 'anl_bck_0_0 '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + // zeleno vrstico prikažemo samo skupaj z legendo + if (self::$_SHOW_LEGENDA && $inline_legenda && in_array($spremenljivka['tip'], array(1,4,8)) ) { + + echo ''; + + echo ''; + echo ''; + + echo ''; + echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; } + + $_answersOther = array(); # dodamo opcijo kje izrisujemo legendo - $options=array('inline_legenda' => $inline_legenda, 'isTextAnswer' => false, 'isOtherAnswer' => false, 'num_show_records' => $num_show_records); + $options = array( + 'inline_legenda' => $inline_legenda, + 'isTextAnswer' => false, + 'isOtherAnswer' => false, + 'num_show_records' => $num_show_records + ); # izpišemo vlejavne odgovore $_current_grid = null; - if (count($spremenljivka['grids']) > 0) + if (count($spremenljivka['grids']) > 0){ + foreach ($spremenljivka['grids'] AS $gid => $grid) { - $_variables_count = count($grid['variables']); - - # indikator da smo na prvi variabli - $first_variable = true; - - # dodamo še kontrolo za prikaz mgridov in mcheckov za več kot 20 vrednosti - if ((!is_array($gidsCanShow) && !isset($gidsCanShow[$gid])) - || (is_array($gidsCanShow) && isset($gidsCanShow[$gid]) && $gidsCanShow[$gid]== true)) - # dodamo dodatne vrstice z albelami grida - if ($_variables_count > 0 ) - foreach ($grid['variables'] AS $vid => $variable ){ - $_sequence = $variable['sequence']; # id kolone z podatki - $only_valid += (int)self::$_FREQUENCYS[$_sequence]['validCnt']; + $_variables_count = count($grid['variables']); + + # indikator da smo na prvi variabli + $first_variable = true; + + # dodamo še kontrolo za prikaz mgridov in mcheckov za več kot 20 vrednosti + if ((!is_array($gidsCanShow) && !isset($gidsCanShow[$gid])) + || (is_array($gidsCanShow) && isset($gidsCanShow[$gid]) && $gidsCanShow[$gid]== true)){ - if (($variable['text'] != true && $variable['other'] != true) - || (in_array($spremenljivka['tip'],array(4,8,21,22,25,26,27)))){ - # dodamo ime podvariable - //if ($_variables_count > 1 && in_array($spremenljivka['tip'],array(2,6,7,16,17,18,19,20,21))) { - if ($inline_legenda) { - # ali rišemo dvojno črto med grupami - if ( $_current_grid != $gid && $_current_grid !== null && $spremenljivka['tip'] != 6&& $spremenljivka['tip'] != 16) { - $options['doubleTop'] = true; - } else { - $options['doubleTop'] = false; - } - if ($first_variable == true && $spremenljivka['tip'] == 16) { - if ($_current_grid !== null) { - $options['doubleTop'] = true; - } - self::outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$options); - $options['doubleTop'] = false; - } - $_current_grid = $gid; - self::outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$options); - } - $counter = 0; - $_kumulativa = 0; - - - #po potrebi posortiramo podatke - if ($spremenljivka['tip'] == 7 && is_array(self::$_FREQUENCYS[$_sequence]['valid'])) { - ksort(self::$_FREQUENCYS[$_sequence]['valid']); - } - //self::$_FREQUENCYS[$_sequence] - if (count(self::$_FREQUENCYS[$_sequence]['valid'])> 0 ) { - # tekstovne odgovore posortiramo kronološko - if ($spremenljivka['tip'] == 21 || $spremenljivka['tip'] == 4) { - $_valid_answers = self :: sortTextValidAnswers($spid,$variable,self::$_FREQUENCYS[$_sequence]['valid']); - } else { - $_valid_answers = self::$_FREQUENCYS[$_sequence]['valid']; - } - foreach ($_valid_answers AS $vkey => $vAnswer) { - if ($counter < $num_show_records) { - if ($vAnswer['cnt'] > 0 || true) { # izpisujemo samo tiste ki nisno 0 - if (in_array($spremenljivka['tip'],array(4,7,8,19,20,21,26,27))) { // text, number, datum, mtext, mnumber, text*, lokacija,heatmap - $options['isTextAnswer'] = true; - } else { - $options['isTextAnswer'] = false; - } - $counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,$options); - } - } - } - # izpišemo sumo veljavnih - $counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options); - } - if (count(self::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) { - foreach (self::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) { - if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0 - $counter = self::outputInvalidAnswerVertical($counter,$ikey,$iAnswer,$_sequence,$spid,$options); - } - } - # izpišemo sumo veljavnih - $counter = self::outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$options); - } - #izpišemo še skupno sumo - $counter = self::outputSumaVertical($counter,$_sequence,$spid,$options); - } else { - $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); - } - $first_variable = false; - } - } + # dodamo dodatne vrstice z albelami grida + if ($_variables_count > 0 ){ + foreach ($grid['variables'] AS $vid => $variable ){ + + $_sequence = $variable['sequence']; # id kolone z podatki + $only_valid += (int)self::$_FREQUENCYS[$_sequence]['validCnt']; + + if (($variable['text'] != true && $variable['other'] != true) + || (in_array($spremenljivka['tip'],array(4,8,21,22,25,26,27)))){ + + # dodamo ime podvariable + if ($inline_legenda) { + + # ali rišemo dvojno črto med grupami + if ( $_current_grid != $gid && $_current_grid !== null && $spremenljivka['tip'] != 6&& $spremenljivka['tip'] != 16) { + $options['doubleTop'] = true; + } + else { + $options['doubleTop'] = false; + } + + if ($first_variable == true && $spremenljivka['tip'] == 16) { + if ($_current_grid !== null) { + $options['doubleTop'] = true; + } + + self::outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$options); + $options['doubleTop'] = false; + } + + $_current_grid = $gid; + self::outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$options); + } + + $counter = 0; + $_kumulativa = 0; + + + # po potrebi posortiramo podatke + if ($spremenljivka['tip'] == 7 && is_array(self::$_FREQUENCYS[$_sequence]['valid'])) { + ksort(self::$_FREQUENCYS[$_sequence]['valid']); + } + + if (count(self::$_FREQUENCYS[$_sequence]['valid'])> 0 ) { + # tekstovne odgovore posortiramo kronološko + if ($spremenljivka['tip'] == 21 || $spremenljivka['tip'] == 4) { + $_valid_answers = self :: sortTextValidAnswers($spid,$variable,self::$_FREQUENCYS[$_sequence]['valid']); + } + else { + $_valid_answers = self::$_FREQUENCYS[$_sequence]['valid']; + } + + foreach ($_valid_answers AS $vkey => $vAnswer) { + if ($counter < $num_show_records) { + if ($vAnswer['cnt'] > 0 || true) { # izpisujemo samo tiste ki nisno 0 + if (in_array($spremenljivka['tip'],array(4,7,8,19,20,21,26,27))) { // text, number, datum, mtext, mnumber, text*, lokacija,heatmap + $options['isTextAnswer'] = true; + } else { + $options['isTextAnswer'] = false; + } + $counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,$options); + } + } + } + + # izpišemo sumo veljavnih + $counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options); + } + if (count(self::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) { + foreach (self::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) { + if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0 + $counter = self::outputInvalidAnswerVertical($counter,$ikey,$iAnswer,$_sequence,$spid,$options); + } + } + # izpišemo sumo veljavnih + $counter = self::outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$options); + } + #izpišemo še skupno sumo + $counter = self::outputSumaVertical($counter,$_sequence,$spid,$options); + } + else { + $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); + } + + $first_variable = false; + } + } + } + } + } echo '
    '; + echo ''; self::showVariable($spid,$spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; if($spremenljivka['tip'] == 2){ echo ' ('.$lang['srv_info_checkbox'].')'; } @@ -1002,137 +1032,173 @@ class SurveyAnalysis { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo'
    '; + echo ''; self::showIcons($spid,$spremenljivka,'freq'); echo ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .'
     '.$_tip.''.$_oblika.'  
      '.$_tip.''.$_oblika.'      
    '; @@ -1145,73 +1211,85 @@ class SurveyAnalysis { } } echo '
    '; - echo '
    '; } static function outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$_options = array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor 'isOtherAnswer' => false, # ali je odgovor Drugo 'inline_legenda' => true, # ali je legenda inline ali v headerju 'doubleTop' =>false, # ali imamo novo grupa in nardimo dvojni rob ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - $css_bck = 'anl_bck_freq_2 '; - echo ''; - echo ''; + echo ''; + + echo ''; echo $grid['variable']; - #echo $variable['variable']; echo ''; - echo ''; - // echo $grid['naslov'] . ' - ' .$variable['naslov']; + + echo ''; echo $grid['naslov']; - #echo $variable['naslov']; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - if ($variable['other'] != '1' && $variable['text'] != '1') { + + if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.$_tip.''; - echo ''.$_oblika.''; + + echo ''.$_tip.''; + echo ''.$_oblika.''; } - echo ' '; - echo ' '; + + echo ' '; + echo ' '; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ' '; + echo ' '; } - echo ' '; + echo ' '; + echo ''; } + static function outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$_options = array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor 'isOtherAnswer' => false, # ali je odgovor Drugo 'inline_legenda' => true, # ali je legenda inline ali v headerju 'doubleTop' =>false, # ali imamo novo grupa in nardimo dvojni rob ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - $css_bck = 'anl_bck_freq_2 '; - echo ''; - echo ''; + + echo ''; + + echo ''; echo $variable['variable']; echo ''; - echo ''; - // echo $grid['naslov'] . ' - ' .$variable['naslov']; + + echo ''; echo $variable['naslov']; echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : ''; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -1220,15 +1298,17 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.$_tip.''; - echo ''.$_oblika.''; + echo ''.$_tip.''; + echo ''.$_oblika.''; } - echo ' '; - echo ' '; + + echo ' '; + echo ' '; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ' '; + echo ' '; } - echo ' '; + echo ' '; + echo ''; } @@ -1266,21 +1346,22 @@ class SurveyAnalysis { */ static function displaySums($_spid = null) { global $site_path; - # preberemo header + + # preberemo header if (self::$headFileName === null ) { // die ('
    NAPAKA!!! Manjkajo datoteke s podatki. Kreiraj datoteke s podatki!
    '); - } else { + } + else { #preberemo HEADERS iz datoteke if (self::$headFileName == null) { echo "
    Napaka"; die(); } + self::$_HEADERS = unserialize(file_get_contents(self::$headFileName)); # odstranimo sistemske variable tipa email, ime, priimek, geslo self::removeSystemVariables(); - #print_r("
    ");
    -		#print_r(self::$_HEADERS);
    -		#print_r("
    "); + # polovimo frekvence self::getFrequencys(); $vars_count = count(self::$_FILTRED_VARIABLES); @@ -1300,7 +1381,6 @@ class SurveyAnalysis { if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) { echo $line_break; - #print_r($spremenljivka['tip']); # prikazujemo v odvisnosti od kategorije spremenljivke switch ($spremenljivka['tip']) { @@ -1580,16 +1660,19 @@ class SurveyAnalysis { } # tekst vprašanja - echo ''; + echo '
    '; + # naslovna vrstica - echo ''; - #variabla - echo ''; + + # variabla + echo ''; + #odgovori $show_valid_percent = (self::$_HEADERS[$spid]['show_valid_percent'] == true) ? 1 : 0; - echo ''; - echo ''; - echo ''; - #variabla - echo ''; + + + echo ''; + + # variabla + echo ''; - #odgovori - echo ''; + # odgovori + echo ''; if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; // konec naslovne vrstice - // zeleno vrstico prikažemo samo skupaj z legendo - if (self::$_SHOW_LEGENDA && false) { - $css_bck = 'anl_bck_0_0 '; - echo ''; - echo ''; - echo ''; - if ($variable['other'] != '1' && $variable['text'] != '1') { - $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); - $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { - $_tip = $lang['srv_analiza_vrsta_bese']; - $_oblika = $lang['srv_analiza_oblika_nomi']; - } - echo ''; - echo ''; - echo ''; - echo ''; - if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; - } - echo ''; - echo ''; - } $_answersOther = array(); $sum_xi_fi=0; $N = 0; - + $_tmp_for_div = array(); + # izpišemo vlejavne odgovore - if (count($spremenljivka['grids']) > 0) + if (count($spremenljivka['grids']) > 0){ + foreach ($spremenljivka['grids'] AS $gid => $grid) { - # dodamo dodatne vrstice z albelami grida - if (count($grid['variables']) > 0 ) - foreach ($grid['variables'] AS $vid => $variable ){ - $_sequence = $variable['sequence']; # id kolone z podatki - if ($variable['text'] != true && $variable['other'] != true) { - $counter = 0; - $_kumulativa = 0; - //self::$_FREQUENCYS[$_sequence] - if (count(self::$_FREQUENCYS[$_sequence]['valid'])> 0 ) { - foreach (self::$_FREQUENCYS[$_sequence]['valid'] AS $vkey => $vAnswer) { - // za povprečje - $xi = (int)$vkey; - $fi = (int)$vAnswer['cnt']; + + # dodamo dodatne vrstice z albelami grida + if (count($grid['variables']) > 0 ){ - $sum_xi_fi += $xi * $fi; - $N += $fi; - - if ($counter < $num_show_records) { - if ($vAnswer['cnt'] > 0 || true) { # izpisujemo samo tiste ki nisno 0 - $counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,$options); - } - } - # za poznejše računannje odklona - $_tmp_for_div[] = array('xi'=>$xi, 'fi'=>$fi, 'sequence'=>$_sequence); - } - # izpišemo sumo veljavnih - $counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options); + foreach ($grid['variables'] AS $vid => $variable ){ - } - if (count(self::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) { - foreach (self::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) { - if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0 - $counter = self::outputInvalidAnswerVertical($counter,$ikey,$iAnswer,$_sequence,$spid,$options); - } - } - # izpišemo sumo veljavnih - $counter = self::outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$options); - } - #izpišemo še skupno sumo - $counter = self::outputSumaVertical($counter,$_sequence,$spid,$options); - } else { - $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); - } - } - } + $_sequence = $variable['sequence']; # id kolone z podatki + + if ($variable['text'] != true && $variable['other'] != true) { + $counter = 0; + $_kumulativa = 0; + + if (count(self::$_FREQUENCYS[$_sequence]['valid'])> 0 ) { + foreach (self::$_FREQUENCYS[$_sequence]['valid'] AS $vkey => $vAnswer) { + // za povprečje + $xi = (int)$vkey; + $fi = (int)$vAnswer['cnt']; + + $sum_xi_fi += $xi * $fi; + $N += $fi; + + if ($counter < $num_show_records) { + if ($vAnswer['cnt'] > 0 || true) { # izpisujemo samo tiste ki nisno 0 + $counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,$options); + } + } + # za poznejše računannje odklona + $_tmp_for_div[] = array('xi'=>$xi, 'fi'=>$fi, 'sequence'=>$_sequence); + } + # izpišemo sumo veljavnih + $counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options); + + } + + if (count(self::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) { + foreach (self::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) { + if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0 + $counter = self::outputInvalidAnswerVertical($counter,$ikey,$iAnswer,$_sequence,$spid,$options); + } + } + # izpišemo sumo veljavnih + $counter = self::outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$options); + } + + #izpišemo še skupno sumo + $counter = self::outputSumaVertical($counter,$_sequence,$spid,$options); + } + else { + $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); + } + } + } + } + } # odklon $avg = ($N > 0) ? $sum_xi_fi / $N : 0; + #standardna diviacija $div = 0; $sum_pow_xi_fi_avg = 0; @@ -1717,23 +1793,30 @@ class SurveyAnalysis { $sum_pow_xi_fi_avg += pow(($xi - $avg),2) * $fi; } + $div = (($N -1) > 0) ? sqrt($sum_pow_xi_fi_avg / ($N -1)) : 0; # izpišemo še odklon in povprečje if ($show_valid_percent == 1 && self::$_HEADERS[$spid]['skala'] != 1) { - $css_bck = 'anl_bck'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + echo ''; + echo ''; echo ''; + + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; } + echo '
    '; + echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { @@ -1605,109 +1688,102 @@ class SurveyAnalysis { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .'
     '.$_tip.''.$_oblika.'    
     
     '.$lang['srv_analiza_opisne_povprecje'].''. self::formatNumber($avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').''.$lang['srv_analiza_opisne_odklon'].''.self::formatNumber($div,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').'
     
    '.$lang['srv_analiza_opisne_povprecje'].''. self::formatNumber($avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').''.$lang['srv_analiza_opisne_odklon'].''.self::formatNumber($div,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').'
    '; + + # izpišemo še tekstovne odgovore za polja drugo if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) { foreach ($_answersOther AS $oAnswers) { @@ -1744,7 +1827,6 @@ class SurveyAnalysis { } if (self :: $show_spid_div == true) { echo '
    '; - echo '
    '; } } @@ -1804,85 +1886,108 @@ class SurveyAnalysis { # odgovori echo '
    '; - echo ''; - echo ''; - echo '
    '; + + echo ''; + + + echo ''; + + echo ''; - echo ''; + + // Preklop navedbe/enote + self::showEnoteNavedbe($spid, $status='1'); + + echo ''; + echo ''; - echo ''; - echo ''; + + echo ''; - echo ''; + if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; + + echo ''; + echo ''; + echo ''; - $bck_css = ' anl_bck_0_0'; - $_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables']; - echo ''; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA) { + $_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables']; + + echo ''; + + echo ''; + + echo ''; + + if (self::$_SHOW_LEGENDA) { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - echo ''; //'.$_tip.' - echo ''; // '.$_oblika.' + echo ''; //'.$_tip.' + echo ''; // '.$_oblika.' } + if (count($_variables) > 0) { foreach ($_variables AS $vkey => $variable) { if ($variable['other'] != true) { - echo ''; + echo ''; } } } - //echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + + + # vodoravna vrstice s podatki foreach (self::$_HEADERS[$spid]['grids'] AS $gid => $grids) { if ($gidsCanShow[$gid]) { $_cnt = 0; - # vodoravna vrstice s podatki - $css_back = ' anl_bck_desc_2'; - echo ''; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA) { + + + echo ''; + + echo ''; + echo ''; + + if (self::$_SHOW_LEGENDA) { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - echo ''; - echo ''; + echo ''; + echo ''; } $_arguments = 0; $_max_appropriate = 0; $_max_cnt = 0; + // prikaz frekvenc if (count($grids['variables']) > 0) foreach ($grids['variables'] AS $vkey => $variable) { @@ -1899,110 +2004,131 @@ class SurveyAnalysis { } if ($variable['other'] != true) { - echo ''; } } + # veljavno - echo ''; - #ustrezno - echo ''; + echo ''; + + # ustrezno + echo ''; echo ''; } } + echo ''; + echo ''; + # navedbe echo '
    '; - echo ''; - echo ''; - echo '
    '; + + echo ''; + + echo ''; + + echo ''; - echo ''; + + // Preklop navedbe/enote + self::showEnoteNavedbe($spid, $status='2'); + + echo ''; + echo ''; - echo ''; - echo ''; + + echo ''; - echo ''; - if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; - } - echo ''; + if (self::$_SHOW_LEGENDA) { + echo ''; + echo ''; + } + + echo ''; + echo ''; - $bck_css = ' anl_bck_0_0'; - $_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables']; - echo ''; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA) { + + $_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables']; + + echo ''; + + echo ''; + echo ''; + if (self::$_SHOW_LEGENDA) { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - echo ''; //'.$_tip.' - echo ''; // '.$_oblika.' + echo ''; //'.$_tip.' + echo ''; // '.$_oblika.' } foreach ($_variables AS $vkey => $variable) { if ($variable['other'] != true) { - echo ''; + echo ''; } } - echo ''; + echo ''; + echo ''; + + + # vodoravna vrstice s podatki foreach (self::$_HEADERS[$spid]['grids'] AS $gid => $grids) { $_cnt = 0; - # vodoravna vrstice s podatki - $css_back = ' anl_bck_desc_2'; + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; if (self::$_SHOW_LEGENDA) { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - echo ''; - echo ''; + echo ''; + echo ''; } $_arguments = 0; $_max_appropriate = 0; $_max_cnt = 0; + // prikaz frekvenc foreach ($grids['variables'] AS $vkey => $variable) { $_sequence = $variable['sequence']; @@ -2021,46 +2147,58 @@ class SurveyAnalysis { $_percent = ($_valid > 0 ) ? $_cnt * 100 / $_valid : 0; } } + foreach ($grids['variables'] AS $vkey => $variable) { if ($variable['other'] != true) { $_sequence = $variable['sequence']; $_cnt = self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']; - echo ''; } } - echo ''; + echo ''; } + echo ''; echo ''; + # izpišemo še tekstovne odgovore za polja drugo if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) { foreach ($_answersOther AS $oAnswers) { @@ -2071,7 +2209,6 @@ class SurveyAnalysis { } if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -2081,6 +2218,7 @@ class SurveyAnalysis { */ static function sumHorizontalCheckbox($spid,$_from) { global $lang; + $spremenljivka = self::$_HEADERS[$spid]; # preverimo ali prikazujemo spremenljivko, glede na veljavne odgovore in nastavitev @@ -2121,102 +2259,125 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); # tekst vprašanja - echo ''; - echo ''; - echo '
    '; + echo ''; + + echo ''; + + echo ''; - echo ''; + echo ''; - echo ''; - echo ''; + + echo ''; + if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + + echo ''; + echo ''; + + echo ''; + - $bck_css = ' anl_bck_desc_2'; $_variables = self::$_HEADERS[$spid]['grids'][$gid]['variables']; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA) { + echo ''; + + echo ''; + + if (self::$_SHOW_LEGENDA) { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - echo ''; - echo ''; + echo ''; + echo ''; } foreach ($_variables AS $vkey => $variable) { if ($variable['other'] != true) { - echo ''; + echo ''; } } - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + + # vodoravna vrstice s podatki echo ''; - echo ''; - // prikaz frekvenc + + echo ''; + + // prikaz frekvenc foreach ($_variables AS $vkey => $variable) { if ($variable['other'] != true) { $_sequence = $variable['sequence']; $cnt = self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']; - echo ''; + echo ''; } } - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + // dodamo še veljavne procente echo ''; - echo ''; - foreach ($_variables AS $vkey => $variable) { + + echo ''; + + foreach ($_variables AS $vkey => $variable) { if ($variable['other'] != true) { $_sequence = $variable['sequence']; $cnt = self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']; $percent = ( $_valid_cnt > 0) ? 100*$cnt / $_valid_cnt : 0; - echo ''; + echo ''; } } - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; // dodamo še procente - echo ''; - echo ''; + echo ''; + echo ''; foreach ($_variables AS $vkey => $variable) { if ($variable['other'] != true) { $_sequence = $variable['sequence']; $cnt = self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']; $percent = ( $_approp_cnt > 0) ? 100*$cnt / $_approp_cnt : 0; - echo ''; + echo ''; } } - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''; + + echo ''; echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + + + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_answers']; - echo ' (/ %)'; - echo ' (/ %)'; - echo ' (f / %)'; - echo ''.$lang['srv_analiza_opisne_valid'].''.$lang['srv_analiza_num_units'].'
    '; + echo $lang['srv_analiza_opisne_answers']; + self::showFreqPercent($spid); + echo ''.$lang['srv_analiza_opisne_valid'].''.$lang['srv_analiza_num_units'].'
     
    '.$_tip.''.$_oblika.''.$_tip.''.$_oblika.'' . $variable['naslov'] . '' . $variable['naslov'] . '  
    '.$lang['srv_analiza_frekvence_titleFrekvenca'].''.$lang['srv_analiza_frekvence_titleFrekvenca'].''.$cnt.''.$cnt.''.$_valid_cnt.''.$_approp_cnt.''.$_valid_cnt.''.$_approp_cnt.'
    '.$lang['srv_analiza_frekvence_titleOdstotekVeljavni'].''.$lang['srv_analiza_frekvence_titleOdstotekVeljavni'].''.self::formatNumber($percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').''.self::formatNumber($percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'  
    '.$lang['srv_analiza_frekvence_titleOdstotekEnote'].'
    '.$lang['srv_analiza_frekvence_titleOdstotekEnote'].''.self::formatNumber($percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').''.self::formatNumber($percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'  
    '; + # izpišemo še tekstovne odgovore za polja drugo if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) { foreach ($_answersOther AS $oAnswers) { @@ -2225,9 +2386,9 @@ class SurveyAnalysis { echo ''; } } + if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -2292,218 +2453,261 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); echo '
    '; - echo ''; - echo ''; - echo '
    '; + + echo ''; + + echo ''; + + echo ''; - echo ''; - echo ''; - $css_txt = 'anl_variabla_line'; - echo ''; - echo ''; + + echo ''; + + + echo ''; + + echo ''; - echo ''; - if (self::$_SHOW_LEGENDA && $inline_legenda) { - echo ''; - echo ''; - } - echo ''; - echo ''; - echo ''; + echo ''; - echo ''; - if ($veljavni_percent) { - echo ''; + if (self::$_SHOW_LEGENDA && $inline_legenda) { + echo ''; + echo ''; } + + echo ''; + echo ''; + echo ''; + echo ''; + if ($veljavni_percent) { + echo ''; + } + echo ''; - $cssBack = "anl_bck anl_variabla_line "; - + $_max_valid = 0; $_max_appropriate = 0; - if (count ($spremenljivka['grids']) > 0) + if (count ($spremenljivka['grids']) > 0){ + foreach ($spremenljivka['grids'] as $gid => $grid) { - $_max_valid = 0; - $_max_appropriate = 0; - if (count ($grid['variables']) > 0) - foreach ($grid['variables'] AS $vid => $variable) { - $_sequence = $variable['sequence']; - #po potrebi prikažemo samo tiste ki imajo vrednosti - if (($all_categories_cnt <= AUTO_HIDE_ZERRO_VALUE) || (int)self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt'] > 0 ) - if ($variable['other'] != 1) { - - - # dodamo labele podvprašanja - if ($spremenljivka['tip'] == 16 && (($vid == 0 && $gid != 0) || ($vid == 0 && $gid == 0))) { - $cssBack = "anl_bck_desc_2 ".($vid == 0 && $gid != 0 ? 'anl_double_bt ' : ''); - echo ''; - echo ''; - echo ''; - echo ''; - } - $cssBack = "anl_bck_desc_2 "; - echo ''; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA && $inline_legenda) { - echo ''; - echo ''; - } - echo ''; - - $_max_appropriate = max($_max_appropriate, (int)self::$_FREQUENCYS[$_sequence]['allCnt']); - $_max_valid = max ($_max_valid, ((int)(self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']+(int)self::$_FREQUENCYS[$_sequence]['valid']['0']['cnt']))); - - # veljavno - echo ''; - echo ''; - #ustrezno - echo ''; - # veljavno % - if ($veljavni_percent) { + $_max_valid = 0; + $_max_appropriate = 0; - $valid = (int)(self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']+(int)self::$_FREQUENCYS[$_sequence]['valid']['0']['cnt']); - $valid = (int)self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']; - $_percent = ($_max_appropriate > 0 ) ? 100*$valid / $_max_appropriate : 0; - - echo ''; - } - echo ''; + if (count ($grid['variables']) > 0){ - } else { - # drugo - } - } - $cssBack = " anl_bck_2 red"; - echo ''; - echo ''; - echo ''; - echo ''; //.$_approp_cnt[$gid]. - echo ''; - echo ''; //.self::formatNumber('100',SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%') + foreach ($grid['variables'] AS $vid => $variable) { + $_sequence = $variable['sequence']; - - echo ''; //$lang['srv_anl_suma_entries'] - if ($veljavni_percent) { - $_percent = ($_max_appropriate > 0 ) ? 100*$_max_valid / $_max_appropriate : 0; - echo ''; - } - echo ''; - + #po potrebi prikažemo samo tiste ki imajo vrednosti + if (($all_categories_cnt <= AUTO_HIDE_ZERRO_VALUE) || (int)self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt'] > 0 ){ + if ($variable['other'] != 1) { + + # dodamo labele podvprašanja + if ($spremenljivka['tip'] == 16 && (($vid == 0 && $gid != 0) || ($vid == 0 && $gid == 0))) { + echo ''; + echo ''; + echo ''; + echo ''; + } + + echo ''; + echo ''; + echo ''; + if (self::$_SHOW_LEGENDA && $inline_legenda) { + echo ''; + echo ''; + } + echo ''; + + $_max_appropriate = max($_max_appropriate, (int)self::$_FREQUENCYS[$_sequence]['allCnt']); + $_max_valid = max ($_max_valid, ((int)(self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']+(int)self::$_FREQUENCYS[$_sequence]['valid']['0']['cnt']))); + + # veljavno + echo ''; + + echo ''; + + # ustrezno + echo ''; + + # veljavno % + if ($veljavni_percent) { + + $valid = (int)(self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']+(int)self::$_FREQUENCYS[$_sequence]['valid']['0']['cnt']); + $valid = (int)self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt']; + $_percent = ($_max_appropriate > 0 ) ? 100*$valid / $_max_appropriate : 0; + + echo ''; + } + echo ''; + + } + } + else { + # drugo + } + } + } + + + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; + if ($veljavni_percent) { + $_percent = ($_max_appropriate > 0 ) ? 100*$_max_valid / $_max_appropriate : 0; + echo ''; + } + echo ''; + } } echo ''; echo ''; // div_navedbe_1_'.$spid.' + # še navedbe echo '
    '; - echo ''; - echo ''; - echo '
    '; + + echo ''; + + echo ''; + + echo ''; - echo ''; + + // Preklop navedbe/enote + self::showEnoteNavedbe($spid, $status='2'); + + echo ''; + echo ''; - $css_txt = 'anl_variabla_line'; - echo ''; - echo ''; + + echo ''; - echo ''; + + echo ''; if (self::$_SHOW_LEGENDA && $inline_legenda) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + echo ''; + echo ''; echo ''; + echo ''; - $cssBack = "anl_bck anl_variabla_line "; - - if (count ($spremenljivka['grids']) > 0) - foreach ($spremenljivka['grids'] as $gid => $grid) { - if (count ($grid['variables']) > 0) - foreach ($grid['variables'] AS $vid => $variable) { - $_sequence = $variable['sequence']; - #po potrebi prikažemo samo tiste ki imajo vrednosti - if (($all_categories_cnt <= AUTO_HIDE_ZERRO_VALUE) || (int)self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt'] > 0 ) - if ($variable['other'] != 1) { - - # dodamo labele podvprašanja - if ($spremenljivka['tip'] == 16 && (($vid == 0 && $gid != 0) || ($vid == 0 && $gid == 0))) { - $cssBack = 'anl_bck_desc_2'.($vid == 0 && $gid != 0 ? ' anl_double_bt ' : ''); - echo ''; - echo ''; - echo ''; - echo ''; - } - $cssBack = "anl_bck_desc_2 "; - echo ''; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA && $inline_legenda) { - echo ''; - echo ''; - } - - echo ''; - echo ''; - echo ''; - } else { - # drugo - } + if (count ($spremenljivka['grids']) > 0){ + + foreach ($spremenljivka['grids'] as $gid => $grid) { + + if (count ($grid['variables']) > 0){ + + foreach ($grid['variables'] AS $vid => $variable) { + + $_sequence = $variable['sequence']; + + #po potrebi prikažemo samo tiste ki imajo vrednosti + if (($all_categories_cnt <= AUTO_HIDE_ZERRO_VALUE) || (int)self::$_FREQUENCYS[$_sequence]['valid']['1']['cnt'] > 0 ){ + if ($variable['other'] != 1) { + + # dodamo labele podvprašanja + if ($spremenljivka['tip'] == 16 && (($vid == 0 && $gid != 0) || ($vid == 0 && $gid == 0))) { + echo ''; + echo ''; + echo ''; + echo ''; + } + + echo ''; + + echo ''; + echo ''; + + if (self::$_SHOW_LEGENDA && $inline_legenda) { + echo ''; + echo ''; + } + + echo ''; + echo ''; + + echo ''; + } + } + else { + # drugo + } + } + } } - $cssBack = " anl_bck_2 red"; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - + + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; } + echo ''; + echo ''; // Konec div_navedbe_2_$spid + # izpišemo še tekstovne odgovore za polja drugo if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) { foreach ($_answersOther AS $oAnswers) { @@ -2512,9 +2716,9 @@ class SurveyAnalysis { echo ''; } } + if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -2544,9 +2748,7 @@ class SurveyAnalysis { return; } - #$_invalidAnswers = self :: getInvalidAnswers (MISSING_TYPE_FREQUENCY); $_invalidAnswers = self :: getInvalidAnswers (MISSING_TYPE_DESCRIPTOR); - #$_allMissing_answers = SurveyMissingValues::GetMissingValuesForSurvey(array(1,2,3)); # opcije nareedimo posebej, da po potrebi zajamemo tudi misinge $str_qry = "SELECT id, spr_id, REPLACE(REPLACE(REPLACE(naslov,'\n',' '),'\r','
    '),'|',' ') as naslov, variable, other, part, REPLACE(REPLACE(REPLACE(naslov_graf,'\n',' '),'\r','
    '),'|',' ') as naslov_graf, vrstni_red FROM srv_grid WHERE spr_id='".$spid."' ORDER BY vrstni_red"; @@ -2582,51 +2784,65 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); - echo ''; - echo ''; - echo ''; + echo ''; } //dodatne vrednosti (ne vem, zavrnil...) @@ -9178,7 +9073,7 @@ class SurveyChart { if (count($missing_values) > 0) { foreach ($missing_values AS $mv_key => $mv_text) { if (isset($already_set_mv[$mv_key])) { - echo ''; + echo ''; } } } @@ -9203,7 +9098,7 @@ class SurveyChart { echo '
  • '; - echo ' '; + echo ' '; echo '['.$row1['variable'].']'; if ($row1['other'] == 1) echo ' '; @@ -9397,16 +9292,16 @@ class SurveyChart { echo '
    '.$stevilcenje . $title.'
    '; # tekst vprašanja - echo '
  • '; + + echo ''; + + echo ''; + + echo ''; - echo ''; - echo ''; - $css_txt = 'anl_variabla_line'; - echo ''; - echo ''; + + + echo ''; + + echo ''; + if ($_sub_question_col) { - echo ''; + echo ''; } + if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; + + echo ''; + + echo ''; + echo ''; if ($additional_field) { - echo ''; - echo ''; + echo ''; + echo ''; } + echo ''; - $cssBack = "anl_bck_0_0 "; + $_variables = $grid['variables']; - echo ''; - echo ''; + + echo ''; + + echo ''; + if ( $_sub_question_col ) { - echo ''; + echo ''; } + if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -2635,8 +2851,8 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''; //$_tip - echo ''; // $_oblika + echo ''; //$_tip + echo ''; // $_oblika } //nastavitve iz baze za ureditev pravilnega izrisa analize za tabelo s trakom @@ -2644,150 +2860,185 @@ class SurveyAnalysis { $spremenljivkaParams = new enkaParameters($row['params']); $diferencial_trak = ($spremenljivkaParams->get('diferencial_trak') ? $spremenljivkaParams->get('diferencial_trak') : 0); $diferencial_trak_starting_num = ($spremenljivkaParams->get('diferencial_trak_starting_num') ? $spremenljivkaParams->get('diferencial_trak_starting_num') : 0); - //nastavitve iz baze za ureditev pravilnega izrisa analize za tabelo s trakom if (count($spremenljivka['options']) > 0) { foreach ( $spremenljivka['options'] as $key => $kategorija) { - if($diferencial_trak){ //ce je trak, je potrebno naslove stolpcev spremeniti v vrednosti na traku + + if($diferencial_trak){ //ce je trak, je potrebno naslove stolpcev spremeniti v vrednosti na traku $_label = $diferencial_trak_starting_num; $diferencial_trak_starting_num++; - }else{ + } + else{ // misinge imamo zdruzene $_label = $kategorija; } - echo ''; + echo ''; } } - echo ''; - echo ''; - echo ''; - if ($additional_field) { + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + if ($additional_field) { + echo ''; + echo ''; } + echo ''; $part=null; - #zlopamo skozi gride - if (count($spremenljivka['grids']) > 0) - foreach ($spremenljivka['grids'] AS $gid => $grid) { - - # za dvojne gride - if ((int)$grid['part'] > 0) { - if ($part == null || $part == $grid['part'] ) { - $part_css = ''; - } else { - $part_css = ' anl_double_bt '; - } - $part = $grid['part']; - } - else { - $part_css = ''; - } - - $cssBack = "anl_bck_desc_2 "; - # zloopamo skozi variable - if (count($grid['variables']) > 0) - foreach ($grid['variables'] AS $vid => $variable ) { - $_sequence = $variable['sequence']; - #popotrebi izpisujemo samo veljavne - if ((count($spremenljivka['grids']) <= AUTO_HIDE_ZERRO_VALUE || - (self::$_FREQUENCYS[$_sequence]['allCnt'] - self::$_FREQUENCYS[$_sequence]['invalidCnt']) > 0)) - if ($variable['other'] != true) { - echo ''; - if ($_sub_question_col) { - echo ''; - } else { - echo ''; - } - if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; - } - # za odklon in povprečje - $sum_xi_fi=0; - $N = 0; - $div=0; - if (count($spremenljivka['options']) > 0) { - foreach ( $spremenljivka['options'] as $key => $kategorija) { - if ($additional_field) { # za odklon in povprečje - $xi = $key; - $fi = self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt']; - $sum_xi_fi += $xi * $fi ; - $N += $fi; - } - echo ''; - - - } - } - // suma - echo ''; - // zamenjano veljavni ustrezni - echo ''; - echo ''; - if ($additional_field) { # za odklon in povprečje - # povprečje - $avg = ($N > 0) ? $sum_xi_fi / $N : 0; - #standardna diviacija - $div = 0; - $sum_pow_xi_fi_avg = 0; - if (count($spremenljivka['options']) > 0) { - foreach ( $spremenljivka['options'] as $xi => $kategorija) { - $fi = self::$_FREQUENCYS[$_sequence]['valid'][$xi]['cnt']; - $sum_pow_xi_fi_avg += pow(($xi - $avg),2) * $fi; - } - } - $div = (($N -1) > 0) ? sqrt($sum_pow_xi_fi_avg / ($N -1)) : 0; - echo ''; - echo ''; - } - echo ''; - - } else { - # immamo polje drugo - $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); - } - } + foreach ($spremenljivka['grids'] AS $gid => $grid) { + + # za dvojne gride + if ((int)$grid['part'] > 0) { + if ($part == null || $part == $grid['part'] ) { + $part_css = ''; + } else { + $part_css = ' anl_double_bt '; + } + $part = $grid['part']; + } + else { + $part_css = ''; + } + + + # zloopamo skozi variable + if (count($grid['variables']) > 0){ + + foreach ($grid['variables'] AS $vid => $variable ) { + + $_sequence = $variable['sequence']; + + #popotrebi izpisujemo samo veljavne + if ((count($spremenljivka['grids']) <= AUTO_HIDE_ZERRO_VALUE || + (self::$_FREQUENCYS[$_sequence]['allCnt'] - self::$_FREQUENCYS[$_sequence]['invalidCnt']) > 0)){ + + if ($variable['other'] != true) { + echo ''; + + if ($_sub_question_col) { + echo ''; + + echo ''; + } + else { + echo ''; + } + + if (self::$_SHOW_LEGENDA) { + echo ''; + echo ''; + } + + # za odklon in povprečje + $sum_xi_fi=0; + $N = 0; + $div=0; + if (count($spremenljivka['options']) > 0) { + + foreach ( $spremenljivka['options'] as $key => $kategorija) { + if ($additional_field) { # za odklon in povprečje + $xi = $key; + $fi = self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt']; + $sum_xi_fi += $xi * $fi ; + $N += $fi; + } + + echo ''; + } + } + + // suma + echo ''; + + // zamenjano veljavni ustrezni + echo ''; + + echo ''; + + if ($additional_field) { # za odklon in povprečje + + # povprečje + $avg = ($N > 0) ? $sum_xi_fi / $N : 0; + + #standardna diviacija + $div = 0; + $sum_pow_xi_fi_avg = 0; + + if (count($spremenljivka['options']) > 0) { + foreach ( $spremenljivka['options'] as $xi => $kategorija) { + $fi = self::$_FREQUENCYS[$_sequence]['valid'][$xi]['cnt']; + $sum_pow_xi_fi_avg += pow(($xi - $avg),2) * $fi; + } + } + + $div = (($N -1) > 0) ? sqrt($sum_pow_xi_fi_avg / ($N -1)) : 0; + + echo ''; + + echo ''; + } + + echo ''; + } + } + else { + # immamo polje drugo + $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); + } + } + } + } } + echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''; + + echo ''; echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_opisne_subquestion'].''.$lang['srv_analiza_opisne_subquestion'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_answers']; - echo ' (/ %)'; - echo ' (/ %)'; - echo ' (f / %)'; - echo ''.$lang['srv_analiza_opisne_valid'].''.$lang['srv_analiza_num_units'].''; + echo $lang['srv_analiza_opisne_answers']; + self::showFreqPercent($spid); + echo ''.$lang['srv_analiza_opisne_valid'].''.$lang['srv_analiza_num_units'].''.$lang['srv_analiza_opisne_povprecje'].''.$lang['srv_analiza_opisne_odklon'].''.$lang['srv_analiza_opisne_povprecje'].''.$lang['srv_analiza_opisne_odklon'].'
     
       '.$_label.''.$_label.''.$lang['srv_anl_suma1'].'  '.$lang['srv_anl_suma1'].'  
    '; - - echo $variable['variable']; - echo ''; - echo $variable['naslov']; + # zlopamo skozi gride + if (count($spremenljivka['grids']) > 0){ - // dodatek desne strani sem. diferenciala - echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : ''; - echo ' '.$_tip.''.$_oblika.''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    0 ? ' vkey="'.$key.'"' : '') - .' style="padding:5px 0px;">'.self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'].'
    '; - $_percent = (self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ) ? self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] * 100 / self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; - echo self::formatNumber($_percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); - echo '
    '; - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).'
    '.self::formatNumber(100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'
    '; - echo '
    '; - echo (int)self::$_FREQUENCYS[$_sequence]['validCnt']; - echo ''.(int)self::$_FREQUENCYS[$_sequence]['allCnt'].''; - echo self::formatNumber($avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - echo self::formatNumber($div,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); - echo '
    '; + echo $variable['variable']; + echo ''; + echo $variable['naslov']; + + // dodatek desne strani sem. diferenciala + echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : ''; + echo ''.$_tip.''.$_oblika.''; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    0 ? ' vkey="'.$key.'"' : '') + .'>'.self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'].'
    '; + $_percent = (self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ) ? self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] * 100 / self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; + echo self::formatNumber($_percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); + echo '
    '; + + echo '
    '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).'
    '.self::formatNumber(100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'
    '; + + echo '
    '; + echo (int)self::$_FREQUENCYS[$_sequence]['validCnt']; + echo ''.(int)self::$_FREQUENCYS[$_sequence]['allCnt'].''; + echo self::formatNumber($avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + echo self::formatNumber($div,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); + echo '
    '; # izpišemo še tekstovne odgovore za polja drugo @@ -2801,7 +3052,6 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -2842,111 +3092,137 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); - echo ''; - echo ''; - echo '
    '; + echo ''; + + echo ''; + + echo ''; - echo ''; - echo ''; - $css_txt = 'anl_variabla_line'; - echo ''; - echo ''; + + + echo ''; + + echo ''; + if ($_sub_question_col) { - echo ''; + echo ''; } + if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - #št. enot - echo ''; + + echo ''; + + # št. enot + echo ''; + echo ''; - #naslovi podskupin - $cssBack = "anl_bck_0_0 "; + + + # naslovi podskupin $_variables = $grid['variables']; - echo ''; - echo ''; + + echo ''; + + echo ''; + if ( $_sub_question_col ) { - echo ''; + echo ''; } + if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''; //$_tip - echo ''; // $_oblika + + echo ''; //$_tip + echo ''; // $_oblika } - echo ''; - echo ''; - #št. enot - echo ''; + + echo ''; + echo ''; + + #št. enot + echo ''; echo ''; + # naslovi variabel - $cssBack = "anl_bck_0_0 "; $_variables = $grid['variables']; - echo ''; - echo ''; + + echo ''; + + echo ''; + if ( $_sub_question_col ) { - echo ''; + echo ''; } + if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''; //$_tip - echo ''; // $_oblika - } - if (count($spremenljivka['options']) > 0) { - foreach ( $spremenljivka['options'] as $key => $kategorija) { - // misinge imamo zdruzene - $_label = $kategorija; - echo ''; - } - } - echo ''; - echo ''; - echo ''; + echo ''; //$_tip + echo ''; // $_oblika + } if (count($spremenljivka['options']) > 0) { foreach ( $spremenljivka['options'] as $key => $kategorija) { // misinge imamo zdruzene $_label = $kategorija; - echo ''; + echo ''; } } - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + + if (count($spremenljivka['options']) > 0) { + foreach ( $spremenljivka['options'] as $key => $kategorija) { + // misinge imamo zdruzene + $_label = $kategorija; + echo ''; + } + } + echo ''; + echo ''; + echo ''; # št enot - echo ''; + echo ''; echo ''; + + #zloopamo skozi gride in nardimo $_tmp_table = array(); $_part = 1; @@ -3013,52 +3289,66 @@ class SurveyAnalysis { #zlopamo skozi gride if (count($_tmp_table[1]) > 0) { foreach ($_tmp_table[1] AS $tkey => $grid) { - $cssBack = "anl_bck_desc_2 "; + echo ''; + if ($_sub_question_col) { - echo ''; - echo ''; - } else { - echo ''; + echo ''; + echo ''; + } + else { + echo ''; } + if (self::$_SHOW_LEGENDA) { - echo ''; - echo ''; + echo ''; + echo ''; } # zloopamo skozi variable if (count($grid['variables']) > 0) { + foreach ($grid['variables'] AS $vid => $variable ) { #mg_inspectž - echo ''; } // end foreach variables } // end if (count($grid['variables']) > 0) + + // suma - echo ''; - // povpreje - echo ''; // odklon - echo ''; @@ -3066,43 +3356,54 @@ class SurveyAnalysis { $_right_grid = $_tmp_table[2][$tkey]; if (count($_right_grid['variables']) > 0) { foreach ($_right_grid['variables'] AS $vid => $variable ) { - echo ''; } // end foreach variables } // end if (count($grid['variables']) > 0) + // suma - echo ''; // povpreje - echo ''; # odklon - echo ''; # št enot - echo ''; + echo ''; } // end foreach ($_tmp_table[1] AS $tkey => $grid) } @@ -3119,9 +3420,7 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } - } /** Izriše multi number odgovore. izpiše samo povprečja @@ -3161,15 +3460,18 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); # tekst vprašanja - echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''; + + echo ''; echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_opisne_subquestion'].''.$lang['srv_analiza_opisne_subquestion'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_answers']; - echo ' (/ %)'; - echo ' (/ %)'; - echo ' (f / %)'; - echo ' '; + echo $lang['srv_analiza_opisne_answers']; + self::showFreqPercent($spid); + echo '
     
       '.($spremenljivka['double'][1]['subtitle'] == '' ? $lang['srv_grid_subtitle_def'].' 1' : $spremenljivka['double'][1]['subtitle']).''.($spremenljivka['double'][2]['subtitle'] == '' ? $lang['srv_grid_subtitle_def'].' 2' : $spremenljivka['double'][2]['subtitle']).' '.($spremenljivka['double'][1]['subtitle'] == '' ? $lang['srv_grid_subtitle_def'].' 1' : $spremenljivka['double'][1]['subtitle']).''.($spremenljivka['double'][2]['subtitle'] == '' ? $lang['srv_grid_subtitle_def'].' 2' : $spremenljivka['double'][2]['subtitle']).'
     
       '.$_label.''.$lang['srv_anl_suma1'].''.$lang['srv_analiza_opisne_povprecje'].''.$lang['srv_analiza_opisne_odklon'].''.$_label.''.$_label.''.$lang['srv_anl_suma1'].''.$lang['srv_analiza_opisne_povprecje'].''.$lang['srv_analiza_opisne_odklon'].''.$lang['srv_anl_suma1'].''.$lang['srv_analiza_opisne_povprecje'].''.$lang['srv_analiza_opisne_odklon'].''.$_label.''.$lang['srv_anl_suma1'].''.$lang['srv_analiza_opisne_povprecje'].''.$lang['srv_analiza_opisne_odklon'].''.$lang['srv_analiza_num_units'].''.$lang['srv_analiza_num_units'].'
    '.$grid['variable'].''.$grid['naslov'].' '.$grid['variable'].''.$grid['naslov'].''.$_tip.''.$_oblika.''.$_tip.''.$_oblika.''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].'
    '; - echo self::formatNumber($variable['percent'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); - echo '
    '; + echo '
    '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].'
    '; + echo self::formatNumber($variable['percent'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); + echo '
    '; + echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '.(int)$grid['suma'].'
    '.self::formatNumber(100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'
    '; + echo '
    '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '.(int)$grid['suma'].'
    '.self::formatNumber(100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'
    '; + echo '
    '; + // povprecje + echo ''; echo self::formatNumber($grid['avg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + echo ''; echo self::formatNumber($grid['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + + echo ''; + #mg_inspect - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].'
    '; - echo self::formatNumber($variable['percent'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); - echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].'
    '; + echo self::formatNumber($variable['percent'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); + echo '
    '; + echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '.(int)$_right_grid['suma'].'
    '.self::formatNumber(100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'
    '; + echo '
    '; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo' '; + echo ' '; + echo ' '; + echo '
    '.(int)$_right_grid['suma'].'
    '.self::formatNumber(100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%').'
    '; + echo '
    '; + echo ''; echo self::formatNumber($_right_grid['avg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + echo ''; echo self::formatNumber($_right_grid['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + echo ''; echo $grid['allCnt']; echo '
    '; + echo '
    '; + # naslovna vrstica - echo ''; - #variabla - echo ''; + + # variabla + echo ''; - #odgovori - echo ''; + echo ''; - echo ''; - #variabla - echo ''; + + # variabla + echo ''; - #odgovori - echo ''; + #odgovori + echo ''; if (self::$_SHOW_LEGENDA){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; + + echo ''; echo ''; // konec naslovne vrstice + $_answersOther = array(); $_grids_count = count($spremenljivka['grids']); if ($_grids_count > 0) { + # naslovna vrstica $_row = $spremenljivka['grids'][0]; - echo ''; - echo ''; - echo ''; + + echo ''; + + echo ''; + echo ''; if (self::$_SHOW_LEGENDA){ - echo ''; - echo ''; + echo ''; + echo ''; } if (count($_row['variables']) > 0 ) foreach ($_row['variables'] AS $rid => $_col ){ $_sequence = $_col['sequence']; # id kolone z podatki if ($_col['other'] != true) { - echo ''; - } else { + } + else { $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); } } echo ''; - $_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot '; + + $last = 0; - //anl_bck_desc_2 anl_bl anl_br anl_variabla_sub + foreach ($spremenljivka['grids'] AS $gid => $grid) { $_variables_count = count($grid['variables']); - echo ''; - echo ''; + + echo ''; - echo ''; if (self::$_SHOW_LEGENDA){ - echo ''; - echo ''; + echo ''; + echo ''; } if ($_variables_count > 0) { @@ -3249,14 +3564,14 @@ class SurveyAnalysis { if ($variable['other'] != true) { # tabela z navedbami - echo ''; - + echo ''; } } } + echo ''; } } @@ -3264,7 +3579,6 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -3371,16 +3685,20 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); + # tekst vprašanja - echo '
    '; + echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + + # odgovori + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -3181,66 +3483,79 @@ class SurveyAnalysis { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + + + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_opisne_subquestion'] . ''.$lang['srv_analiza_opisne_subquestion'] . ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''. $lang['srv_analiza_sums_average'] .''. $lang['srv_analiza_sums_average'] .'
      
      '; - // echo $_col['variable']; + echo ''; echo $_col['naslov']; echo '
    '; + + echo '
    '; echo $grid['variable']; echo ''; + + echo ''; echo $grid['naslov']; echo ''.$_tip.''.$_oblika.''.$_tip.''.$_oblika.''; - echo self::formatNumber(self::$_FREQUENCYS[$_sequence]['average'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; + echo self::formatNumber(self::$_FREQUENCYS[$_sequence]['average'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo '
    '; + echo '
    '; + # naslovna vrstica - echo ''; + echo ''; + #variabla - echo ''; + #odgovori - echo ''; + echo ''; - echo ''; - #variabla - echo ''; + + #variabla + echo ''; - if ($show_enota) { - echo ''; - } else { # če mamo number brez labele izrisujemo drugače - echo ''; } if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + $_answersOther = array(); $_grupa_cnt = 0; if (count($spremenljivka['grids']) > 0) @@ -3451,68 +3775,71 @@ class SurveyAnalysis { $cssBrdr = (int)$grid['new_grid'] == 1 && $isSingleGrid == false? ' anl_double_bt' : ' anl_bt_dot'; echo ''; - if (!$show_enota && $spremenljivka['tip'] == 7) { - echo '' ; - if (!$show_enota && $spremenljivka['tip'] == 7) { - echo '' ; + if (self::$_SHOW_LEGENDA && $inline_legenda) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + echo ''; echo ''; - } else { + } + else { $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); } + $grid['new_grid'] = false; } @@ -3531,17 +3858,17 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } + /** Izriše number odgovore v vertikalni obliki * * @param unknown_type $spid */ static function sumNumberVertical($spid,$_from) { global $lang; - $spremenljivka = self::$_HEADERS[$spid]; + $spremenljivka = self::$_HEADERS[$spid]; # preverimo ali prikazujemo spremenljivko, glede na veljavne odgovore in nastavitev $only_valid = 0; @@ -3633,17 +3960,22 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); + # tekst vprašanja - echo '
    '; + echo ''; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -3397,42 +3715,48 @@ class SurveyAnalysis { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''; + echo ''; if ($spremenljivka['tip'] == 20 || $spremenljivka['tip'] == 7) { echo $lang['srv_analiza_opisne_subquestion']; - } else { + } + else { echo $lang['srv_analiza_opisne_variable_text']; } echo''; - echo ' '; + } + else { # če mamo number brez labele izrisujemo drugače + echo ''; + echo ''; echo''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].'' . $lang['srv_analiza_opisne_m'] . '' . $lang['srv_analiza_num_units'] . '' . $lang['srv_analiza_opisne_povprecje'] . '' . $lang['srv_analiza_opisne_odklon'].'' . $lang['srv_analiza_opisne_min'] . '' . $lang['srv_analiza_opisne_max'] . '' . $lang['srv_analiza_opisne_m'] . '' . $lang['srv_analiza_num_units'] . '' . $lang['srv_analiza_opisne_povprecje'] . '' . $lang['srv_analiza_opisne_odklon'].'' . $lang['srv_analiza_opisne_min'] . '' . $lang['srv_analiza_opisne_max'] . '
    ' ; - } else { - echo '' ; - } - echo $_css_double_line; + + echo '' ; # za number (7) ne prikazujemo variable if ($spremenljivka['tip'] != 7 ) { echo $variable['variable']; } echo '' ; - } else { - echo '' ; - } + echo '' ; if ($show_enota) { # če ni enojni grid if ($isSingleGrid == false) { - echo (count($grid['variables']) > 1 && $spremenljivka['tip'] == 20 ? $grid['naslov'] . ' - ' : '' ).$variable['naslov']; - } else { - # če je enojni, izpišemo labele variable - echo $grid['naslov']; - } - } else { - echo ' '; - } + echo (count($grid['variables']) > 1 && $spremenljivka['tip'] == 20 ? $grid['naslov'] . ' - ' : '' ).$variable['naslov']; + } + else { + # če je enojni, izpišemo labele variable + echo $grid['naslov']; + } + } + echo ''.$_tip.'' .$_oblika. ''.$_tip.'' .$_oblika. ''; + + echo ''; echo (int)self::$_FREQUENCYS[$_sequence]['validCnt']; echo ''; + + echo ''; echo (int)$_approp_cnt[$gid]; echo ''; + + echo ''; echo self::formatNumber(self::$_FREQUENCYS[$_sequence]['validAvg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + + echo ''; echo self::formatNumber(self::$_FREQUENCYS[$_sequence]['validDiv'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); echo ''; + + echo ''; echo (int)self::$_FREQUENCYS[$_sequence]['validMin']; - echo ''; + echo ''; echo (int)self::$_FREQUENCYS[$_sequence]['validMax'];; echo '
    '; + echo '
    '; + # naslovna vrstica - echo ''; + echo ''; + #variabla - echo ''; + $num_cols = 7 + ($spremenljivka['tip'] == 18 ? 1 : 0); + #odgovori - echo ''; + echo ''; - echo ''; - #variabla - echo ''; + + # variabla + echo ''; - + echo ''; - } else { # če mamo number brez labele izrisujemo drugače - echo ''; - } + } + echo''; if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; + + echo ''; + echo ''; + echo ''; if ($spremenljivka['tip'] == 18) { - echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + $_answersOther = array(); $_grupa_cnt = 0; if (count($spremenljivka['grids']) > 0) @@ -3716,32 +4050,25 @@ class SurveyAnalysis { $cssBrdr = (int)$grid['new_grid'] == 1 ? ' anl_double_bt' : ' anl_bt_dot'; echo ''; - if (!$show_enota && $spremenljivka['tip'] == 7) { - echo '' ; - if ((!$show_enota && $spremenljivka['tip'] == 7 ) || $spremenljivka['tip'] == 22 || $spremenljivka['tip'] == 25) { - echo '' ; + if (self::$_SHOW_LEGENDA && $inline_legenda) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -3750,68 +4077,85 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - echo ''; + if ($spremenljivka['tip'] == 18) { $_percent = ($sum_avg > 0 ) ? 100 * self::$_FREQUENCYS[$_sequence]['validAvg'] / $sum_avg : 0; - echo ''; } - echo ''; - echo ''; + + echo ''; echo ''; - } else { + } + else { $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); } + $grid['new_grid'] = false; } } } if ($spremenljivka['tip'] == 18) { - $css_back = 'anl_bck_text_1 anl_bt'; - echo ''; - echo ''; + + echo ''; - echo ''; - - if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; - } - echo ''; - echo ''; - echo ''; - # skupna suma - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + echo ''; + + if (self::$_SHOW_LEGENDA && $inline_legenda){ + echo ''; + echo ''; + } + + echo ''; + echo ''; + + echo ''; + + # skupna suma + echo ''; + echo ''; + echo ''; + echo ''; + + echo ''; } + echo '
    '; + echo ''; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -3660,44 +3992,46 @@ class SurveyAnalysis { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''; if ($show_enota == true) { - echo ''; if ($spremenljivka['tip'] == 20 || $spremenljivka['tip'] == 7) { echo $lang['srv_analiza_opisne_subquestion']; - } else { + } + else { echo $lang['srv_analiza_opisne_variable_text']; } - echo''; - echo ' '; - echo''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].'' . $lang['srv_analiza_opisne_m'] . '' . $lang['srv_analiza_num_units'] . '' . $lang['srv_analiza_opisne_povprecje'] . '' . $lang['srv_analiza_opisne_m'] . '' . $lang['srv_analiza_num_units'] . '' . $lang['srv_analiza_opisne_povprecje'] . '%%' . $lang['srv_analiza_opisne_odklon'].'' . $lang['srv_analiza_opisne_min'] . '' . $lang['srv_analiza_opisne_max'] . '' . $lang['srv_analiza_opisne_odklon'].'' . $lang['srv_analiza_opisne_min'] . '' . $lang['srv_analiza_opisne_max'] . '
    ' ; - } else { - echo '' ; - } - echo $_css_double_line; + + echo '' ; # za number (7) ne prikazujemo variable if ($spremenljivka['tip'] != 7 || ($show_enota == true && $spremenljivka['tip'] == 7 )) { if ($variable['variable'] == $spremenljivka['variable']) { echo $variable['variable'].'_1'; - } else { + } + else { echo $variable['variable']; } } echo '' ; - } else { - echo '' ; - } + + echo '' ; if ($show_enota) { echo (count($grid['variables']) > 1 && $spremenljivka['tip'] == 20 ? $grid['naslov'] . ' - ' : '' ).$variable['naslov']; - } else { - echo ' '; - } + } echo ''.$_tip.'' .$_oblika. ''.$_tip.'' .$_oblika. ''; + + echo ''; echo (int)self::$_FREQUENCYS[$_sequence]['validCnt']; echo ''; + + echo ''; echo (int)$_approp_cnt[$gid]; echo ''; + + echo ''; echo self::formatNumber(self::$_FREQUENCYS[$_sequence]['validAvg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + echo ''; echo self::formatNumber($_percent,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),'%'); echo ''; + + echo ''; echo self::formatNumber(self::$_FREQUENCYS[$_sequence]['validDiv'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); echo ''; + + echo ''; echo (int)self::$_FREQUENCYS[$_sequence]['validMin']; - echo ''; + echo ''; echo (int)self::$_FREQUENCYS[$_sequence]['validMax'];; echo '
    '; + echo '
    '; echo $lang['srv_anl_suma1']; echo '     '; - echo self::formatNumber($sum_avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); - echo '100%   
    //'; + echo self::formatNumber($sum_avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); + echo '100%///
    '; + # izpišemo še tekstovne odgovore za polja drugo if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) { foreach ($_answersOther AS $oAnswers) { @@ -3823,7 +4167,6 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -3832,10 +4175,11 @@ class SurveyAnalysis { */ static function sumNagovor($spid,$_from) { global $lang; + $spremenljivka = self::$_HEADERS[$spid]; + $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - $cssBack = "anl_bck_freq_1 "; if (self :: $show_spid_div == true) { echo '
    '; @@ -3843,22 +4187,26 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); - echo ''; - echo ''; - echo ''; + #variabla + + $_answersOther = array(); + $_grids_count = count($spremenljivka['grids']); + if ($_grids_count > 0) { + + $_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot '; + $last = 0; + //anl_bck_desc_2 anl_bl anl_br anl_variabla_sub + foreach ($spremenljivka['grids'] AS $gid => $grid) { + + $_variables_count = count($grid['variables']); + echo ''; + echo ''; + + + echo ''; + } + } + echo '
    '; + echo ''; + + echo ''; + + echo ''; - echo ''; + echo ''; + echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -3871,12 +4219,12 @@ class SurveyAnalysis { global $lang; $spremenljivka = self::$_HEADERS[$spid]; - $lokacija=false; - $heatmap=false; - if($spremenljivka['tip'] == 26) - $lokacija=true; - else if ($spremenljivka['tip'] == 27) - $heatmap=true; + $lokacija=false; + $heatmap=false; + if($spremenljivka['tip'] == 26) + $lokacija=true; + else if ($spremenljivka['tip'] == 27) + $heatmap=true; $anketa = self::$sid; @@ -3904,10 +4252,8 @@ class SurveyAnalysis { # koliko zapisov prikažemo naenkrat $num_show_records = self::getNumRecords(); - // $num_show_records = $_max_answers_cnt <= (int)$num_show_records ? $_max_answers_cnt : $num_show_records; - - //za tip lokacija (ne enota 3) se rabi user_id, ker se kasneje delajo linki - $need_user_id = !($spremenljivka['tip'] != 26 || ($spremenljivka['tip'] == 26 && $spremenljivka['enota'] == 3)); + //za tip lokacija (ne enota 3) se rabi user_id, ker se kasneje delajo linki + $need_user_id = !($spremenljivka['tip'] != 26 || ($spremenljivka['tip'] == 26 && $spremenljivka['enota'] == 3)); $_answers = self::getAnswers($spremenljivka, $num_show_records, $need_user_id); $_all_valid_answers_cnt = $_answers['validCnt']; @@ -3919,123 +4265,148 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); + # tekst vprašanja - echo ''; + echo '
    '; + + # naslovna vrstica - echo ''; - #variabla - echo ''; + + # variabla + echo ''; - #odgovori - echo ''; + echo ''; - echo ''; + + + echo ''; + #variabla - echo ''; - #odgovori + + #odgovori + if(!$lokacija) + echo ''; - if(!$lokacija) - echo ''; if (self::$_SHOW_LEGENDA){ - echo ''; - echo ''; + echo ''; + echo ''; } - if(!$lokacija){ - echo ''; - echo ''; - } + + if(!$lokacija){ + echo ''; + } + + echo ''; // konec naslovne vrstice + $_answersOther = array(); $_grids_count = count($spremenljivka['grids']); if ($_grids_count > 0) { + # naslovna vrstica $_row = $spremenljivka['grids'][0]; - if(!$lokacija){ - echo ''; - echo ''; - echo ''; - } + + echo ''; + + if(!$lokacija){ + echo ''; + echo ''; + } if (self::$_SHOW_LEGENDA){ - echo ''; - echo ''; + echo ''; + echo ''; } - if (count($_row['variables'])>0) + + if (count($_row['variables'])>0){ foreach ($_row['variables'] AS $rid => $_col ){ - $_sequence = $_col['sequence']; # id kolone z podatki - if ($_col['other'] != true) { - echo ''; - } else { - $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); - } + $_sequence = $_col['sequence']; # id kolone z podatki + if ($_col['other'] != true) { + echo ''; + } + else { + $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); + } + } } + echo ''; - $_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot '; + + + $last = 0; - //anl_bck_desc_2 anl_bl anl_br anl_variabla_sub + foreach ($spremenljivka['grids'] AS $gid => $grid) { $_variables_count = count($grid['variables']); - echo ''; - echo ''; + + echo ''; - if(!$lokacija){ - echo ''; - } + + if(!$lokacija){ + echo ''; + } + if (self::$_SHOW_LEGENDA){ - echo ''; - echo ''; + echo ''; + echo ''; } if ($_variables_count > 0) { + # preštejemo max vrstic na grupo $_max_i = 0; foreach ($grid['variables'] AS $vid => $variable ){ @@ -4051,113 +4422,108 @@ class SurveyAnalysis { $_sequence = $variable['sequence']; # id kolone z podatki if ($variable['other'] != true) { + # tabela z navedbami - echo ''; } } + $last = $_max_i; - } + echo ''; } } @@ -4174,41 +4540,39 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } - /** - * - * @global type $lang - * @param string $spid - [spremenljivka_id]_[loop_id] - */ - private static function displayMapDataAll($spid){ - global $lang; + /** + * + * @global type $lang + * @param string $spid - [spremenljivka_id]_[loop_id] + */ + private static function displayMapDataAll($spid){ + global $lang; - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; - $spremenljivka = Cache::srv_spremenljivka($sprid); - $enota = $spremenljivka["enota"]; + $spremenljivka = Cache::srv_spremenljivka($sprid); + $enota = $spremenljivka["enota"]; - //za choose location naredi isto, kot za vsak userja posebej - dobi direkt iz baze ne glede na filterje - if($enota == 3){ - echo ''; - echo ''; - echo ''; - } - //prikaz glede na filterje - else{ - echo ''; - echo ''; - echo ''; - } + //za choose location naredi isto, kot za vsak userja posebej - dobi direkt iz baze ne glede na filterje + if($enota == 3){ + echo ''; + echo ''; + echo ''; } - + //prikaz glede na filterje + else{ + echo ''; + echo ''; + echo ''; + } + } /** Izriše tekstovne odgovore v vertikalni obliki * @@ -4216,6 +4580,7 @@ class SurveyAnalysis { */ static function sumTextVertical($spid,$_from) { global $lang; + # dajemo v bufer, da da ne prikazujemo vprašanj brez veljavnih odgovorov če imamo tako nastavljeno $spremenljivka = self::$_HEADERS[$spid]; @@ -4250,16 +4615,20 @@ class SurveyAnalysis { self::displaySpremenljivkaIcons($spid); + # tekst vprašanja - echo '
    '; + echo '
    '; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + + # odgovori + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + echo ''; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_opisne_subquestion'] . ''.$lang['srv_analiza_opisne_subquestion'] . ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''. $lang['srv_analiza_opisne_arguments'] .'
    '. $lang['srv_analiza_opisne_arguments'] .'
      
      '; - // echo $_col['variable']; - echo $_col['naslov']; - echo ''; + echo $_col['naslov']; + echo '
    '; - if(!$lokacija) - echo $grid['variable']; - //else{ - else if ($lokacija && $heatmap == false){ - //echo $grid['naslov'].'
    ';//ni potrebno, ker je ze v glavi? - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; - - self::displayMapDataAll($spid); - } - elseif($heatmap){ - //echo $grid['naslov'].'
    ';//ni potrebno, ker je ze v glavi? - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; - SurveyUserSession::Init($anketa); - - $heatmapId = 'heatmap'.$sprid; - //echo $heatmapId; - //SurveyChart::displayExportIcons($sprid); - echo ''; - echo 'Heatmap'; - echo ''; - } + echo '
    '; + if(!$lokacija){ + echo $grid['variable']; + } + else if ($lokacija && $heatmap == false){ + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; + + self::displayMapDataAll($spid); + } + elseif($heatmap){ + + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; + SurveyUserSession::Init($anketa); + + $heatmapId = 'heatmap'.$sprid; + + echo ''; + + echo 'Heatmap'; + echo ''; + } echo ''; - echo $grid['naslov']; - echo ''; + echo $grid['naslov']; + echo ''.$_tip.''.$_oblika.''.$_tip.''.$_oblika.''; - echo ''; - #$_valid_cnt = count(self::$_FREQUENCYS[$_sequence]['valid']); - $index=0; - if (count($_valid_answers) > 0) { - foreach ($_valid_answers AS $key => $answer) { - $index++; - $cssBck = ' '.self::$cssColors['0_' . ($index & 1)]; - $_ans = $answer[$_sequence]; - - if($index <= $moreBound){ - //if($index < $moreBound){ - echo ''; - echo ''; - echo ''; - } - else { - echo ''; - echo ''; - echo ''; + echo ''; + } + } + } + + if ($_all_valid_answers_cnt > $index) { + $index++; + $cssBck = ' '.self::$cssColors['0_' . ($index & 1)]; + + echo ''; + + echo ''; + + echo ''; + } + + echo '
    '; - # narišemo printereček za izpis posameznih textovnih odgovorov - if ($index == 1) { - //echo ''; - - //TODO! zakomentiral, ker nima funkcije, ikona pa pokvarjena - /*echo ''; - echo ' '; - echo '';*/ - } - if ($_ans != null && $_ans != '') { - if(!($need_user_id && $lokacija)) - echo $_ans; - else - echo ''.$_ans.''; - } else { - echo ' '; - } + echo ''; - if($index == $moreBound){ - #more - več - echo '
    '; - echo ' '; - echo ''; - #more - več - konec - } - echo '
    '; - # narišemo printereček za izpis posameznih textovnih odgovorov - if ($index == 1) { - //echo ''; - - //TODO! zakomentiral, ker nima funkcije, ikona pa pokvarjena - /*echo ''; - echo ' '; - echo '';*/ - } - if ($_ans != null && $_ans != '') { - if(!($need_user_id && $lokacija)) - echo $_ans; - else - echo ''.$_ans.''; - } else { - echo ' '; - } + echo ''; + + $index=0; + if (count($_valid_answers) > 0) { + foreach ($_valid_answers AS $key => $answer) { + $index++; + $cssBck = ' '.self::$cssColors['0_' . ($index & 1)]; + $_ans = $answer[$_sequence]; + + if($index <= $moreBound){ + + echo ''; + + echo ''; + + echo ''; + } + else { + echo ''; + + echo ''; - echo ''; - } - } - } - - if ($_all_valid_answers_cnt > $index) { - $index++; - $cssBck = ' '.self::$cssColors['0_' . ($index & 1)]; - echo ''; - echo ''; - echo ''; - } - echo '
    '; + + if ($_ans != null && $_ans != '') { + + if(!($need_user_id && $lokacija)) + echo $_ans; + else + echo ''.$_ans.''; + } + + if($index == $moreBound){ + #more - več + echo '
    '; + echo ' '; + echo ''; + #more - več - konec + } + echo '
    '; - if($index == $_max_i){ - #less - manj - echo '
    '; - echo ' '; - echo ''; - } - echo '
    '; - // Pri javni povezavi drugace izpisemo - if(self::$printPreview == false) - echo '
    '.$lang['srv_anl_more'].'
    '; - else - echo '
    '.$lang['srv_anl_more'].'
    '; - echo '
    '; + if ($_ans != null && $_ans != '') { + if(!($need_user_id && $lokacija)) + echo $_ans; + else + echo ''.$_ans.''; + } + else { + echo ' '; + } + + if($index == $_max_i){ + #less - manj + echo '
    '; + echo ' '; + echo ''; + } + echo '
    '; + // Pri javni povezavi drugace izpisemo + if(self::$printPreview == false) + echo '
    '.$lang['srv_anl_more'].'
    '; + else + echo '
    '.$lang['srv_anl_more'].'
    '; + echo '
    '; + + echo '
    '; + echo '
    '; + # naslovna vrstica - echo ''; + echo ''; + #variabla - echo ''; + #odgovori - echo ''; + echo ''; - echo ''; - #variabla - echo ''; + + # variabla + echo ''; - #odgovori + + # odgovori + echo ''; - echo ''; if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; + + // konec naslovne vrstice $_answersOther = array(); $_grids_count = count($spremenljivka['grids']); @@ -4358,7 +4736,6 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -4370,45 +4747,55 @@ class SurveyAnalysis { * @param $_options */ static function outputGridLabelVertical($gid,$grid,$vid,$variable,$spid,$_options=array()) { - echo ''; - echo ''; + + echo ''; - echo ''; + if (self::$_SHOW_LEGENDA) { $spremenljivka = self::$_HEADERS[$spid]; + if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { global $lang; + $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; + + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; + echo ''; } - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; + $counter++; + return $counter; } static function outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,&$_kumulativa,$_options=array()) { global $lang; - # opcije - + + # opcije $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor 'isOtherAnswer' => false, # ali je odgovor Drugo 'inline_legenda' => true, # ali je legenda inline ali v headerju @@ -4417,7 +4804,6 @@ class SurveyAnalysis { foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - $cssBck = ' '.self::$cssColors['0_' . ($counter & 1)]; $_valid = (self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; @@ -4425,42 +4811,55 @@ class SurveyAnalysis { # če smo v arhivih dodamovse odgovore vendar so nekateri skriti if ($counter >= $options['num_show_records'] && self::$isArchive) { - $cssHide=' class="displayNone"'; - } - echo ' 0 ? ' vkey="'.$vkey.'"' : '').$cssHide.'>'; - echo ''; - echo ''; - if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { - echo ''; - echo ''; + $cssHide = 'displayNone'; } - echo ' 0 ? ' vkey="'.$vkey.'"' : ''). 'class="row_var '.$cssHide.'">'; + + echo ''; + + echo ''; + + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { + echo ''; + echo ''; + } + + echo ''; - echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; } - echo ''; + echo ''; + # če mamo več if ( $counter+1 == $options['num_show_records'] && $options['num_show_records'] < count(self::$_FREQUENCYS[$_sequence]['valid'])) { + if (self::$isArchive == false ) { - echo ''; - echo ''; - echo ''; + + echo ''; + + echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; - } else { - #v arhivie dodamo vse odgovore vendar so skriti - echo ''; - echo ''; - echo ''; + + echo ''; + + echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; } } $counter++; + return $counter; } + // Zadnja osnovna vrstica - suma z razipranjem missingov static function outputSumaValidAnswerVertical($counter,$_sequence,$spid,$_options=array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - // $cssBck = ' '.self::$cssColors['0_' . ($counter & 1)]; $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; - $cssBck = ' '.self::$cssColors['text_1']; - $_brez_MV = ((int)self::$missingProfileData['display_mv_type'] === 0 ) ? TRUE : FALSE; $_hide_minus = ((int)self::$missingProfileData['display_mv_type'] === 2 ) ? TRUE : FALSE; $value =((int)self::$missingProfileData['display_mv_type'] === 0 ) ? 0 : 1; @@ -4533,202 +4944,209 @@ class SurveyAnalysis { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - echo ''; - echo '  '; - echo '  '; + echo ''; - echo ''; + echo ''; - if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - $_percent = self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 - ? 100 * self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] - : 0; - echo ''; - if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; - } - echo ''; - echo ''; - // $counter++; - return $counter; + $_percent = self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 + ? 100 * self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] + : 0; + echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { + echo ''; + } + echo ''; + + echo ''; + + return $counter; } + // Vrstica s posamezno missing vrednostjo static function outputInvalidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_options=array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - //$cssBck = ' '.self::$cssColors['text_' . ($counter & 1)]; - $cssBck = ' '.self::$cssColors['0_' . ($counter & 1)]; $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; $_invalid = (self::$_FREQUENCYS[$_sequence]['invalidCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['invalidCnt'] : 0; $_sufix = (self::$podstran == M_ANALYSIS_SUMMARY_NEW ? '_NEW' : ''); - # da deluje razpiranje manjkajočih tudi kadar imamo skupine + + # da deluje razpiranje manjkajočih tudi kadar imamo skupine if (isset(self::$_CURRENT_LOOP['cnt'])) { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } $_Z_MV = ((int)self::$missingProfileData['display_mv_type'] === 2) ? TRUE : FALSE; - echo ''; - echo ''; - echo ''; + + echo ''; + + echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; + echo ''; } - echo ''; + + echo ''; + echo ''; + $counter++; + return $counter; } + // Zadnja vrstica manjkajocih vrednosti - suma manjkajocih static function outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$_options = array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - //$cssBck = ' '.self::$cssColors['text_' . ($counter & 1)]; - $cssBck = ' '.self::$cssColors['text_1']; + $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*self::$_FREQUENCYS[$_sequence]['invalidCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; $_brez_MV = ((int)self::$missingProfileData['display_mv_type'] === 0) ? TRUE : FALSE; $_hide_minus = ((int)self::$missingProfileData['display_mv_type'] === 1 || (int)self::$missingProfileData['display_mv_type'] === 0) ? TRUE : FALSE; $_sufix = (self::$podstran == M_ANALYSIS_SUMMARY_NEW ? '_NEW' : ''); - # da deluje razpiranje manjkajočih tudi kadar imamo skupine + + # da deluje razpiranje manjkajočih tudi kadar imamo skupine if (isset(self::$_CURRENT_LOOP['cnt'])) { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - echo ''; + + echo ''; - echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; + $counter++; + return $counter; } + // Cisto zadnja vrstica - suma vseh (manjkajoce + navadne) static function outputSumaVertical($counter,$_sequence,$spid, $_options = array()) { global $lang; - # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + # opcije + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - // $cssBck = ' '.self::$cssColors['0_' .($counter & 1)]; - $cssBck = ' anl_bck_text_0'; $_brez_MV = ((int)self::$missingProfileData['display_mv_type'] === 0) ? TRUE : FALSE; $_sufix = (self::$podstran == M_ANALYSIS_SUMMARY_NEW ? '_NEW' : ''); + # da deluje razpiranje manjkajočih tudi kadar imamo skupine if (isset(self::$_CURRENT_LOOP['cnt'])) { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - //echo ''; // $lang['srv_anl_appropriate'] - //echo ''; - echo ''; - echo ''; + echo ''; + + echo ''; + + echo ''; if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; - if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; - } - echo ''; - echo ''; + echo ''; + echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { + echo ''; + } + echo ''; + + echo ''; } - static function outputSumaValidAnswerHeatmap($counter,$_sequence,$spid,$_options=array(), $validHeatmapRegion) { global $lang; # opcije @@ -4767,23 +5185,11 @@ class SurveyAnalysis { echo ''; } - //Veljavni - Skupaj + // Veljavni - Skupaj echo ''; - -/* $_percent = self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 - ? 100 * self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] - : 0; - echo ''; - if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; - } - echo ''; */ - echo ''; - // $counter++; return $counter; } @@ -4864,55 +5270,26 @@ class SurveyAnalysis { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; + echo ''; echo ''; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { echo ''; echo ''; } - //Mankajoci - Skupaj + // Mankajoci - Skupaj echo ''; - //stolpec "Veljavni kliki" -/* echo ''; - */ - -/* if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; - } */ - echo ''; echo ''; $counter++; @@ -4941,9 +5318,7 @@ class SurveyAnalysis { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - //echo ''; // $lang['srv_anl_appropriate'] - //echo ''; + echo ''; echo ''; echo ''; @@ -4952,18 +5327,10 @@ class SurveyAnalysis { echo ''; } - //SKUPAJ + // SKUPAJ echo ''; - - //echo ''; - - //echo ''; - /*if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; - } */ - //echo ''; - echo ''; + echo ''; } /** izpišemo tabelo z tekstovnimi odgovori drugo @@ -5091,11 +5458,9 @@ class SurveyAnalysis { echo ''; } - static public function showIcons($spid, $spremenljivka, $_from = 'freq', $additional=array()) { global $lang; - - $sccFloat = 'taCenter '; + #kateri skin $skin = 0; $options = array('sums'=>true,'sums*'=>true,'desc'=>true,'freq'=>true,'sums_spec'=>false); @@ -5425,50 +5790,80 @@ class SurveyAnalysis { // Javna povezava nima teh ikon if ($printIcon == false && self::$printPreview == false) { - echo ''; + echo '
    '; if ($options['sums'] == true) { + + echo '
    '; + if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3 ) { echo ''; - } else { + } + else { echo ''; } - echo ' '; + echo ' '; echo ''; + + echo '
    '; } if ($options['sums_spec'] == true) { + echo '
    '; + echo ''; - echo ' '; + echo ' '; echo ''; + + echo '
    '; } if ($options['sums*'] == true) { + + echo '
    '; + if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3) { echo ''; - }else { + } + else { echo ''; } - echo ' '; + echo ' '; echo ''; + + echo '
    '; } + if ($options['desc'] == true) { + echo '
    '; + echo ''; - echo ' '; + echo ' '; echo ''; + + echo '
    '; } + if ($options['freq'] == true) { + echo '
    '; + echo ''; - echo ' '; + echo ' '; echo ''; + + echo '
    '; } // Ikona za prikaz grafa if($showChart == true && in_array($spremenljivka['tip'],array(1,2,3,6,7,8,16,17,18,20,22)) && $_from != 'charts'){ + echo '
    '; + echo ''; echo ' '; echo ''; + + echo '
    '; } // Ikona za vkljucitev v porocilo @@ -5487,17 +5882,40 @@ class SurveyAnalysis { $type=4; break; } + if ($showReport == true) { + echo '
    '; SurveyAnalysisHelper::getInstance()->addCustomReportElement($type, $sub_type=0, $spid); + echo '
    '; } - - echo ''; - } else { - - } + echo '
    '; + } } + // Preklop enote navedbe + static private function showEnoteNavedbe($spid, $status){ + global $lang; + + echo '
    '; + + echo ''; + echo ''; + + echo'
    '; + } + + // Preklop frekvence odstotki + static private function showFreqPercent($spid){ + global $lang; + + echo '
    '; + + echo ''; + echo ''; + + echo'
    '; + } /** polovi opisne za vse spremenljivke @@ -6576,85 +6994,89 @@ class SurveyAnalysis { echo ''; */ - echo '
    '; + echo ''; echo self::showVariable($spid, $spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; if (self::$_SHOW_LEGENDA) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -4276,26 +4645,35 @@ class SurveyAnalysis { echo '
    '.$lang['srv_analiza_opisne_variable_type'].': '.self::getSpremenljivkaLegenda($spremenljivka,'tip').'
    '; } echo '
    '; + + + echo '
    '; self::showIcons($spid,$spremenljivka,$_from); echo ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .'
    '; + + echo '
    '; echo $variable['variable']; echo ''; - //echo ($grid['naslov'] != '' ? $grid['naslov']. ' - ' : '').$variable['naslov']; + + echo ''; echo $variable['naslov']; echo ''.$_tip.''.$_oblika.''.$_tip.''.$_oblika.'    
     '; - echo '
    '.$vkey.'
    '; - echo (($options['isTextAnswer'] == false && (string)$vkey != $vAnswer['text']) ? ' ('.$vAnswer['text'] .')' : ''); - echo '
      '; + + echo '
    '; + echo ' '.$vkey.''; + echo (($options['isTextAnswer'] == false && (string)$vkey != $vAnswer['text']) ? ' ('.$vAnswer['text'] .')' : ''); + echo ''; echo (int)$vAnswer['cnt']; echo ''; + + echo ''; echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo self::formatNumber($_valid, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; - echo self::formatNumber($_kumulativa, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo ''; + echo self::formatNumber($_kumulativa, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo '
     '; + + echo '
    '; // Pri javni povezavi drugace izpisemo if(self::$printPreview == false){ echo '
    '.$lang['srv_anl_more'].'
    '; @@ -4471,57 +4870,69 @@ class SurveyAnalysis { echo '
    '.$lang['srv_anl_more'].'
    '; } echo '
      '.''.''.''.'
     '; - echo '
    '.$lang['srv_anl_all'].'
    '; - echo '
    '.$lang['srv_anl_all'].'
    '; + } + else { + + # v arhivie dodamo vse odgovore vendar so skriti + echo '
    '; + echo '
    '.$lang['srv_anl_all'].'
    '; + echo '
    '.$lang['srv_anl_all'].'
    '; echo '
      '.''.''.''.'
    '.$lang['srv_anl_valid']; + echo '
    '; + echo ' '.$lang['srv_anl_valid'].''; echo ''.$lang['srv_anl_suma1'].''.$lang['srv_anl_suma1'].'  //'; + echo ''; echo self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; echo '' . self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '' . self::formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ' 
    ' . self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '' . self::formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '/
     '; - echo '
    '.'' . $vkey . '' . ' (' . $vAnswer['text'].')'.'
    '; - echo '
    '.self::formatNumber($_invalid, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%').'
    '; - echo '
    '.$vAnswer['cnt'].'
    '; + + echo '
    '; + echo '
    '.'' . $vkey . '' . ' (' . $vAnswer['text'].')'.'
    '; + //echo '
    '.self::formatNumber($_invalid, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%').'
    '; + //echo '
    '.$vAnswer['cnt'].'
    '; echo '
      //'; + + echo ''; echo (int)$vAnswer['cnt']; echo ''; + + echo ''; echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; - echo ' '; - echo '/'; - echo ' '; - echo '/
    '; + echo '
    '; echo $lang['srv_anl_missing']; echo ''; - echo $lang['srv_analiza_manjkajocevrednosti']; - // podrobno za missinge - echo '  '; - echo ' ' ; - //echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - echo '  '; - echo ' ' ; - // echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - echo '
    100.0%
    '; - echo '
    '.self::$_FREQUENCYS[$_sequence]['invalidCnt'].'
    '; + echo '
    '; + echo $lang['srv_analiza_manjkajocevrednosti']; echo '    '; + echo ''; $answer['cnt'] = self::$_FREQUENCYS[$_sequence]['invalidCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['invalidCnt'] : 0; echo (int)$answer['cnt']; echo ''; + + echo ''; echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; - echo ' '; - echo '/ /
     '.$lang['srv_anl_suma2'].''.$lang['srv_anl_suma2'].' 
    '.$lang['srv_anl_suma2'].'  //' . (self::$_FREQUENCYS[$_sequence]['allCnt'] ? self::$_FREQUENCYS[$_sequence]['allCnt'] : 0) . '' . self::formatNumber('100', SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '  
    ' . (self::$_FREQUENCYS[$_sequence]['allCnt'] ? self::$_FREQUENCYS[$_sequence]['allCnt'] : 0) . '' . self::formatNumber('100', SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '//
     '; echo $validHeatmapRegion; - //echo self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; echo '' . self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '' . self::formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ' 
    '; echo $lang['srv_anl_missing']; echo ''; - echo $lang['srv_analiza_manjkajocevrednosti']; - - // podrobno za missinge - echo '  '; - echo ' ' ; - //echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - echo '  '; - echo ' ' ; - // echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - - echo '
    100.0%
    '; - //echo '
    '.self::$_FREQUENCYS[$_sequence]['invalidCnt'].'
    '; - echo '
    '.$manjkajoci.'
    '; + echo $lang['srv_analiza_manjkajocevrednosti']; echo '
      '; - echo $manjkajoci; - //$answer['cnt'] = self::$_FREQUENCYS[$_sequence]['invalidCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['invalidCnt'] : 0; - //echo (int)$answer['cnt']; + echo $manjkajoci; echo ''; - echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo ''; - echo ' '; - echo ' 
     '.$lang['srv_anl_suma2'].'
    '.$lang['srv_anl_suma2'].'  ' .$ustrezniHeatmapRegion. '' . (self::$_FREQUENCYS[$_sequence]['allCnt'] ? self::$_FREQUENCYS[$_sequence]['allCnt'] : 0) . '' . self::formatNumber('100', SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . '  
    '; + echo '
    '; // ANALIZE - echo '
    '; - echo '
    '; echo '
    '; echo ''.$lang['srv_analiza'].''; + echo ''; echo '
    '; // VPRASALNIK - echo '
    '; - echo '
    '; + echo '
    '; echo ''.$lang['srv_analysis_links_survey'].''; + echo ''; echo '
    '; // IZPIS - echo '
    '; echo '
    '; echo ''.$lang['srv_statistic'].''; + echo ''; + echo '
    '; - echo '
    '; + echo ''; } private static function printAnalizaSingleVar() { @@ -7112,47 +7534,56 @@ class SurveyAnalysis { // Pri javni povezavi nimamo tega if(self::$printPreview == false){ + // Nastavitve na dnu pri sumarniku if($page == 'sums'){ - - echo ''.$lang['srv_custom_report_comments_add'].''; - - echo ''; + + echo ''; + + echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; } // Nastavitve na dnu pri frekvencah elseif($page == 'freq'){ - echo ''.$lang['srv_custom_report_comments_add'].''; + echo ''; + + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; } // Nastavitve na dnu pri opisnih statistikah else{ - echo ''.$lang['srv_custom_report_comments_add'].''; + echo ''; + + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; - echo ''; - echo ''; + echo ''; + echo ''; } } @@ -7218,7 +7649,7 @@ class SurveyAnalysis { 'sprID'=>$id, 'loop'=>$loop))); - $return = '  '; + $return = '  '; $userAccess = UserAccess::getInstance($global_user_id); if($userAccess->checkUserAccess($what='data_export')){ @@ -7265,11 +7696,16 @@ class SurveyAnalysis { static function displaySpremenljivkaIcons($spid) { if (self::$isArchive == false){ + + echo '
    '; + echo '
    '.self::displayQuickIcons($spid).'
    '; // Javna povezava nima js preklopov if(self::$printPreview == false) self::displayQuickScale($spid); + + echo '
    '; } } @@ -7281,38 +7717,17 @@ class SurveyAnalysis { # pokličemo objekt SpremenljivkaSkala $objectSkala = new SpremenljivkaSkala($spr_id); + echo '
    '; + if ($objectSkala->canChangeSkala()) { - echo ''; - } else { - echo '
    '; - echo ''; - echo $lang['srv_skala_'.$objectSkala->getSkala()]; - echo ''; - echo '
    '; + echo ''; + echo ''; + } + else { + echo ''; } + + echo '
    '; } static function displayPublicAnalysis($properties = array()) { @@ -7461,62 +7876,62 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo '
    '; - //self::displaySpremenljivkaIcons($spid); } - //echo '
    '; - echo '
    '; - # tekst vprašanja - echo ''; - # naslovna vrstica - echo ''; - #variabla - echo ''; - echo ''; - echo ''; - #variabla + echo '
    '; + + # tekst vprašanja + echo '
    '; - //echo self::showVariable($spid, $spremenljivka['variable']); - echo $spremenljivka['variable'].' - '.$spremenljivka['naslov']; - echo '
    '; - // konec naslovne vrstice + # naslovna vrstica + echo ''; - $_answersOther = array(); - $_grids_count = count($spremenljivka['grids']); - if ($_grids_count > 0) { + #variabla + echo ''; - $_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot '; - $last = 0; - //anl_bck_desc_2 anl_bl anl_br anl_variabla_sub - foreach ($spremenljivka['grids'] AS $gid => $grid) { - - $_variables_count = count($grid['variables']); - echo ''; - echo ''; + echo ''; + // konec naslovne vrstice - echo ''; - } - } - echo '
    '; + echo $spremenljivka['variable'].' - '.$spremenljivka['naslov']; + echo '
    '; - if($heatmap){ - //echo $grid['naslov'].'
    ';//ni potrebno, ker je ze v glavi? - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; - SurveyUserSession::Init($anketa); - - $heatmapId = 'heatmap'.$sprid; - //echo $heatmapId; - - echo ''; - //echo 'Smiley face'; - echo 'Heatmap'; - echo ''; - } - echo '
    '; + echo '
    '; + if($heatmap){ + //echo $grid['naslov'].'
    ';//ni potrebno, ker je ze v glavi? + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; + SurveyUserSession::Init($anketa); + + $heatmapId = 'heatmap'.$sprid; + + echo ''; + echo 'Heatmap'; + echo ''; + } + echo '
    '; echo '
    '; # izpišemo še tekstovne odgovore za polja drugo @@ -7530,7 +7945,6 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } @@ -7613,160 +8027,161 @@ class SurveyAnalysis { echo ''; //zacetek tabele # 1. vrstica - naslovna vrstica echo ''; - #variabla - echo ''; - #odgovori - //echo ''; + #odgovori + //echo ''; + echo ''; echo ''; //konec 1. vrstice + //2. vrstica - prikazovanje povezave do heatmap echo ''; - #variabla - echo ''; - echo ''; + #variabla + echo ''; + + echo ''; echo ''; //konec - 2. vrstice + //Koordinate //naslovna vrstica za koordinate echo ''; - echo ''; + echo ''; echo ''; //naslovna vrstica za koordinate - konec //vrstica s podnaslovi celic echo ''; - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo ''; + echo ''; + + echo ''; + + echo ''; + + echo ''; + + echo ''; + + echo ''; + + echo ''; echo ''; //vrstica s podnaslovi celic - konec //vrstica za x echo ''; - //1. stolpcev z imenom koordinate - echo ''; - //1. stolpcev z imenom koordinate - konec - - //2. stolpec - Veljavni - $validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers); - echo ''; - //2. stolpec - Veljavni - konec - - //3. stolpec - Ustrezni - $ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki - echo ''; - //3. stolpec - Ustrezni - konec - - //4. stolpec - Povprecje - $povprecjeHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //4. stolpec - Povprecje - konec + //1. stolpcev z imenom koordinate + echo ''; + //1. stolpcev z imenom koordinate - konec + + //2. stolpec - Veljavni + $validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers); + echo ''; + //2. stolpec - Veljavni - konec + + //3. stolpec - Ustrezni + $ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki + echo ''; + //3. stolpec - Ustrezni - konec + + //4. stolpec - Povprecje + $povprecjeHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //4. stolpec - Povprecje - konec - //5. stolpec - Standardni odklon - $stdevHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //5. stolpec - Standardni odklon - konec + //5. stolpec - Standardni odklon + $stdevHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //5. stolpec - Standardni odklon - konec - //6. stolpec - Minimum - $minHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //6. stolpec - Minimum - konec - - //7. stolpec - Max - $maxHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //7. stolpec - Max - konec + //6. stolpec - Minimum + $minHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //6. stolpec - Minimum - konec + + //7. stolpec - Max + $maxHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //7. stolpec - Max - konec echo ''; //vrstica za x - konec //vrstica za y echo ''; - //1. stolpcev z imenom koordinate - echo ''; - //1. stolpcev z imenom koordinate - konec - - //2. stolpec - Veljavni - echo ''; - //2. stolpec - Veljavni - konec - - //3. stolpec - Ustrezni - echo ''; - //3. stolpec - Ustrezni - konec + //1. stolpcev z imenom koordinate + echo ''; + //1. stolpcev z imenom koordinate - konec + + //2. stolpec - Veljavni + echo ''; + //2. stolpec - Veljavni - konec + + //3. stolpec - Ustrezni + echo ''; + //3. stolpec - Ustrezni - konec - //4. stolpec - Povprecje - $povprecjeHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //4. stolpec - Povprecje - konec - - //5. stolpec - Standardni odklon - $stdevHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //5. stolpec - Standardni odklon - konec + //4. stolpec - Povprecje + $povprecjeHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //4. stolpec - Povprecje - konec + + //5. stolpec - Standardni odklon + $stdevHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //5. stolpec - Standardni odklon - konec - //6. stolpec - Minimum - $minHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //6. stolpec - Minimum - konec - - //7. stolpec - Max - $maxHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //7. stolpec - Max - konec + //6. stolpec - Minimum + $minHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //6. stolpec - Minimum - konec + + //7. stolpec - Max + $maxHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //7. stolpec - Max - konec echo ''; //vrstica za y - konec @@ -7911,7 +8326,6 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo ''; - echo '
    '; } } diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php index 04dcbd809..340e5823c 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisArchive.php @@ -86,7 +86,7 @@ class SurveyAnalysisArchive { $users = array(); $qry = "SELECT saa.*, UNIX_TIMESTAMP(saa.date) as insert_date, UNIX_TIMESTAMP(saa.duration) as duration_d, DATEDIFF(saa.duration, CURDATE()) as days_left" - # da ne delamo vlkege poizvedbe kadar ni potrebno + # da ne delamo velike poizvedbe, kadar ni potrebno . ($defaultFields['insert'] ? " , us1.name as iname, us1.surname as isurname, us1.email as iemail " : "" ) . ($defaultFields['edit'] ? " , us2.name as ename, us2.surname as esurname, us2.email as eemail " : "" ) . " FROM srv_analysis_archive as saa " @@ -96,73 +96,68 @@ class SurveyAnalysisArchive { $s = sisplet_query($qry); if (mysqli_num_rows($s) > 0 ) { - - if($defaultFields['create_new']){ + echo '
    '; echo ''.$lang['srv_archive_analysis'].''; - echo $lang['srv_analiza_archive_generate_quick']; - - echo '
    '; - - echo '
    '; - } - - echo '
    '; - echo self::showVariable($spid, $spremenljivka['variable']); - echo ''.$spremenljivka['naslov'].''; - echo ''.$spremenljivka['naslov'].''; + #variabla + echo ''; + echo self::showVariable($spid, $spremenljivka['variable']); + echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; - echo '
    '; - //self::showIcons($spid,$spremenljivka,$_from); //za enkrat skrijem ikone za izvoze in druge moznosti - echo ''; - //echo $grid['naslov'].'
    ';//ni potrebno, ker je ze v glavi? - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; - SurveyUserSession::Init($anketa); - - $heatmapId = 'heatmap'.$sprid; - //echo $heatmapId; - //SurveyChart::displayExportIcons($sprid); - echo ''; - //echo 'Smiley face'; - echo 'Heatmap '; - echo ''; - echo '
    '; + //self::showIcons($spid,$spremenljivka,$_from); //za enkrat skrijem ikone za izvoze in druge moznosti + echo ''; + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; + SurveyUserSession::Init($anketa); + + $heatmapId = 'heatmap'.$sprid; + + echo ''; + echo 'Heatmap '; + echo ''; + + echo '
    '; - echo ''.$lang['srv_analiza_heatmap_clicked_coords'].''; - echo ''; + echo ''.$lang['srv_analiza_heatmap_clicked_coords'].''; + echo '
    '; - echo $lang['coordinates']; - echo ''; - echo $lang['srv_analiza_opisne_valid_heatmap']; - echo ''; - echo $lang['srv_analiza_num_units_valid_heatmap']; - echo ''; - echo $lang['srv_means_label']; - echo ''; - echo $lang['srv_analiza_opisne_odklon']; - echo ''; - echo $lang['srv_analiza_opisne_min']; - echo ''; - echo $lang['srv_analiza_opisne_max']; - echo ''; + echo $lang['coordinates']; + echo ''; + echo $lang['srv_analiza_opisne_valid_heatmap']; + echo ''; + echo $lang['srv_analiza_num_units_valid_heatmap']; + echo ''; + echo $lang['srv_means_label']; + echo ''; + echo $lang['srv_analiza_opisne_odklon']; + echo ''; + echo $lang['srv_analiza_opisne_min']; + echo ''; + echo $lang['srv_analiza_opisne_max']; + echo '
    '; - echo 'x'; - echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''.$povprecjeHeatmapClicksX.''; + echo 'x'; + echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''.$povprecjeHeatmapClicksX.''.$stdevHeatmapClicksX.''.$stdevHeatmapClicksX.''.$minHeatmapClicksX.''.$maxHeatmapClicksX.''.$minHeatmapClicksX.''.$maxHeatmapClicksX.'
    '; - echo 'y'; - echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''; + echo 'y'; + echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''.$povprecjeHeatmapClicksY.''.$stdevHeatmapClicksY.''.$povprecjeHeatmapClicksY.''.$stdevHeatmapClicksY.''.$minHeatmapClicksY.''.$maxHeatmapClicksY.''.$minHeatmapClicksY.''.$maxHeatmapClicksY.'
    '; + echo '

    '.$lang['srv_analiza_archive_note1'].'

    '; + echo '

    '.$lang['srv_analiza_archive_generate_quick'].'

    '; + + echo '
    '; + echo ''; + echo '
    '; + + echo '

    '.$lang['srv_analiza_archive_list'].'

    '; + + echo '
    '; + echo '
    '; + + echo '
    '; echo ''; - if ($defaultFields['delete']) - echo ''; - if ($defaultFields['edit']) - echo ''; - if ($defaultFields['email']) - echo ''; + + //Stolpec za ikone - prazen header + echo ''; + if ($defaultFields['name']) - echo ''; + echo ''; if ($defaultFields['note']) - echo ''; - if ($defaultFields['access']) - echo ''; + echo ''; if ($defaultFields['type']) - echo ''; + echo ''; if ($defaultFields['date']) - echo ''; + echo ''; if ($defaultFields['duration']) - echo ''; + echo ''; if ($defaultFields['insert']) - echo ''; + echo ''; if ($defaultFields['edit']) - echo ''; + echo ''; + if ($defaultFields['access']) + echo ''; + echo ''; while ($row = mysqli_fetch_assoc($s)) { echo ''; - if ($defaultFields['delete']) { - echo ''; - } - if ($defaultFields['edit']) { - echo ''; - } - if ($defaultFields['email']) { - echo ''; - } + + //Stolpec za ikone - vrstice + echo ''; + + + if ($defaultFields['name']) { echo ''; } - if ($defaultFields['access']) { - echo ''; - } if ($defaultFields['type']) { $key = $lang['srv_analiza_arhiviraj_type_'.$row['type']]; echo ''; @@ -212,17 +204,30 @@ class SurveyAnalysisArchive { echo $row['eemail']; echo ''; } + if ($defaultFields['access']) { + echo ''; + } echo ''; } echo '
    '.$lang['srv_analiza_archive_lbl_delete'].''.$lang['srv_analiza_archive_lbl_edit'].''.$lang['srv_analiza_archive_lbl_send'].''.$lang['srv_analiza_archive_lbl_name'].''.$lang['srv_analiza_archive_lbl_name'].''.$lang['srv_analiza_archive_lbl_note'].''.$lang['srv_analiza_archive_lbl_access'].''.$lang['srv_analiza_archive_lbl_note'].''.$lang['srv_analiza_archive_lbl_type'].''.$lang['srv_analiza_archive_lbl_type'].''.$lang['srv_analiza_archive_lbl_date'].''.$lang['srv_analiza_archive_lbl_date'].''.$lang['srv_analiza_archive_lbl_duration'].''.$lang['srv_analiza_archive_lbl_duration'].''.$lang['srv_analiza_archive_lbl_author'].''.$lang['srv_analiza_archive_lbl_author'].''.$lang['srv_analiza_archive_lbl_editor'].''.$lang['srv_analiza_archive_lbl_editor'].''.$lang['srv_analiza_archive_lbl_access'].'
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo '
    '; + + echo ''; + + if ($defaultFields['email']) + echo ''; + if ($defaultFields['edit']) + echo ''; + if ($defaultFields['delete']) + echo ''; + + echo '
    '; + echo '
    '; echo ''; @@ -180,9 +175,6 @@ class SurveyAnalysisArchive { if ($defaultFields['note']) { echo ''.$row['note'].''.$lang['srv_analiza_arhiviraj_access_'.$row['access']].''.$key.''.$lang['srv_analiza_arhiviraj_access_'.$row['access']].'
    '; + + echo ''; + echo ''; + + echo ''; + } else { echo '
    '; echo ''.$lang['srv_archive_analysis'].''; - echo $lang['srv_analiza_archive_note_no_archive']; - echo '

    '; - echo $lang['srv_analiza_archive_generate_quick']; + echo '

    '.$lang['srv_analiza_archive_note_no_archive'].'

    '; + echo '

    '.$lang['srv_analiza_archive_note1'].'

    '; + echo '

    '.$lang['srv_analiza_archive_generate_quick'].'

    '; + + echo '
    '; + echo ''; + echo '
    '; echo '
    '; } @@ -317,98 +322,124 @@ class SurveyAnalysisArchive { static function DisplayDoArchive() { global $lang, $site_url; - echo '
    '."\n"; + echo '
    '; echo ''; - echo '

    '.$lang['srv_analiza_arhiv'].'

    '; - - echo $lang['srv_analiza_arhiviraj_ime']; - echo ': '."\n"; + echo '

    '.$lang['srv_analiza_archive_generate_quick_button'].'

    '; - echo '
    '; - - echo '
    '; - echo $lang['srv_analiza_archive_note'].':'; - echo ''; + echo '
    '; + echo ''.$lang['srv_analiza_arhiviraj_ime'].':'; + echo ''; echo '
    '; - echo '
    '; - echo '
    '; + + echo '
    '; + echo ''.$lang['srv_analiza_archive_note'].':'; + echo ''; + echo '
    '; + + echo '
    '; // dostop - echo '
    '; - echo $lang['srv_analiza_archive_access'].':'; - echo '
     '.$lang['srv_analiza_archive_access_all']; - echo '
     '.$lang['srv_analiza_archive_access_admins']; - echo '
     '.$lang['srv_analiza_archive_access_password']; - echo '
    '; - echo '
     
    '; - + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_analiza_archive_access'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo $lang['srv_analiza_archive_access_password_label'].':'; + echo ''; + echo '
    '; + + echo '
    '; + echo '
    '; //left + // trajanje - echo '
    '; - echo $lang['srv_analiza_archive_duration'].':'; - echo '
    '; + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_analiza_archive_duration'].':'; + $date = date("Y-m-d");// current date $duration = strtotime(date("Y-m-d", strtotime($date)) . " +3 month"); $duration = date("d.m.Y",$duration); - echo ''; - printf ($lang['srv_analiza_archive_duration_default'], $duration); - echo '
    '; - echo ''.$lang['srv_analiza_archive_duration_custom'].'  - - - '; - echo '
    '; - echo ''.$lang['srv_permanent_archive']; - echo '
    '; - - echo '
    '; - echo '
    '; - - echo '
    '."\n"; - echo $lang['srv_analiza_current_archives']; - if (true) { - self :: ListArchive(array('create_new'=>false, 'delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false)); - #self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>false, 'access'=>false, 'name_link'=>true, 'duration'=>false, 'insert'=>false, 'edit'=>false)); - } else { - echo $lang['srv_analiza_no_current_archives']; - } - - echo '
    '."\n"; // end: div_curent_archives + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo ''; + echo ' + + '; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + + echo '
    '; //right + + echo '
    '; //wrap + + echo '
    '; + echo ''; + + $action = ''; if ($_GET['podstran'] == M_ANALYSIS_CROSSTAB || $_POST['podstran'] == M_ANALYSIS_CROSSTAB) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveCrosstabs();'; } else if ($_GET['podstran'] == M_ANALYSIS_MEANS || $_POST['podstran'] == M_ANALYSIS_MEANS) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveMeans();'; } else if ($_GET['podstran'] == M_ANALYSIS_TTEST || $_POST['podstran'] == M_ANALYSIS_TTEST) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveTTest();'; } else if ($_GET['podstran'] == M_ANALYSIS_BREAK || $_POST['podstran'] == M_ANALYSIS_BREAK) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveBreak();'; } else if ($_GET['podstran'] == M_ANALYSIS_CHARTS || $_POST['podstran'] == M_ANALYSIS_CHARTS) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveChart();'; } else if ($_GET['podstran'] == M_ANALYSIS_CREPORT || $_POST['podstran'] == M_ANALYSIS_CREPORT) { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveCReport();'; } else { - echo ''.$lang['srv_analiza_arhiviraj_create'].''."\n"; + $action = 'submitArchiveAnaliza();'; } - echo ''.$lang['srv_analiza_arhiviraj_cancle'].''."\n"; - - echo '
    '."\n"; // end div_analiza_archive_name + echo ''; + + echo '
    '; + + echo '
    '; // end div_analiza_archive_name } static function DisplayCreatedArchive($aid=null, $name) { global $lang, $site_url; - echo '
    '."\n"; + echo '
    '; echo ''; @@ -416,115 +447,116 @@ class SurveyAnalysisArchive { $CAE = self::CheckArchiveExistance($aid); if ( $CAE > 0) { - echo '
    '; + echo '

    '; printf( $lang['srv_analiza_arhiviraj_success'],$name); - echo '

    '; - echo '
    '; + echo '

    '; - echo '
    '; + $archive_link = $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid; + + echo '

    '; echo $lang['srv_analiza_arhiviraj_success_note']; - echo '
    '; - echo ''; - echo ''; - echo $site_url.'admin/survey/AnalysisArchive.php?anketa='.self::$sid.'&aid='. $aid; + echo ': '; + echo $archive_link; echo ''; - echo ''; + echo ''; + echo '

    '; + + echo '
    '; + echo ''; + //echo ''; echo '
    '; - - echo ''.$lang['srv_analiza_arhiviraj_close'].''."\n"; - echo ' '.$lang['srv_analiza_arhiviraj_send_mail'].''."\n"; } else { self::DisplayError($CAE); } - - # seznam arhivov - echo '
    '; - echo '
    '."\n"; - echo $lang['srv_analiza_current_archives']; - if (true) { - self :: ListArchive(array('delete'=>false, 'edit'=>false, 'email'=>false, 'access'=>false, 'note'=>false, 'type'=>true, 'access'=>false, 'name_link'=>true,'duration'=>false, 'insert'=>true, 'edit'=>false)); - } else { - echo $lang['srv_analiza_no_current_archives']; - } - echo '
    '."\n"; // end: div_curent_archives - echo '
    '."\n"; // end div_analiza_archive_name + echo '
    '; // end div_analiza_archive_name } static function EmailArchive($aid) { global $lang; - echo '
    '."\n"; + echo '
    '."\n"; echo ''; - echo '

    '.$lang['srv_analiza_arhiv'].'

    '; + echo '

    '.$lang['srv_export_hover_archive_mail'].'

    '; # preverimo obstoj datoteke, in dostop $CAE = self::CheckArchiveExistance($aid); if ( $CAE > 0) { # vsebina emaila in naslovi - echo '
    '."\n"; - - echo '

    '.$lang['srv_analiza_archive_message_note'].'

    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; - echo '
    '."\n"; - echo ''."\n"; - echo '
    '; - - echo '
    '; - - echo '
    '; - echo '
    '; - echo '

    '; - echo '

    '."\n"; + echo '' . $lang['message'] . ':'; + + echo '

    '; + echo '
    '; $signature = Common::getEmailSignature(); echo ''."\n"; - echo '
    '; + echo ''."\n"; - - echo '
    '."\n"; - #gumbi + + echo '
    '; #left + echo '
    '."\n"; + + //Navodila + echo '
    '; + + echo '

    '.$lang['srv_alert_instruction1'].'

    '; + echo '

    '.$lang['srv_alert_instruction1c'].'

    '; - echo '
    '; - echo ''.$lang['srv_analiza_arhiviraj_do_send_mail'].''."\n"; - echo ''.$lang['srv_analiza_arhiviraj_close'].''."\n"; - echo '
    '; + echo '
    '; + echo '

    '.$lang['srv_alert_instruction_link_archive'].'

    '; + echo '

    '.$lang['srv_alert_instruction_url_archive'].'

    '; + echo '

    '.$lang['srv_alert_instruction_name_archive'].'

    '; + echo '

    '.$lang['srv_alert_instruction_survey'].'

    '; + echo '

    '.$lang['srv_alert_instruction_date'].'

    '; + echo '

    '.$lang['srv_alert_instruction_site'].'

    '; echo '
    '; - echo '
    '; - # navodila - echo $lang['srv_analiza_arhiviraj_mail_note_0']; + echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - # navodila - echo $lang['srv_analiza_arhiviraj_mail_note_1']; + + echo '
    '; //right + + echo '
    '; //wrap + + #gumbi + echo '
    '; + echo ''; + echo ''; echo '
    '; - echo '
    '; - echo '
    '; + } else { self::DisplayError($CAE); } - echo '
    '."\n"; // end div_analiza_archive_name + echo '
    '; // end div_analiza_archive_name } static function SendEmailArchive($aid = null, $subject, $text, $emails) { global $lang, $site_url, $site_path, $global_user_id; - echo '
    '."\n"; + echo '
    '."\n"; echo ''; - echo '

    '.$lang['srv_analiza_arhiv'].'

    '; + echo '

    '.$lang['srv_export_hover_archive_mail'].'

    '; $CAE = self::CheckArchiveExistance($aid); if ( $CAE > 0) { @@ -625,19 +657,21 @@ class SurveyAnalysisArchive { echo 'Pri pošiljanju e-mailov je prišlo do napake!'; } - echo ''.$lang['srv_analiza_arhiviraj_close'].''."\n"; - echo '
    '; + echo '
    '; + echo ''; + echo '
    '; + } else { self::DisplayError($CAE); } - echo '
    '."\n"; // end div_analiza_archive_name + echo '
    '; // end div_analiza_archive_name } static function EditArchive($aid) { global $lang, $site_url, $site_path, $global_user_id; - echo '
    '."\n"; + echo '
    '."\n"; echo ''; @@ -649,31 +683,53 @@ class SurveyAnalysisArchive { $s = sisplet_query("SELECT *, UNIX_TIMESTAMP(duration) as duration_d FROM srv_analysis_archive WHERE id='".$aid."' AND sid='".self::$sid."'"); $row = mysqli_fetch_assoc($s); - echo $lang['srv_analiza_arhiviraj_ime']; - echo ': '."\n"; - echo '
    '; - echo '
    '; - echo $lang['srv_analiza_archive_note'].':'; - echo ''; - echo '
    '; - echo '
    '; - // dostop - echo '
    '; - echo $lang['srv_analiza_archive_access'].':'; - echo '
     '.$lang['srv_analiza_archive_access_all']; - echo '
     '.$lang['srv_analiza_archive_access_admins']; - echo '
     '.$lang['srv_analiza_archive_access_password']; - echo '
    '.$lang['srv_analiza_archive_access_password_label'].''; - echo '
    '; - - echo '
     
    '; - // trajanje - echo '
    '; - echo $lang['srv_analiza_archive_duration'].':'; - echo '
    '; - echo ' - + echo '
    '; + echo ''.$lang['srv_analiza_arhiviraj_ime'].':'; + echo ''; + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_analiza_archive_note'].':'; + echo ''; + echo '
    '; + + echo '
    '; + // dostop + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_analiza_archive_access'].':'; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + echo $lang['srv_analiza_archive_access_password_label'].':'; + echo ''; + echo '
    '; + + echo '
    '; + echo '
    '; //left + + // trajanje + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_analiza_archive_duration'].':'; + + echo '
    '; + echo ''; + echo ' '; - - echo '
    '; - echo '
    '; - echo '
    '; + echo '
    '; + + echo '
    '; + + + echo '
    '; //right + + echo '
    '; //wrap + + echo '
    '; + echo ''; + echo ''; + echo '
    '; - echo ''.$lang['srv_analiza_arhiviraj_save'].''."\n"; - echo ''.$lang['srv_analiza_arhiviraj_close'].''."\n"; - echo '
    '; } else { self::DisplayError($CAE); } @@ -929,8 +991,9 @@ class SurveyAnalysisArchive { echo '
    '; if ($showButton) { - echo ''.$lang['srv_analiza_arhiviraj_close'].''."\n"; - echo '
    '; + echo '
    '; + echo ''; + echo '
    '; } } @@ -981,7 +1044,7 @@ class SurveyAnalysisArchive { static function AskDeleteArchive($aid) { global $lang; - echo '
    '."\n"; + echo '
    '."\n"; $CAE = self::CheckArchiveExistance($aid); @@ -1204,7 +1267,9 @@ class SurveyAnalysisArchive { * */ static function createArchiveFromAnaliza() { + $content = null; + if($_POST['podstran'] == 'charts'){ # kreiramo arhiv za grafe $SC = new SurveyChart(); @@ -1225,13 +1290,15 @@ class SurveyAnalysisArchive { if ($_POST['podstran'] == 'anal_arch') { $_POST['podstran'] = 'sumarnik'; } + if (!isset($_POST['content'])) { SurveyAnalysis::Init(self::$sid); SurveyAnalysis::setUpIsForArchive(true); SurveyAnalysis::setUpReturnAsHtml(true); $content = SurveyAnalysis::Display(); - } else { + } + else { $content = $_POST['content']; } } @@ -1246,12 +1313,12 @@ class SurveyAnalysisArchive { $ArchiveTypes = array(M_ANALIZA_SUMS => 0, M_ANALIZA_DESCRIPTOR=>1, M_ANALIZA_FREQUENCY=>2, M_ANALIZA_CROSSTAB=>3, M_ANALYSIS_MEANS=>4, M_ANALYSIS_TTEST=>5, M_ANALYSIS_BREAK=>6, M_ANALYSIS_CHARTS=>7, M_ANALYSIS_CREPORT=>8); if (isset($_POST['podstran'])) $type = $ArchiveTypes[$_POST['podstran']]; - if (isset($content) && trim($content) != null && self::$sid > 0) { + if (isset($content) && trim($content) != null && self::$sid > 0) { SurveyAnalysisArchive :: Init(self::$sid); - SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password); - - } else { + SurveyAnalysisArchive :: CreateArchive($content,$name,$note,$access,$type,$duration,$durationType,$settings,$access_password); + } + else { echo 'Error! (SurveyAnalysisArchive :: CreateArchive)'; } diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php index 2acff7b15..73280f5c5 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php @@ -47,9 +47,10 @@ class SurveyAnalysisHelper { $sql = sisplet_query("SELECT id FROM srv_custom_report WHERE ank_id='".self::$anketa."' AND usr_id='".$creportAuthor."' AND type='$type' AND sub_type='$sub_type' AND spr1='$spr1' AND spr2='$spr2' AND profile='$creportProfile'"); $insert = (mysqli_num_rows($sql)) ? 0 : 1; $id = $type.'-'.$sub_type.'-'.$spr1.'-'.$spr2; + // Samo zvezdica (sums, grafi, freq...) if($type < 5) - echo ''; + echo ''; // Zvezdica s textom else{ echo '
    '; @@ -68,58 +69,67 @@ class SurveyAnalysisHelper { function displayMissingLegend(){ global $lang; - echo '
    '; - echo '
    '; - echo ''; - echo ''; + echo '
    '; + + echo '
    '; + echo ''.$lang['srv_bottom_data_legend_note']; echo '
    '; - echo ''; } function displayStatusLegend(){ global $lang; - - echo '
    '; - echo '
    '; - echo ''; - echo ''; + + echo '
    '; + + echo '
    '; + echo ' '.$lang['srv_bottom_data_legend_status_note'].''; echo '
    '; - echo ''; + echo '
    '; } function displayTestLegend(){ global $lang; - echo '
    '; - echo '
    '; - echo ''; - echo ''; + echo '
    '; + + echo '
    '; + echo ' '.$lang['srv_bottom_data_legend_test_note'].''; echo '
    '; - echo ''; } } \ No newline at end of file diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php index 308f55614..4eab1442c 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyBreak.php @@ -52,6 +52,11 @@ class SurveyBreak $this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString(); $this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/'; + + // Pri glasovanju tega ne pustimo + if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){ + die(); + } #inicializiramo class za datoteke $this->SDF = SurveyDataFile::get_instance(); @@ -203,16 +208,9 @@ class SurveyBreak $SSH -> displayTestDataBar(true); } - /*echo '
    '; - SurveyStatusProfiles::displayOnlyValidCheckbox(); - echo '
    ';*/ - # ali prikazujemo tabele ali grafe $this->break_charts = (isset($this->sessionData['break']['break_show_charts']) && (int)$this->sessionData['break']['break_show_charts'] == 1) ? 1 : 0; - //$this->DisplayLinks(); - //$this->DisplayFilters(); - echo '
    '; $this->displayData(); echo '
    '; #id="div_break_data" @@ -255,13 +253,18 @@ class SurveyBreak function displayData() { global $lang; - echo '
    '; + $variables = $this->getVariableList(2); - - echo ''; - echo $lang['srv_break_label1']; - echo '
    '; - echo ''; echo ''; if (count($variables)) { foreach ($variables as $variable) { @@ -274,24 +277,37 @@ class SurveyBreak . $variable['variableNaslov'] . ''; } } - echo ''; # name="breakSpremenljivka" - echo '
    '; + echo ''; - echo '' ; + echo '
    '; + + + // Dodatne nastavitve + echo '
    ' ; + + echo ''.$lang['settings'].':'; + + echo ''; $this->displayLinePercent(); - $this->displayLineCharts(); // V DELU... - echo ''; + echo ''; + + echo ''; + $this->displayLineCharts(); + echo ''; + + echo '
    '; - echo '
    '; - echo '
    '; # id="break_variables" + + echo '
    '; + + if (isset($this->sessionData['break']['spr']) && (int)$this->sessionData['break']['spr'] > 0 && isset($this->sessionData['break']['seq']) && (int)$this->sessionData['break']['seq'] > 0) { - echo '
    '; + + echo '
    '; $this->doBreakForSpremenljivka(); echo '
    '; # id="breakResults" - } else { - echo '
    '; - } + } } /** funkcija vrne seznam primern variabel za crostabe @@ -524,10 +540,10 @@ class SurveyBreak } } } + $this->displayBreak($spr,$frequencys); - - } else { - echo '
    '; + } + else { echo '

    '.$lang['srv_break_error_note_1'].'

    '; } } @@ -573,11 +589,8 @@ class SurveyBreak } function displayBreak($forSpr, $frequencys) { - - + ob_start(); // outer buffer - # če imamo filter spremenljivk ga izpišemo - echo '
    '; # če ne uporabljamo privzetega časovnega profila izpišemo opozorilo SurveyTimeProfiles :: printIsDefaultProfile(false); @@ -591,11 +604,14 @@ class SurveyBreak # filtriranje po spremenljivkah $_FILTRED_VARIABLES = SurveyVariablesProfiles::getProfileVariables(SurveyVariablesProfiles::checkDefaultProfile(), true); + + foreach ($this->_HEADERS AS $skey => $spremenljivka) { if ((int)$spremenljivka['hide_system'] == 1 && in_array($spremenljivka['variable'],array('email','ime','priimek','telefon','naziv','drugo'))) { continue; } + $spremenljivka['id'] = $skey; $tip = $spremenljivka['tip']; if ( is_numeric($tip) @@ -609,7 +625,8 @@ class SurveyBreak ) { $this->displayBreakSpremenljivka($forSpr,$frequencys,$spremenljivka); - } else if ( is_numeric($tip) + } + else if ( is_numeric($tip) && ( $tip == 4 #text || $tip == 19 #multitext @@ -617,6 +634,7 @@ class SurveyBreak || $tip == 20 #multi numer* ) && ( count($_FILTRED_VARIABLES) == 0 || (count($_FILTRED_VARIABLES) > 0 && isset($_FILTRED_VARIABLES[$skey]) ) ) ) { + $this->displayBreakSpremenljivka($forSpr,$frequencys,$spremenljivka); } @@ -653,9 +671,10 @@ class SurveyBreak # checkbox case 2: - $this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); - break; - #number + $this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); + break; + + #number case 7: #ranking case 17: @@ -665,10 +684,11 @@ class SurveyBreak case 20: $this->displayBreakTableNumber($forSpr,$frequencys,$spremenljivka); break ; - + case 19: $this->displayBreakTableText($forSpr,$frequencys,$spremenljivka); break ; + #multicheck case 16: $this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); @@ -678,8 +698,6 @@ class SurveyBreak case 21: # po novem besedilo izpisujemo v klasični tabeli $this->displayBreakTableText($forSpr,$frequencys,$spremenljivka); - - #$this->displayCrosstabTable($forSpr,$frequencys,$spremenljivka); break; default: @@ -726,38 +744,53 @@ class SurveyBreak # ce imamo vec kot 20 kategorij,izpisujemo samo tiste ki imajo vrednosti $displayAll = (count($options) > 20) ? false : true; - echo '
    '; - if (isset($spremenljivka['double']) && $spremenljivka['double'] > 1) { + if (isset($spremenljivka['double']) && $spremenljivka['double'] > 1) { $doubleGridParts = $spremenljivka['double']; $multiply = 1; $isDoubleGrid = true; - } else { + } + else { $doubleGridParts[1]['subtitle'] = ''; $multiply = 2; $isDoubleGrid = false; } - - + # če imamo dvojno tabelo - $rowspan = ' rowspan="3"'; $colspan = ' colspan="'.($multiply*count($sequences)).'"'; + foreach ($doubleGridParts AS $part => $doubleGridTitle) { - echo '
    '; + + echo '
    '; + + + // Zvezdica za vkljucitev v porocilo + echo '
    '; + + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
    '; + + # če ni multicheck in multi grid - echo ''; - echo ''; - echo ''; + echo '
    '; + + + echo ''; + + echo ''; + + echo ''; + echo ''; - echo ''; + + echo ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) { foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; } } } + echo ''; - echo ''; + + + echo ''; foreach ($spremenljivka['grids'] AS $gkey => $grid) { if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) { foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; - echo ''; + echo ''; + echo ''; } } } echo ''; + + $cnt=0; foreach ($frequencys AS $fkey => $fkeyFrequency) { $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov']; $cnt++; foreach ($options AS $oKey => $option) { if ($means[$fkey][$oKey] != null || $displayAll) { - echo ''; - echo ''; + + echo ''; + + echo ''; - $css = ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) { foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + echo ''; + # enote - echo ''; $totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']); @@ -830,44 +874,48 @@ class SurveyBreak } } } + echo ''; } } } + + #dodamo še skupno sumo in povprečje echo ''; - echo ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { if ($isDoubleGrid == false || ($isDoubleGrid == true && $grid['part'] == $part)) { foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + # enote - echo ''; } - } } } + echo ''; - echo '
    '; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - - echo ''; - echo ''; + echo ''; echo ''; echo ''; echo $spremenljivka['naslov']; @@ -767,60 +800,71 @@ class SurveyBreak echo ' - '.$doubleGridTitle['subtitle']; } echo ''; - echo ''; + echo '
    '; + echo ''; echo $variable['naslov']; echo '('.$variable['variable'].')'; - echo ''; + echo '
    Povprečje'.$lang['']; - echo 'Št. enot'.$lang['']; - echo 'PovprečjeŠt. enot
    '; if ($forSpremenljivka['tip'] == 2) { echo $cbxLabel; - } else { + } + else { echo $forSpremenljivka['options'][$oKey]; } echo ''; echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,''); echo ''; + echo ''; echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; echo '
    '; + + echo ''; echo 'Skupaj'; echo ''; + echo ''; $totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0; echo $this->formatNumber($totalMean ,$this->num_digit_average,''); echo ''; + echo ''; echo (int)$totalFreq[$sequence]; echo '
    ';//$forSpremenljivka['grids'][0]['variables'] - + + echo '
    '; + + echo ''; } - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - echo ''; } } @@ -938,11 +986,10 @@ class SurveyBreak } // Ce izrisujemo tabelo else{ - - echo '
    '; - echo '
    '; + # za multi number naredimo po skupinah if ($tip != 20 ) { + $rowspan = ' rowspan="3"'; $colspan = ' colspan="'.(2*count($sequences)).'"'; @@ -950,90 +997,121 @@ class SurveyBreak if ((int)$this->break_percent > 0) { $break_percentRowSpan = ' rowspan="2"'; } + + echo '
    '; + + + // Zvezdica za vkljucitev v porocilo + echo '
    '; + + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
    '; + + # če ni multicheck in multi grid - echo ''; - echo ''; - echo ''; + echo '
    '; + + + echo ''; + + echo ''; + + echo ''; + echo ''; + - echo ''; + echo ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; } } + echo ''; - echo ''; + + + echo ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; - echo ''; + echo ''; + echo ''; } } + echo ''; + foreach ($frequencys AS $fkey => $fkeyFrequency) { foreach ($options AS $oKey => $option) { if ($displayAll || $means[$fkey][$oKey] != null) { + echo ''; - echo ''; + + echo ''; - $css = ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + echo ''; + # enote - echo ''; - #$totalMeans[$sequence] += ($this->getMeansFromKey($fkeyFrequency[$sequence])*(int)$frequencys[$fkey][$sequence]['validCnt']); - #$totalFreq[$sequence]+= (int)$frequencys[$fkey][$sequence]['validCnt']; - $totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']); + + $totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']); $totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; } } } + echo ''; + + if ((int)$this->break_percent) { + echo ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { if ($variable['other'] != 1) { + $sequence = $variable['sequence']; - echo ''; } } } } + + #dodamo še skupno sumo in povprečje echo ''; - echo ''; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + # enote - echo ''; } } - } + echo ''; + echo '
    '; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - - echo ''; - echo ''; + echo ''; echo ''; echo ''; echo $spremenljivka['naslov']; echo '('.$spremenljivka['variable'].')'; echo ''; echo ''; - echo ''; + echo '
    '; + echo ''; echo $variable['naslov']; echo '('.$variable['variable'].')'; - echo ''; + echo '
    Povprečje'.$lang['']; - echo 'Št. enot'.$lang['']; - echo 'PovprečjeŠt. enot
    '; echo $forSpremenljivka['options'][$oKey]; echo ''; echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,''); - #echo $this->formatNumber($means[$fkey][$sequence],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ''; + echo ''; echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; - #echo (int)$frequencys[$fkey][$sequence]['validCnt']; echo '
    '; - #echo (int)$frequencys[$fkey][$sequence]['validCnt']; + + echo ''; $percent = 0; if ($frequencys[$fkey][$sequence]['validCnt'] > 0 ) { $percent = 100; @@ -1044,81 +1122,103 @@ class SurveyBreak } } + echo '
    '; - echo $lang[''].'Skupaj'; + + echo ''; + echo 'Skupaj'; echo ''; + echo ''; $totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0; echo $this->formatNumber($totalMean ,$this->num_digit_average,''); echo ''; + echo ''; echo (int)$totalFreq[$sequence]; echo '
    '; - - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $spremenljivka['grids'][0]['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - - #xxxxx - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - - - } else if ($tip == 20){ + echo '
    '; + } + else if ($tip == 20){ + # za multi number razdelimo na grupe - skupine $rowspan = ' rowspan="3"'; $colspan = ' colspan="'.(2*count($spremenljivka['grids'][0]['variables'])).'"'; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { // Ce smo v porocilu po meri in ni prava tabela jo preskocimo if(isset($spremenljivka['break_sub_table']['key']) && $spremenljivka['break_sub_table']['key'] != $gkey){ continue; } + + echo '
    '; + + echo '
    '; + // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova if(!isset($spremenljivka['break_sub_table']['sequence'])){ - echo '
    '.$lang['srv_break_table_for']; + echo '
    '; + + echo $lang['srv_break_table_for']; echo $spremenljivka['naslov'].' ('; echo $spremenljivka['variable'].') = '; echo $grid['naslov']; echo ' ('.$grid['variable'].')'; - echo ''; + + echo '
    '; } + + // Zvezdica za vkljucitev v porocilo + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
    '; + - echo ''; + echo '
    '; + + #labele - echo ''; - echo ''; + echo ''; + + echo ''; - echo ''; + echo ''; + echo''; + + #labele - echo ''; + echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; } echo ''; - echo ''; + + + echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; - echo ''; + echo ''; + echo ''; } + echo ''; + + $cnt=0; foreach ($frequencys AS $fkey => $fkeyFrequency) { $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cnt]['naslov']; $cnt++; + foreach ($forSpremenljivka['options'] AS $oKey => $option) { if ($displayAll || $means[$fkey][$oKey] != null) { + # če je osnova checkbox vzamemo samo tam ko je 1 if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) { - echo ''; - echo ''; + + echo ''; + + echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; + #povprečje - echo ''; + # enote - echo ''; + $totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']); $totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; @@ -1182,46 +1298,46 @@ class SurveyBreak } } } + + #dodamo še skupno sumo in povprečje echo ''; - echo ''; + foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + # enote - echo ''; } } + echo ''; + echo '
    '; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - echo ''; + echo ''; echo ''; echo ''; echo $spremenljivka['naslov']. ' - '; @@ -1126,53 +1226,69 @@ class SurveyBreak echo '('.$grid['variable'].')'; echo ''; echo ''; - echo ''; + echo '
    '; + echo ''; echo $variable['naslov']; echo '('.$variable['variable'].')'; - echo ''; + echo '
    Povprečje'.$lang['']; - echo 'Št. enot'.$lang['']; - echo 'PovprečjeŠt. enot
    '; if ($forSpremenljivka['tip'] == 2) { echo $cbxLabel; - } else { + } + else { echo $forSpremenljivka['options'][$oKey]; } - #echo ' ('.$oKey.')'; echo ''; + echo ''; echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,''); echo ''; + echo ''; echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; echo '
    '; + + echo ''; echo 'Skupaj'; echo ''; + echo ''; $totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0; echo $this->formatNumber($totalMean ,$this->num_digit_average,''); echo ''; + echo ''; echo (int)$totalFreq[$sequence]; echo '
    '; - - - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - - echo '
    '; + + echo '
    '; } - - } - echo '
    '; - } - + } + } } + #text - 21: + #multi text - 19: function displayBreakTableText($forSpr,$frequencys,$spremenljivka){ - #text - 21: - #multi text - 19: + $keysCount = count($frequencys); $sequences = explode('_',$spremenljivka['sequences']); $forSpremenljivka = $this->_HEADERS[$forSpr]; @@ -1233,6 +1349,7 @@ class SurveyBreak $totalFreq = array(); $forSequences = array(); $cnt = array(); + foreach ($frequencys AS $fkey => $fkeyFrequency) { $forSequences[] = $fkey; foreach ($forSpremenljivka['options'] AS $oKey => $option) { @@ -1247,119 +1364,139 @@ class SurveyBreak } # če imamo več kot 20 kategorij,izpisujemo samo tiste ki imajo vrednosti - $displayAll = (count($forSpremenljivka['options']) > 20) ? false : true; - - echo '
    '; - echo '
    '; - # za multi text razdelimo na grupe - skupine - $rowspan = ' rowspan="2"'; - $colspan = ' colspan="'.(count($spremenljivka['grids'][0]['variables'])).'"'; - foreach ($spremenljivka['grids'] AS $gkey => $grid) { - - // Ce smo v porocilu po meri in ni prava tabela jo preskocimo - if(isset($spremenljivka['break_sub_table']['sequence']) && $spremenljivka['break_sub_table']['key'] != $gkey){ - continue; - } - - // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova - if(!isset($spremenljivka['break_sub_table']['sequence'])){ - echo '
    '; - if($tip != '21'){ - echo ''; - echo $lang['srv_break_table_for']; - echo $spremenljivka['naslov'].' ('; - echo $spremenljivka['variable'].') = '; - echo $grid['naslov']; - echo ' ('.$grid['variable'].')'; - echo ''; - } - } - - echo ''; - #labele - echo ''; - echo ''; - echo ''; - echo ''; - echo $forSpremenljivka['naslov']; - echo '('.$forSpremenljivka['variable'].')'; - echo ''; - echo ''; - echo ''; - - echo ''; - echo ''; - echo ''; - echo $spremenljivka['naslov']. ' - '; - echo $grid['naslov']; - echo '('.$grid['variable'].')'; - echo ''; - echo ''; - echo ''; - echo''; - #labele - echo ''; - foreach ($grid['variables'] AS $vkey => $variable) { - echo ''; - } - echo ''; - $cntCbx= 0; - foreach ($forSequences AS $fKey => $forSequence) { - $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cntCbx]['naslov']; - $cntCbx++; - foreach ($forSpremenljivka['options'] AS $oKey => $option) { - if ($displayAll || $texts[$forSequence][$oKey] != null) { - if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) { - echo ''; - echo ''; - if ($forSpremenljivka['tip'] == 2) { - echo $cbxLabel; - } else { - echo $forSpremenljivka['options'][$oKey]; - } - echo ''; - foreach ($grid['variables'] AS $vkey => $variable) { - $sequence = $variable['sequence']; - #povprečje - echo ''; - - } - echo ''; - } - } - } - } - echo '
    '; - echo $variable['naslov']; - echo '('.$variable['variable'].')'; - echo '('.$variable['sequence'].')'; - echo '
    '; - if (count($texts[$forSequence][$oKey][$sequence]) > 0) { - $cnt=1; - $count = count($texts[$forSequence][$oKey][$sequence]); - foreach ($texts[$forSequence][$oKey][$sequence] AS $ky => $units) { - echo '
    '; - echo $units['text']; - echo '
    '; - $cnt++; - } - } - - - #echo $this->formatNumber($texts[$oKey][$sequence],$this->num_digit_average,''); - echo '
    '; - - - // Zvezdica za vkljucitev v porocilo - $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; - $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); - - echo '
    '; - } + $displayAll = (count($forSpremenljivka['options']) > 20) ? false : true; + + # za multi text razdelimo na grupe - skupine + $rowspan = ' rowspan="2"'; + $colspan = ' colspan="'.(count($spremenljivka['grids'][0]['variables'])).'"'; + + + foreach ($spremenljivka['grids'] AS $gkey => $grid) { + + // Ce smo v porocilu po meri in ni prava tabela jo preskocimo + if(isset($spremenljivka['break_sub_table']['sequence']) && $spremenljivka['break_sub_table']['key'] != $gkey){ + continue; + } + + echo '
    '; + + + echo '
    '; + + // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova + if(!isset($spremenljivka['break_sub_table']['sequence'])){ - echo '
    '; - + if($tip != '21'){ + echo '
    '; + + echo $lang['srv_break_table_for']; + echo $spremenljivka['naslov'].' ('; + echo $spremenljivka['variable'].') = '; + echo $grid['naslov']; + echo ' ('.$grid['variable'].')'; + + echo '
    '; + } + } + + // Zvezdica za vkljucitev v porocilo + $spr1 = $this->sessionData['break']['seq'].'-'. $this->sessionData['break']['spr'].'-undefined'; + $spr2 = $grid['variables'][0]['sequence'].'-'.$spremenljivka['id'].'-undefined'; + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=9, $sub_type=0, $spr1, $spr2); + + echo '
    '; + + + echo ''; + + + #labele + echo ''; + + echo ''; + + echo ''; + + echo''; + + + #labele + echo ''; + + foreach ($grid['variables'] AS $vkey => $variable) { + echo ''; + } + + echo ''; + + + $cntCbx= 0; + foreach ($forSequences AS $fKey => $forSequence) { + $cbxLabel = $forSpremenljivka['grids'][0]['variables'][$cntCbx]['naslov']; + $cntCbx++; + + foreach ($forSpremenljivka['options'] AS $oKey => $option) { + if ($displayAll || $texts[$forSequence][$oKey] != null) { + if(($forSpremenljivka['tip'] == 2 && $option == 1) || $forSpremenljivka['tip'] != 2 ) { + + echo ''; + + echo ''; + + foreach ($grid['variables'] AS $vkey => $variable) { + $sequence = $variable['sequence']; + #povprečje + echo ''; + } + + echo ''; + } + } + } + } + + echo '
    '; + echo ''; + echo ''; + echo $forSpremenljivka['naslov']; + echo '('.$forSpremenljivka['variable'].')'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo $spremenljivka['naslov']. ' - '; + echo $grid['naslov']; + echo '('.$grid['variable'].')'; + echo ''; + echo ''; + echo '
    '; + echo $variable['naslov']; + echo '('.$variable['variable'].')'; + echo '('.$variable['sequence'].')'; + echo '
    '; + if ($forSpremenljivka['tip'] == 2) { + echo $cbxLabel; + } + else { + echo $forSpremenljivka['options'][$oKey]; + } + echo ''; + if (count($texts[$forSequence][$oKey][$sequence]) > 0) { + $cnt=1; + $count = count($texts[$forSequence][$oKey][$sequence]); + foreach ($texts[$forSequence][$oKey][$sequence] AS $ky => $units) { + echo '
    '; + echo $units['text']; + echo '
    '; + $cnt++; + } + } + + echo '
    '; + + echo '
    '; + } } function displayCrosstabTable($forSpr,$frequencys,$spremenljivka){ @@ -1405,14 +1542,18 @@ class SurveyBreak // Ce smo v porocilu po meri in je prava tabelo jo izpisemo brez naslova if(!isset($spremenljivka['break_sub_table']['sequence']) && ($spremenljivka['tip'] == 16 || $spremenljivka['tip'] == 6) && $this->break_charts != 1){ - echo '
    '.$lang['srv_break_table_for']; + + echo '
    '; + + echo $lang['srv_break_table_for']; echo $spremenljivka['naslov'].' ('; echo $spremenljivka['variable'].') = '; echo $grid['naslov']; if ($spremenljivka['tip'] != 6) { echo ' ('.$grid['variable'].')'; } - echo ''; + + echo '
    '; } $seq2 = $grid['variables'][0]['sequence']; @@ -1434,11 +1575,9 @@ class SurveyBreak $this->SurveyCrosstab->setVariables($seq1,$spr1,$grd1,$seq2,$spr2,$grd2); $this->SurveyCrosstab->displayCrosstabsTable(); } - - echo '
    '; } - } + function getMeansFromKey($frequencys) { $sum = 0; if (count($frequencys['valid']) > 0) { @@ -1513,15 +1652,17 @@ class SurveyBreak echo '
    '; - echo ''.$lang['srv_custom_report_comments_add'].''; - + echo ''; + echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; echo ''; - echo ''; + echo ''; echo '
    '; @@ -1559,18 +1700,19 @@ class SurveyBreak function displayLinePercent() { global $lang; - echo ''; + + echo 'break_percent == 1 ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; + echo ''; } function displayLineCharts() { global $lang; - echo ''; - - echo ' '; - echo ' '; - - echo ''; + echo 'break_charts == 0 ? ' checked="checked" ' : '').' onClick="change_break_charts(this.value)" />'; + echo ''; + + echo 'break_charts == 1 ? ' checked="checked" ' : '').' onClick="change_break_charts(this.value)" />'; + echo ''; } + } \ No newline at end of file diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php index 2de81e818..75e50e39c 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php @@ -313,7 +313,6 @@ class SurveyChart { // prikazemo nastavitve if (self::$isArchive != true && self::$publicChart != true) { self::displayGlobalSettings(); - echo "
    \n"; } # preberemo header @@ -348,8 +347,17 @@ class SurveyChart { echo ''; + if (self::$dataFileStatus == FILE_STATUS_NO_DATA + || self::$dataFileStatus == FILE_STATUS_NO_FILE + || self::$dataFileStatus == FILE_STATUS_SRV_DELETED){ + + $noDataAlert ="noDataAlert"; + } else { + $noDataAlert =""; + } + if (self::$isArchive != true && self::$publicChart != true) { - self::displayBottomSettings(); + self::displayBottomSettings($noDataAlert); } @@ -6176,7 +6184,7 @@ class SurveyChart { $Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*220); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255); //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200); + //self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200); $Test->drawGraphArea(255,255,255,TRUE); // Pri checkboxu lahko naredimo fiksno skalo @@ -6318,7 +6326,7 @@ class SurveyChart { $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight+$addLegendSpace),5,255,255,255); //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight+$addLegendSpace),200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight+$addLegendSpace),200,200,200); $Test->drawGraphArea(255,255,255,TRUE); // Pri ordinalnih multigridih prikazemo skalo od 1 do stevila variabel (ce prikazujemo povprecja) @@ -6480,7 +6488,7 @@ class SurveyChart { $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255); //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200); $Test->drawGraphArea(255,255,255,TRUE); $Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText); $Test->drawGrid(4,TRUE,230,230,230,50); @@ -6572,8 +6580,7 @@ class SurveyChart { if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3){ $Test->setGraphArea(self::$quality*200,self::$quality*50,self::$quality*630,self::$quality*220); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*243,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*295,200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*295,200,200,200); $Test->drawGraphArea(255,255,255,TRUE); $Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE); $Test->drawHorGrid(4,TRUE,230,230,230,50); @@ -6582,8 +6589,7 @@ class SurveyChart { elseif($rightScale){ $Test->setGraphArea(self::$quality*270,self::$quality*50,self::$quality*530,self::$quality*(220+$addHeight)); $Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200); $Test->drawGraphArea(255,255,255,TRUE); $Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0/*SCALE_START0*/,0,0,0,TRUE,0,0,TRUE,1,$rightScale,$roundText=40); @@ -6592,8 +6598,7 @@ class SurveyChart { else{ $Test->setGraphArea(self::$quality*$startX,self::$quality*50,self::$quality*650,self::$quality*(220+$addHeight)); $Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(295+$addHeight),200,200,200); $Test->drawGraphArea(255,255,255,TRUE); $Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText); $Test->drawHorGrid(4,TRUE,230,230,230,50); @@ -6667,12 +6672,8 @@ class SurveyChart { $Test->setLineStyle(self::$quality,$DotSize=0); $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize); - //$Test->setGraphArea(50,40,685,220); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200); - //$Test->createColorGradientPalette(195,204,56,223,110,41,3); - //$Test->createColorGradientPalette(168,188,56,248,255,136,5); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200); // Pri vsoti ne izpisujemo procentov @@ -6743,13 +6744,8 @@ class SurveyChart { $Test->setLineStyle(self::$quality,$DotSize=0); $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize); - //$Test->setGraphArea(50,40,685,220); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200); - //$Test->createColorGradientPalette(195,204,56,223,110,41,3); - //$Test->createColorGradientPalette(168,188,56,248,255,136,5); - + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200); // Pri vsoti ne izpisujemo procentov if($spremenljivka['tip'] == 18 || ($spremenljivka['tip'] == 1 && self::$settings['type'] == 2 && self::$settings['value_type'] == 1)) @@ -6838,8 +6834,7 @@ class SurveyChart { $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize); $Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*220); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*273,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*275,200,200,200); $Test->drawGraphArea(255,255,255,TRUE); // Pri checkboxu lahko naredimo fiksno skalo @@ -6931,8 +6926,7 @@ class SurveyChart { $Test->setGraphArea(self::$quality*270,self::$quality*50,self::$quality*530,self::$quality*(220+$addHeight)); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*(243+$addHeight),5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*(245+$addHeight),200,200,200); $Test->drawGraphArea(255,255,255,TRUE); $Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,0,0,TRUE,1,$rightScale,$roundText=40); @@ -6996,11 +6990,7 @@ class SurveyChart { $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize); $Test->setGraphArea(self::$quality*100,self::$quality*40,self::$quality*650,self::$quality*320); $Test->drawFilledRoundedRectangle(self::$quality*7,self::$quality*7,self::$quality*793,self::$quality*343,5,255,255,255); - //$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128); - $Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*345,200,200,200); - //$Test->drawGraphArea(255,255,255,TRUE); - //$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,20,20,20,TRUE,$angle,0,TRUE,1,FALSE,$roundText); - //$Test->drawGrid(4,TRUE,230,230,230,50); + //$Test->drawRectangle(self::$quality*5,self::$quality*5,self::$quality*795,self::$quality*345,200,200,200); // Draw the 0 line $Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',self::$quality*self::$fontSize); @@ -7072,7 +7062,7 @@ class SurveyChart { //moznost osvezevanja grafov - ne uporabljamo zaenkrat if($admin_type < 2 && false) - echo ''; + echo ''; // Izrisemo ostale filtre SurveyAnalysis::DisplayFilters(self::$quality); @@ -7109,8 +7099,8 @@ class SurveyChart { echo '
      '; echo '
    • '; - echo $lang['srv_chart_hq'].': '; - echo ''; + echo ' '; + echo ' '; echo '
    • '; # nastavitev skina grafov @@ -7123,21 +7113,23 @@ class SurveyChart { } // Nastavitve na dnu - static function displayBottomSettings(){ + + static function displayBottomSettings($noDataAlert = ""){ global $site_path; global $lang; - echo '
      '; + echo '
      '; - echo ''.$lang['srv_custom_report_comments_add'].''; + echo ''; + + echo ''; + echo ''; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - - echo ''; - echo ''; + echo ''; + echo ''; echo '
      '; } @@ -7172,25 +7164,29 @@ class SurveyChart { static function displaySingleSettings($spid, $settings=0){ global $site_path; global $lang; + if (self::$publicChart == true) { return false; } + $spremenljivka = SurveyAnalysis::$_HEADERS[$spid]; // Ikone izvoza na vrhu posameznih nastavitev self::displayExportIcons($spid); - echo '
      '.$lang['srv_chart_settings_basic'].'
      '; - //echo ''; - echo '
      '.$lang['srv_chart_settings_advanced'].'
      '; + echo '
      '; + + + echo '
      '; + echo '
      '.$lang['srv_chart_settings_basic'].'
      '; + echo '
      '.$lang['srv_chart_settings_advanced'].'
      '; + echo '
      '; // OSNOVNE NASTAVITVE echo ''; @@ -7309,38 +7288,67 @@ class SurveyChart { self::displayAdvancedMultinumberSettings($spid, $settings); break; + default: + break; + } + + echo '
      '; + + echo '
      '; + } + + // Nastavitve posamezne tabele (odprti odgovori) + static function displaySingleSettingsTable($spid, $settings=0){ + global $site_path; + global $lang; + + if (self::$publicChart == true) { + return false; + } + + $spremenljivka = SurveyAnalysis::$_HEADERS[$spid]; + + // Ikone izvoza na vrhu posameznih nastavitev + self::displayExportIcons($spid, $hide_button=true); + + + echo '
      '; + + + echo '
      '.$lang['srv_chart_open_answers_settings'].'
      '; + + // OSNOVNE NASTAVITVE + echo '
      '; + + switch($spremenljivka['tip']){ + case 21: + case 4: + self::displayTableSettings($spid); + break; + + case 19: + self::displayMultitextSettings($spid, $settings); + break; + default: break; } - // Link na urejanje label - echo ''.$lang['srv_chart_advancedLink_labels'].''; - // Vprasajcek za pomoc - echo Help :: display('displaychart_settings_labels'); + // Preview vprasanja + echo '
      '; + echo ' '.$spremenljivka['variable'].''; + echo ' '; + SurveyAnalysis::showIcons($spid,$spremenljivka,$_from='charts'); + echo '
      '; + + echo '
      '; - // Link na urejanje barv - echo ''.$lang['srv_chart_advancedLink_colors'].''; - // Vprasajcek za pomoc - echo Help :: display('displaychart_settings_colors'); - - // Link na rekodiranje - echo ''.$lang['srv_chart_advancedLink_recoding'].''; - // Vprasajcek za pomoc - echo Help :: display('displaychart_settings_recoding'); - - // Link na napredne number (radio dropdown numeric, number, date) nastavitve - if(($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)) || $spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 8 || $spremenljivka['tip'] == 22){ - echo ''.$lang['srv_chart_advancedLink_limits'].''; - // Vprasajcek za pomoc - //echo Help :: display('displaychart_settings_number'); - } - - + echo '
      '; } // ikone na vrhu posameznih nastavitev (izvozi) - static function displayExportIcons($spid){ + static function displayExportIcons($spid, $hide_button=false){ global $site_path; global $lang; @@ -7351,18 +7359,22 @@ class SurveyChart { // linki echo ''; } @@ -7377,7 +7389,7 @@ class SurveyChart { if($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)){ // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -7390,7 +7402,7 @@ class SurveyChart { // tip izpisa vrednosti echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; @@ -7403,7 +7415,7 @@ class SurveyChart { if($settings['type'] < 5){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -7417,7 +7429,7 @@ class SurveyChart { // stevilo intervalov if($settings['type'] > 4){ echo '
      '; - echo $lang['srv_chart_interval'].': '; for($i=3; $i<=10; $i++){ echo ' '; @@ -7435,8 +7447,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 3 || $settings['type'] == 4){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -7446,7 +7458,7 @@ class SurveyChart { else{ // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -7464,7 +7476,7 @@ class SurveyChart { if($settings['type'] != 9){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -7478,7 +7490,7 @@ class SurveyChart { // tip izpisa vrednosti if($settings['type'] != 9){ echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; @@ -7493,8 +7505,8 @@ class SurveyChart { if($settings['type'] == 2 || $settings['type'] == 8){ echo '
      '; - echo $lang['srv_analiza_legenda'].': '; echo ''; + echo ''; echo '
      '; } @@ -7503,8 +7515,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 3 || $settings['type'] == 4 || $settings['type'] == 9){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -7523,8 +7535,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -7535,8 +7547,8 @@ class SurveyChart { $vars = count($spremenljivka['options']); $checked = ($settings['show_avg']=='1' || ($settings['show_avg']=='-1' && $vars == 5 && SurveyDataSettingProfiles :: getSetting('chartAvgText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showAvg'].': '; echo ''; + echo ''; echo '
      '; } @@ -7545,7 +7557,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -7555,23 +7567,13 @@ class SurveyChart { echo '
      '; } - - // 3D strukturni krog - /*if($settings['type'] == 2){ - echo '
      '; - - echo $lang['srv_chart_3d_pie'].': '; - echo ''; - - echo '
      '; - }*/ - + // Izpusti variable brez odgovora if(($spremenljivka['tip'] != 3 || !self::checkDropdownNumeric($spid)) && $settings['type'] != 9){ echo '
      '; - echo $lang['srv_chart_hideEmtyVar'].': '; echo ''; + echo ''; echo '
      '; } @@ -7580,8 +7582,8 @@ class SurveyChart { if($settings['barLabel'] == 1 && ($settings['type'] == 0 || $settings['type'] == 1)){ echo '
      '; - echo $lang['srv_chart_barLabelSmall'].': '; echo ''; + echo ''; echo '
      '; } @@ -7592,15 +7594,13 @@ class SurveyChart { $lestvica = SurveyAnalysis::getSpremenljivkaLegenda($spremenljivka,'skalaAsValue'); - echo $lang['srv_skala'].': '; - // Vprasajcek za pomoc - echo Help :: display('srv_skala_edit'); + echo ''; - echo ''; - echo ''.$lang['srv_skala_short_0'].''; - echo ' / '; - echo ''.$lang['srv_skala_short_1'].''; - + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; } } @@ -7612,7 +7612,7 @@ class SurveyChart { // omejitev skale echo '
      '; - echo $lang['srv_chart_base'].': '; echo ' '; echo ' '; @@ -7622,7 +7622,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -7643,7 +7643,7 @@ class SurveyChart { // Tip radarja if($settings['type'] == '5'){ echo '
      '; - echo $lang['srv_chart_radar_type'].': '; echo ' '; echo ' '; @@ -7655,7 +7655,7 @@ class SurveyChart { // Postavitev skale pri radarju if($settings['type'] == '5'){ echo '
      '; - echo $lang['srv_chart_radar_scale'].': '; echo ' '; echo ' '; @@ -7666,7 +7666,7 @@ class SurveyChart { // tip izpisa vrednosti echo '
      '; - echo $lang['srv_chart_valtype'].': '; if($settings['base'] != '1') echo ' '; @@ -7680,7 +7680,7 @@ class SurveyChart { if($settings['type'] != 5){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -7695,8 +7695,8 @@ class SurveyChart { if($settings['type'] == 2 || $settings['type'] == 7){ echo '
      '; - echo $lang['srv_analiza_legenda'].': '; echo ''; + echo ''; echo '
      '; } @@ -7705,8 +7705,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 3 || $settings['type'] == 4){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -7722,8 +7722,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -7731,7 +7731,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -7745,8 +7745,8 @@ class SurveyChart { // Izpusti variable brez odgovora echo '
      '; - echo $lang['srv_chart_hideEmtyVar'].': '; echo ''; + echo ''; echo '
      '; @@ -7754,8 +7754,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 6){ echo '
      '; - echo $lang['srv_chart_settings_fullScale'].': '; echo ''; + echo ''; echo '
      '; } @@ -7764,21 +7764,11 @@ class SurveyChart { if($settings['barLabel'] == 1 && ($settings['type'] == 0 || $settings['type'] == 1)){ echo '
      '; - echo $lang['srv_chart_barLabelSmall'].': '; echo ''; + echo ''; echo '
      '; } - - // 3D strukturni krog - /*if($settings['type'] == 2){ - echo '
      '; - - echo $lang['srv_chart_3d_pie'].': '; - echo ''; - - echo '
      '; - }*/ } // Nastavitve za number grafe (tip 7) @@ -7788,7 +7778,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -7803,7 +7793,7 @@ class SurveyChart { // tip izpisa vrednosti if($settings['type'] != 9){ echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; @@ -7817,7 +7807,7 @@ class SurveyChart { if($settings['type'] > 2 && $settings['type'] != 9){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -7831,14 +7821,12 @@ class SurveyChart { // stevilo intervalov if($settings['type'] < 3){ echo '
      '; - echo $lang['srv_chart_interval'].': '; for($i=3; $i<=10; $i++){ echo ' '; } echo ' '; - //echo ' '; - //echo ' '; echo ' '; echo ''; @@ -7848,47 +7836,10 @@ class SurveyChart { // prikaz legende echo '
      '; - echo $lang['srv_analiza_legenda'].': '; echo ''; + echo ''; echo '
      '; - - // div z nastavitvami za zgornjo in spodnjo mejo - /*echo '
      '.$lang['srv_chart_num_limit'].''; - - // min - echo '
      '; - - echo $lang['srv_chart_min'].': '; - echo ''; - - echo '
      '; - - // polodprt interval navzdol - echo '
      '; - - echo $lang['srv_chart_open_down'].': '; - echo ''; - - echo '
      '; - - // max - echo '
      '; - - echo $lang['srv_chart_max'].': '; - echo ''; - - echo '
      '; - - // polodprt interval navzgor - echo '
      '; - - echo $lang['srv_chart_open_up'].': '; - echo ''; - - echo '
      '; - - echo '
      ';*/ } // Nastavitve za number grafe (tip 7) @@ -7901,8 +7852,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -7912,8 +7863,8 @@ class SurveyChart { $checked = ($settings['show_avg']=='1' || ($settings['show_avg']=='-1' && SurveyDataSettingProfiles :: getSetting('chartAvgText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showAvg'].': '; echo ''; + echo ''; echo '
      '; } @@ -7922,8 +7873,8 @@ class SurveyChart { if($settings['type'] != 2){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -7932,8 +7883,8 @@ class SurveyChart { if($settings['barLabel'] == 1 && $settings['type'] != 2 && $settings['type'] != 9){ echo '
      '; - echo $lang['srv_chart_barLabelSmall'].': '; echo ''; + echo ''; echo '
      '; } @@ -7942,7 +7893,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -7961,7 +7912,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -7975,7 +7926,7 @@ class SurveyChart { // tip izpisa vrednosti if($settings['type'] < 3){ echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; @@ -7989,7 +7940,7 @@ class SurveyChart { if($settings['type'] > 2){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8003,56 +7954,17 @@ class SurveyChart { // stevilo intervalov if($settings['type'] < 3){ echo '
      '; - echo $lang['srv_chart_interval'].': '; for($i=3; $i<=10; $i++){ echo ' '; } echo ' '; - //echo ' '; - //echo ' '; echo ' '; echo ''; echo '
      '; } - - // div z nastavitvami za zgornjo in spodnjo mejo - /*echo '
      '.$lang['srv_chart_num_limit'].''; - - // min - echo '
      '; - - echo $lang['srv_chart_min'].': '; - echo ''; - - echo '
      '; - - // polodprt interval navdol - echo '
      '; - - echo $lang['srv_chart_open_down'].': '; - echo ''; - - echo '
      '; - - // max - echo '
      '; - - echo $lang['srv_chart_max'].': '; - echo ''; - - echo '
      '; - - // polodprt interval navgor - echo '
      '; - - echo $lang['srv_chart_open_up'].': '; - echo ''; - - echo '
      '; - - echo '
      ';*/ } // Nastavitve za datum grafe (tip 8) @@ -8065,8 +7977,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8074,7 +7986,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8095,7 +8007,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; // Pri nominalnih ne prikazujemo povprecij if($spremenljivka['skala'] != 1 && $spremenljivka['cnt_all'] != 1){ @@ -8120,15 +8032,13 @@ class SurveyChart { echo '
      '; if($settings['rotate']=='1'){ echo $lang['srv_chart_rotate_grids'].' '; - //echo ''; - echo ''; + echo ''; echo ''; echo ' '.$lang['srv_chart_rotate_vars'].' '; } else{ echo $lang['srv_chart_rotate_vars'].' '; - //echo ''; - echo ''; + echo ''; echo ''; echo ' '.$lang['srv_chart_rotate_grids']; } @@ -8139,7 +8049,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 5 || $settings['type'] == 6){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8153,7 +8063,7 @@ class SurveyChart { else{ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8169,7 +8079,7 @@ class SurveyChart { // tip izpisa vrednosti if(($settings['type'] > 0 && $settings['type'] < 5) || $settings['type'] == 7){ echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; @@ -8182,7 +8092,7 @@ class SurveyChart { // Tip radarja if($settings['type'] == 5 || $settings['type'] == 7){ echo '
      '; - echo $lang['srv_chart_radar_type'].': '; echo ' '; echo ' '; @@ -8194,7 +8104,7 @@ class SurveyChart { // Postavitev skale pri radarju if($settings['type'] == 5 || $settings['type'] == 7){ echo '
      '; - echo $lang['srv_chart_radar_scale'].': '; echo ' '; echo ' '; @@ -8207,8 +8117,8 @@ class SurveyChart { if($spremenljivka['enota'] == 1 && ($settings['type'] == 2 || $settings['type'] == 6)){ echo '
      '; - echo $lang['srv_chart_right_scale'].': '; echo ''; + echo ''; echo '
      '; } @@ -8217,8 +8127,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 5 || $settings['type'] == 6){ echo '
      '; - echo $lang['srv_analiza_legenda'].': '; echo ''; + echo ''; echo '
      '; } @@ -8227,8 +8137,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1 || $settings['type'] == 2){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -8246,8 +8156,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8255,7 +8165,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 2 || $settings['type'] == 4){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8269,8 +8179,8 @@ class SurveyChart { // Izpusti variable brez odgovora echo '
      '; - echo $lang['srv_chart_hideEmtyVar'].': '; echo ''; + echo ''; echo '
      '; @@ -8278,8 +8188,8 @@ class SurveyChart { if($settings['barLabel'] == 1 && $settings['type'] == 0){ echo '
      '; - echo $lang['srv_chart_barLabelSmall'].': '; echo ''; + echo ''; echo '
      '; } @@ -8288,27 +8198,25 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 5 || $settings['type'] == 6){ echo '
      '; - echo $lang['srv_chart_noFixedScale'].': '; echo ''; + echo ''; echo '
      '; } // Preklop med ordinalno in nominalno spremenljivko - echo '
      '; - - $lestvica = SurveyAnalysis::getSpremenljivkaLegenda($spremenljivka,'skalaAsValue'); + echo '
      '; - echo $lang['srv_skala'].': '; - // Vprasajcek za pomoc - echo Help :: display('srv_skala_edit'); - - echo ''; - echo ''.$lang['srv_skala_short_0'].''; - echo ' / '; - echo ''.$lang['srv_skala_short_1'].''; + $lestvica = SurveyAnalysis::getSpremenljivkaLegenda($spremenljivka,'skalaAsValue'); + + echo ''; + + echo '
      '; + echo ''; + echo ''; + echo '
      '; - echo '
      '; + echo '
      '; } // Nastavitve za dvojne multigrid grafe (tip 6, enota 3) @@ -8320,7 +8228,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -8335,7 +8243,7 @@ class SurveyChart { // Tip radarja if($settings['type'] == '4'){ echo '
      '; - echo $lang['srv_chart_radar_type'].': '; echo ' '; echo ' '; @@ -8347,7 +8255,7 @@ class SurveyChart { // Postavitev skale pri radarju if($settings['type'] == '4'){ echo '
      '; - echo $lang['srv_chart_radar_scale'].': '; echo ' '; echo ' '; @@ -8360,8 +8268,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -8379,8 +8287,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8388,7 +8296,7 @@ class SurveyChart { if($settings['type'] == 0){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8402,8 +8310,8 @@ class SurveyChart { // zacni skalo z 0 echo '
      '; - echo $lang['srv_chart_noFixedScale'].': '; echo ''; + echo ''; echo '
      '; } @@ -8415,7 +8323,7 @@ class SurveyChart { // omejitev skale echo '
      '; - echo $lang['srv_chart_base'].': '; echo ' '; echo ' '; @@ -8425,7 +8333,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; if($settings['base'] == '1'){ echo ' '; @@ -8443,7 +8351,7 @@ class SurveyChart { // sortiranje echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8458,15 +8366,13 @@ class SurveyChart { if($settings['rotate']=='1'){ echo $lang['srv_chart_rotate_grids'].' '; - //echo ''; - echo ''; + echo ''; echo ''; echo ' '.$lang['srv_chart_rotate_vars'].' '; } else{ echo $lang['srv_chart_rotate_vars'].' '; - //echo ''; - echo ''; + echo ''; echo ''; echo ' '.$lang['srv_chart_rotate_grids']; } @@ -8475,7 +8381,7 @@ class SurveyChart { // Tip radarja if($settings['type'] == '4'){ echo '
      '; - echo $lang['srv_chart_radar_type'].': '; echo ' '; echo ' '; @@ -8487,7 +8393,7 @@ class SurveyChart { // Postavitev skale pri radarju if($settings['type'] == '4'){ echo '
      '; - echo $lang['srv_chart_radar_scale'].': '; echo ' '; echo ' '; @@ -8498,7 +8404,7 @@ class SurveyChart { // tip izpisa vrednosti echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; @@ -8512,8 +8418,8 @@ class SurveyChart { if($settings['type'] == 2 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -8529,8 +8435,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8538,7 +8444,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8552,8 +8458,8 @@ class SurveyChart { // Izpusti variable brez odgovora echo '
      '; - echo $lang['srv_chart_hideEmtyVar'].': '; echo ''; + echo ''; echo '
      '; } @@ -8565,7 +8471,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -8580,7 +8486,7 @@ class SurveyChart { // Tip radarja if($settings['type'] == '4'){ echo '
      '; - echo $lang['srv_chart_radar_type'].': '; echo ' '; echo ' '; @@ -8592,7 +8498,7 @@ class SurveyChart { // Postavitev skale pri radarju if($settings['type'] == '4'){ echo '
      '; - echo $lang['srv_chart_radar_scale'].': '; echo ' '; echo ' '; @@ -8605,7 +8511,7 @@ class SurveyChart { if($settings['type'] != '4'){ echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8620,8 +8526,8 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 5){ echo '
      '; - echo $lang['srv_analiza_legenda'].': '; echo ''; + echo ''; echo '
      '; } @@ -8630,8 +8536,8 @@ class SurveyChart { if($settings['type'] == 2 || $settings['type'] == 3){ echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -8647,8 +8553,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8656,7 +8562,7 @@ class SurveyChart { if($settings['type'] == 2){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8671,21 +8577,11 @@ class SurveyChart { if($settings['barLabel'] == 1 && ($settings['type'] == 2 || $settings['type'] == 3)){ echo '
      '; - echo $lang['srv_chart_barLabelSmall'].': '; echo ''; + echo ''; echo '
      '; } - - // 3D strukturni krog - /*if($settings['type'] == 0){ - echo '
      '; - - echo $lang['srv_chart_3d_pie'].': '; - echo ''; - - echo '
      '; - }*/ } // Nastavitve za ranking grafe (tip 17) @@ -8695,12 +8591,11 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; echo ' '; - //echo ' '; echo ''; echo '
      '; @@ -8708,7 +8603,7 @@ class SurveyChart { // sortiranje echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8720,11 +8615,10 @@ class SurveyChart { // tip izpisa vrednosti echo '
      '; - echo $lang['srv_chart_valtype'].': '; echo ' '; echo ' '; - //echo ' '; echo ''; echo '
      '; @@ -8732,8 +8626,8 @@ class SurveyChart { // prikaz label v stolpcih echo '
      '; - echo $lang['srv_chart_barLabel'].': '; echo ''; + echo ''; echo '
      '; } @@ -8748,8 +8642,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8757,7 +8651,7 @@ class SurveyChart { if($settings['type'] == 0 || $settings['type'] == 1){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8772,8 +8666,8 @@ class SurveyChart { if($settings['barLabel'] == 1 && $settings['type'] == 0){ echo '
      '; - echo $lang['srv_chart_barLabelSmall'].': '; echo ''; + echo ''; echo '
      '; } @@ -8782,8 +8676,8 @@ class SurveyChart { if($settings['type'] == 0){ echo '
      '; - echo $lang['srv_chart_noFixedScale'].': '; echo ''; + echo ''; echo '
      '; } @@ -8796,7 +8690,7 @@ class SurveyChart { // Tip grafa echo '
      '; - echo $lang['srv_chart_type'].':
      '; echo ' '; echo ' '; @@ -8809,7 +8703,7 @@ class SurveyChart { // sortiranje echo '
      '; - echo $lang['srv_chart_sort'].': '; echo ' '; echo ' '; @@ -8824,15 +8718,13 @@ class SurveyChart { if($settings['rotate']=='1'){ echo $lang['srv_chart_rotate_grids'].' '; - //echo ''; - echo ''; + echo ''; echo ''; echo ' '.$lang['srv_chart_rotate_vars'].' '; } else{ echo $lang['srv_chart_rotate_vars'].' '; - //echo ''; - echo ''; + echo ''; echo ''; echo ' '.$lang['srv_chart_rotate_grids']; } @@ -8841,7 +8733,7 @@ class SurveyChart { // Tip radarja if($settings['type'] == '0'){ echo '
      '; - echo $lang['srv_chart_radar_type'].': '; echo ' '; echo ' '; @@ -8853,7 +8745,7 @@ class SurveyChart { // Postavitev skale pri radarju if($settings['type'] == '0'){ echo '
      '; - echo $lang['srv_chart_radar_scale'].': '; echo ' '; echo ' '; @@ -8873,8 +8765,8 @@ class SurveyChart { $checked = ($settings['show_numerus']=='1' || ($settings['show_numerus']=='-1' && SurveyDataSettingProfiles :: getSetting('chartNumerusText') == 1)) ? ' checked="checked"': ''; - echo $lang['srv_chart_showNumerus'].': '; echo ''; + echo ''; echo '
      '; @@ -8882,7 +8774,7 @@ class SurveyChart { if($settings['type'] == 2){ echo '
      '; - echo $lang['srv_wide_chart'].': '; echo ' '; echo ' '; @@ -8901,19 +8793,19 @@ class SurveyChart { // Tip tabele echo '
      '; - echo $lang['srv_chart_table_type'].':
      '; echo ' '; echo ' '; echo ''; echo '
      '; - - //Poravnava texta + + // Poravnava texta echo '
      '; - echo $lang['srv_chart_table_align'].': '; echo ''; + echo ''; echo '
      '; } @@ -8925,7 +8817,7 @@ class SurveyChart { // Tip tabele echo '
      '; - echo $lang['srv_chart_table_type'].':
      '; echo ' '; echo ' '; @@ -8939,25 +8831,28 @@ class SurveyChart { global $site_path; global $lang; - echo '
      '; - echo ''.$lang['srv_chart_settings'].''; - - //Poravnava texta - echo '
      '; - - echo $lang['srv_chart_table_align'].': '; - echo ''; + echo '
      '; + echo '
      '.$lang['srv_chart_open_answers_settings'].'
      '; + + + echo '
      '; + + // Poravnava texta + echo '
      '; + echo ' '; + echo ' '; echo '
      '; - //Prikaz frekvenc + // Prikaz frekvenc echo '
      '; - - echo $lang['srv_chart_table_freq'].': '; - echo ''; - + echo ' '; + echo ' '; echo '
      '; + echo '
      '; + + echo '
      '; } @@ -8972,41 +8867,9 @@ class SurveyChart { echo '

      '.$spremenljivka['variable'].' - '.$spremenljivka['naslov'].'

      '; echo ''; - + echo '
      '; - - echo ''; - echo ''; - echo ''; - echo ''; - - // urejanje label - echo '
      '; - self::displayAdvancedSettingsLabels($spid); - echo '
      '; - - // urejanje barv - echo ''; - - // urejanje mej pri numericih - if(($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)) || $spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 8 || $spremenljivka['tip'] == 22){ - echo ''; - } - - /* REKODIRANJE */ - echo ''; - - echo '
      '; - + echo '
      '; /* ZAVIHKI NA DESNI */ echo '
      '; @@ -9029,21 +8892,48 @@ class SurveyChart { } echo '
    '; - echo ''; + echo ''; + + echo ''; + echo ''; + echo ''; + echo ''; + + // urejanje label + echo '
    '; + self::displayAdvancedSettingsLabels($spid); + echo '
    '; + + // urejanje barv + echo '
    '; + self::displayAdvancedSettingsColors($spid); + echo '
    '; + + // urejanje mej pri numericih + if(($spremenljivka['tip'] == 3 && self::checkDropdownNumeric($spid)) || $spremenljivka['tip'] == 7 || $spremenljivka['tip'] == 8 || $spremenljivka['tip'] == 22){ + echo ''; + } + + /* REKODIRANJE */ + echo '
    '; + $spr_id=explode('_',$spid); + + $vmv = new RecodeValues(self::$anketa,$spr_id[0]); + $vmv->DisplayMissingValuesForQuestion(false); + echo '
    '; + + echo ''; + + echo ''; #wrap /* GUMBI NA DNU */ - echo '
    '; - - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; - - echo ''; - echo ''.$lang['srv_potrdi'].''; - echo ''; - - echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; } // Urejanje barv posameznega grafa @@ -9082,11 +8972,12 @@ class SurveyChart { } // reset na default barvo - echo '
    '.$lang['srv_chart_advanced_default_color'].''; + echo ''; // nastavitev ene od palet - echo '
    '.$lang['srv_chart_advanced_skin'].': '; - echo ''; echo ' '.$lang['srv_chart_skin_1ka'].''; echo ' '.$lang['srv_chart_skin_0'].''; echo ' '.$lang['srv_chart_skin_1'].''; @@ -9103,7 +8994,7 @@ class SurveyChart { } - echo ''; + echo '

    '; } @@ -9114,18 +9005,24 @@ class SurveyChart { $row = Cache::srv_spremenljivka($spid); $disabled = ($row['edit_graf'] == 0) ? ' disabled="disabled"' : ''; + $gray = ($row['edit_graf'] == 0) ? ' gray' : ''; - echo '

    '; - echo $lang['srv_chart_advanced_useLabels'].':'; - echo '

    '; + echo $lang['srv_chart_advanced_useLabels'].':

    '; + echo ''; + echo ''; - echo '
    '; + echo '
    '; + + echo '

    '.$lang['srv_notifications_send_title'].':

    '; - echo '
    '; // Urejanje naslova spremenljivke $text = $row['naslov_graf'] == '

    ' ? $row['naslov'] : $row['naslov_graf']; @@ -9133,9 +9030,7 @@ class SurveyChart { $text = substr($text, 3); $text = substr($text, 0, -4); } - echo '

    '; - echo ''; - echo '

    '; + echo ''; // Urejanje label za gride @@ -9169,7 +9064,7 @@ class SurveyChart { $sql1 = sisplet_query("SELECT naslov, naslov_graf FROM srv_grid WHERE id='$i' AND spr_id='$spid'"); $row1 = mysqli_fetch_array($sql1); $text = $row1['naslov_graf'] == '' ? $row1['naslov'] : $row1['naslov_graf']; - echo '
    '; + echo '
    '; if(self::$settings['type']==1){ - echo ''; + echo ''; + #odgovori echo ''; echo ''; echo ''; - // konec naslovne vrstice } $_answersOther = array(); @@ -9492,8 +9387,8 @@ class SurveyChart { echo ''; // Izpisemo nastavitve za tabele - echo '
    '; - self::displaySingleSettings($spid); + echo '
    '; + self::displaySingleSettingsTable($spid); echo '
    '; # izpišemo še tekstovne odgovore za polja drugo @@ -9789,7 +9684,7 @@ class SurveyChart { echo '
    '.$stevilcenje . $title.'
    '; - echo '
    '.$lang['srv_analiza_frekvence_titleAnswers'] . ''. $lang['srv_analiza_frekvence_titleFrekvenca'] .'
    ' . NEW_LINE; + echo '
    ' . NEW_LINE; $counter = 0; $_kumulativa = 0; @@ -9843,6 +9738,7 @@ class SurveyChart { return; } + echo '
    '; //div za pozicijo popupa echo '
    '; @@ -9862,16 +9758,17 @@ class SurveyChart { $_all_valid_answers_cnt = $_answers['validCnt']; $_valid_answers = $_answers['valid']; + # tekst vprašanja - echo '
    ' . NEW_LINE; + echo '
    ' . NEW_LINE; # naslovna vrstica if(self::$settings['type']==1){ - echo ''; - #odgovori - echo ''; + echo ''; - echo ''; + #odgovori + echo ''; + echo ''; echo ''; } @@ -9880,17 +9777,19 @@ class SurveyChart { $_answersOther = array(); $_grids_count = count($spremenljivka['grids']); if ($_grids_count > 0) { + # naslovna vrstica $_row = $spremenljivka['grids'][0]; - echo ''; - echo ''; + + echo ''; + + echo ''; if (count($_row['variables'])>0) foreach ($_row['variables'] AS $rid => $_col ){ $_sequence = $_col['sequence']; # id kolone z podatki if ($_col['other'] != true) { - echo ''; } else { @@ -9925,8 +9824,9 @@ class SurveyChart { if ($variable['other'] != true) { # tabela z navedbami - echo '
    '.$lang['srv_analiza_opisne_subquestion'] . '
    '. $lang['srv_analiza_opisne_arguments'] .''.$lang['srv_analiza_opisne_subquestion'] . ''. $lang['srv_analiza_opisne_arguments'] .'
     
     '; - // echo $_col['variable']; + echo ''; echo $_col['naslov']; echo ''; - echo ''; + echo ''; } - # če mamo checkboxe in sumo malo razmaknemo - if ($addVerticalSpace == 1) { - echo ''; - } // vedno rišemo zadnji stolpec. - echo ''; echo ' '; - echo ' '; - echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ' '; - echo ' '; - + echo ' '; + echo ' '; echo ' '; echo ' '; // Vsebina tabele echo ' '; + $userAccess = UserAccess::getInstance($global_user_id); + foreach($data as $usr_id => $data_row){ + $package_name = $userAccess->getPackageName($data_row['package_id']); + echo ''; - echo ''; - echo ''; echo ''; - echo ''; + + //Sklanjanje za število mesecev + if ($data_row['trajanje'] == 1) + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_1']; + else if ($data_row['trajanje'] == 2) + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_2']; + else if ($data_row['trajanje'] == 3 || $data_row['trajanje'] == 4) + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_3_4']; + else + $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_5']; + + echo ''; + + //Veljavnost paketa + $meseci = $data_row['trajanje']; + $veljaven_do = date("j.n.Y H:i", strtotime("+$meseci months", strtotime($data_row['time']))); + + echo ''; // Cena $cena = $this->getPrice($data_row['package_name'], $data_row['trajanje'], $data_row['discount'], $data_row['time']); // Zavezanec iz tujine nima ddv-ja if($this->isWithoutDDV($data_row['id'])) - echo ''; + echo ''; else - echo ''; + echo ''; if($data_row['status'] == '0') $status_color = 'red'; @@ -402,12 +475,13 @@ class UserNarocila{ echo ''; // PDF - echo ''; + if($data_row['status'] == '1'){ - echo ' | '.$lang['srv_narocilo_pdf_racun'].''; + echo ''; } - echo ''; + else + echo ''; echo ''; } @@ -426,9 +500,9 @@ class UserNarocila{ // Filtri po statusu echo '
    '; - echo ''; - echo ''; - echo ''; + echo ' narocila_filter['neplacana'] == 1 ? 'checked="checked"' : '').' onClick="filterNarocila(\'0\', this.checked)">'; + echo ' narocila_filter['placana'] == 1 ? 'checked="checked"' : '').' onClick="filterNarocila(\'1\', this.checked)">'; + echo ' narocila_filter['stornirana'] == 1 ? 'checked="checked"' : '').' onClick="filterNarocila(\'2\', this.checked)">'; echo '
    '; echo '
    '; + + echo ''; $index=0; if (count($_valid_answers) > 0) { @@ -9970,8 +9870,8 @@ class SurveyChart { echo ''; // Izpisemo nastavitve za tabele - echo '
    '; - self::displaySingleSettings($spid); + echo '
    '; + self::displaySingleSettingsTable($spid); echo '
    '; echo '
    '; @@ -10536,16 +10436,15 @@ class SurveyChart { global $lang; - echo '

    '.$lang['srv_chart_skin_long'].'

    '; - echo ''.$lang['srv_chart_skin_info'].'

    '; - - // Opozorilo na vrhu + echo '

    '.$lang['srv_chart_skin_long'].'

    '; + echo ''; + + // Opozorilo - privzetih ne morejo spreminjati if(!is_numeric($skin)){ echo '
    '; echo $lang['srv_chart_skin_warning']; echo '
    '; - echo '
    '."\n"; - } + } echo ''; + echo '
    '; echo '
    '; - + // Prednastavljeni skini - echo ''.$lang['srv_chart_skin_default'].':'; - echo ''; - echo ''; + echo '

    '.$lang['srv_chart_skin_default'].':

    '; + echo '
    '; + echo '
    '; echo '
    '.$lang['srv_chart_skin_1ka'].'
    '; echo '
    '.$lang['srv_chart_skin_0'].'
    '; @@ -10583,34 +10483,39 @@ class SurveyChart { echo '
    '.$lang['srv_chart_skin_4'].'
    '; echo '
    '.$lang['srv_chart_skin_5'].'
    '; - echo ''; - echo ''; + echo '
    '; + echo '
    '; // Custom kreirani skini $custom_skins = self::getCustomSkins(); - echo ''.$lang['srv_chart_skin_custom'].':'; - echo ''; - echo ''; + echo '

    '.$lang['srv_chart_skin_custom'].':

    '; + echo '
    '; + echo '
    '; foreach ($custom_skins as $custom_skin ){ echo '
    '.$custom_skin['name'].'
    '; } - echo ''; - echo ''; + echo '
    '; + echo '
    '; // Ce je izbran custom skin imamo na dnu gumba brisi in preimenuj if(is_numeric($skin)){ - echo ''.$lang['srv_rename_profile'].'
    '."\n"; - echo ''.$lang['srv_delete_profile'].''."\n"; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; } - echo '
    '; + echo '
    '; #left - echo '
    '; + echo '
    '; + + echo '

    '.$lang['srv_chart_skin_long2'].':

    '; // ce je numeric je custom skin if(is_numeric($skin)){ @@ -10623,70 +10528,101 @@ class SurveyChart { else{ // preview za default skine echo '
    '; - echo $lang['srv_chart_skin_preview'].':'; + echo '

    '.$lang['srv_chart_skin_preview'].'

    '; self::displayChartSkinPreview($skin); echo '
    '; $default_colors = self::getDefaultColors($skin); } - - // Izbira custom skina - echo '
    '; - - echo '
    '; - for($i=0; $i<7; $i++){ $name = 'color'.($i+1); //$value = (self::$settings['colors'][$i] != '') ? self::$settings['colors'][$i] : $default_colors[$i]; $value = $default_colors[$i]; - echo '
    '; + echo '
    '; } // reset na default barvo - echo '
    '.$lang['srv_chart_advanced_default_color'].''; - - echo '
    '; + echo ''; - echo '
    '; + echo '
    '; #middle + echo '
    '; + // Izbira custom skina + echo '
    '; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo '
    '; + + echo '
    '; #right + echo ''; #wrap + // cover Div - echo '
    '."\n"; + echo '
    '; // div za kreacijo novega - echo '
    '.$lang['srv_missing_profile_name'].': '."\n"; - echo ''."\n"; - echo ''.$lang['srv_analiza_arhiviraj_save'].''."\n"; - echo ''.$lang['srv_close_profile'].''."\n"; - echo '
    '."\n"; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; // div za preimenovanje - echo '
    '.$lang['srv_missing_profile_name'].': '."\n"; - echo ''."\n"; - echo ''."\n"; - echo ''.$lang['srv_rename_profile_yes'].''."\n"; - echo ''.$lang['srv_close_profile'].''."\n"; - echo '
    '."\n"; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; // div za brisanje - echo '
    '.$lang['srv_missing_profile_delete_confirm'].': ' . $custom_skin['name'] . '?'."\n"; - echo ''."\n"; - echo ''.$lang['srv_delete_profile_yes'].''."\n"; - echo ''.$lang['srv_close_profile'].''."\n"; - echo '
    '."\n"; - - - echo ''; + echo '
    '; - echo '
    '; + + echo $lang['srv_missing_profile_delete_confirm'].': ' . $custom_skin['name'] . '?'; + echo ''."\n"; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + echo ''; + echo '
    '; + + echo '
    '; - echo ''; - echo ''; - echo ''; - - echo ''; } static function displayChartSkinPreview ($skin) { diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php index 44398adb4..6b41fe0e3 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyCrosstabs.php @@ -106,6 +106,11 @@ class SurveyCrosstabs { SurveyInfo :: getInstance()->SurveyInit($this->sid); $this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString(); + // Pri glasovanju tega ne pustimo + if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){ + die(); + } + $this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/'; # Inicializiramo in polovimo nastavitve missing profila @@ -366,66 +371,95 @@ class SurveyCrosstabs { * */ function Display() { + global $lang; + # preberemo prednastavljene variable iz seje, če obstajajo $this->presetVariables(); if ($this->dataFileStatus == FILE_STATUS_NO_DATA - || $this->dataFileStatus == FILE_STATUS_NO_FILE - || $this->dataFileStatus == FILE_STATUS_SRV_DELETED){ + || $this->dataFileStatus == FILE_STATUS_NO_FILE + || $this->dataFileStatus == FILE_STATUS_SRV_DELETED){ + return false; } - global $lang; - # polovimo nastavtve missing profila - //$this->missingProfileData = SurveyMissingProfiles::getProfile($this->currentMissingProfile); + echo '
    '; + // Izbira spremenljivk echo '
    '; $resultIsCheckbox = $this->DisplayDropdows(); echo '
    '; - echo '
    ' ; + + + // Nastavitve + echo '
    '; + + echo '
    '; + echo $lang['srv_analiza_crosstab_table_settings'].':'; + echo '
    '; + $this->displayLinePercent(); $this->displayResidual(); $this->displayShowChart(); + + echo '
    '; + + + // Nastavitve 2 if ( $resultIsCheckbox['is_check']) { - echo '
    '; - echo 'crossNavVsEno == 0 ? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'. - ''; - echo 'crossNavVsEno == 1? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'. - ''; - echo '
    '; + + echo '
    '; + + echo '
    '; + echo $lang['srv_analiza_crosstab_answer_settings'].':'; + echo '
    '; + + echo '
    '; + echo ' crossNavVsEno == 0 ? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' crossNavVsEno == 1? ' checked="checked" ' : '' ).' onchange="change_crosstab(); return false;" autocomplete="off">'; + echo ' '; + echo '
    '; + + echo '
    '; } - echo '
    '; + + echo '
    '; - - $this->displayExport(); - $this->displayCrosstabCheckboxes(); - echo '
    '; + + // Tabele + echo '
    '; $this->displayCrosstabsTables(); echo '
    '; } function DisplayDropdows() { global $lang; + $variables = $this->getVariableList(); $multiple = true; - echo '
    '; + + echo '
    '; # iz header datoteke preberemo spremenljivke #js: $("#crosstab_variable_1, #crosstab_variable_2").live('click', function() {}) if (count($this->variabla1) > 0) { - $br=null; - echo $lang['srv_crosstab_label1'].'
    '; - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ''; - } + + echo '
    '.$lang['srv_crosstab_label1'].'
    '; + + echo '
    '; + foreach($this->variabla1 AS $_key => $variabla1) { - echo $_br; - echo ''; + + echo '
    '; - echo ''; # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) { @@ -443,41 +477,54 @@ class SurveyCrosstabs { } echo ''; + + // Gumb odstrani + echo '
    '; if (count($this->variabla1) > 1) { - echo ''; - } else { - #echo ' '; - } + echo ''; + } + echo '
    '; - $_br = '
     '; - echo ''; + echo '
    '; + } + + echo '
    '; + + + if ((int)$this->variabla1['0']['seq'] > 0) { + echo ''; } - $_br = null; } echo '
    '; + + echo '
    '; - echo '
    '; + if ($this->isSelectedBothVariables()) { - echo ''; - } else { - echo ''; + echo ''; + } + else { + echo ''; } + echo '
    '; + echo '
    '; - echo $lang['srv_crosstab_label2'].'
    '; + + echo '
    '.$lang['srv_crosstab_label2'].'
    '; + # za vsako novo spremenljivko 2 nardimo svoj select if (count($this->variabla2) > 0) { - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ''; - } - + + echo '
    '; + foreach($this->variabla2 AS $_key => $variabla2) { - echo $_br; - echo ''; + + echo '
    '; - echo ''; - if (count($this->variabla2) > 1) { - echo ''; - } else { - echo ' '; - } - $_br = '
     '; - echo ''; + echo ''; + + // Gumb odstrani + echo '
    '; + if (count($this->variabla2) > 1) { + echo ''; + } + echo '
    '; + + echo '
    '; + } + + echo '
    '; + + + if ((int)$this->variabla1['0']['seq'] > 0) { + echo ''; } } + echo '
    '; + # če je katera od variabel checkbox, ponudimo možnodt izbire ali po enotah ali po navedbah $is_check = false; if (count($this->variabla2) > 0) { @@ -545,10 +603,12 @@ class SurveyCrosstabs { if ($which == '1') { - echo '
    '; - echo ' '; - echo ''; + + # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) { echo ''; } @@ -563,18 +623,25 @@ class SurveyCrosstabs { } echo ''; - echo ''; - - } else { - echo '
    '; - echo ' '; - echo ''; # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ((int)$this->variabla1['0']['seq'] > 0) { echo ''; - } else { + } + else { # če druga variabla ni izbrana dodamo tekst za izbiro druge variable echo ''; } @@ -588,8 +655,15 @@ class SurveyCrosstabs { . $variable['variableNaslov'] .$variable['sequence']. ''; } + echo ''; - echo ''; + + // Gumb odstrani + echo '
    '; + echo ' '; + echo '
    '; + + echo '
    '; } } /** @@ -598,83 +672,56 @@ class SurveyCrosstabs { function displayCrosstabCheckboxes () { global $lang; - echo '
    isSelectedBothVariables() && $this->doColor ? '' : ' class="hidden"').'>' ; + echo '
    isSelectedBothVariables() && $this->doColor ? '' : ' class="hidden"').'>' ; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - //echo ''; - echo ''; - echo '
    -      +'.$lang['srv_more'].'
    '; - echo ''; - echo ''; - echo Help :: display('srv_crosstab_residual'); - echo ''; - - echo ''; - - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '.$lang['srv_analiza_crosstab_adjs_residual_long'].':    +-
      '.$lang['srv_crosstab_residual_3_0'].'  
      '.$lang['srv_crosstab_residual_2_0'].'  
      '.$lang['srv_crosstab_residual_1_0'].'  
    '; - //echo ''.$lang['srv_residual_link_faq'].''; - echo '
    '; - echo ''.$lang['srv_less'].''; - echo ''; - echo Help :: display('srv_crosstab_residual'); - echo ''; - echo '
    '; - - - echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
        
    '; - echo '
    '; - echo ''; - echo Help :: display('srv_crosstab_residual2'); - echo ''; - - echo '
    '; - - - echo ''; + echo '
    '; + + echo ''.$lang['srv_analiza_crosstab_adjs_residual_short'].' '.Help :: display('srv_crosstab_residual').':'; + + echo '
    '; + echo '
    -
    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    +
    '; + echo '
    '; + + echo '
    '; + + + /*echo '
    '; + + echo ''.Help :: display('srv_crosstab_residual').''; + + echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '.$lang['srv_analiza_crosstab_adjs_residual_long'].':    +-
      '.$lang['srv_crosstab_residual_3_0'].'  
      '.$lang['srv_crosstab_residual_2_0'].'  
      '.$lang['srv_crosstab_residual_1_0'].'  
    '; + + echo '
    ';*/ + + + echo '
    '; + + echo ''.$lang['srv_analiza_crosstab_residuals'].' '.Help::display('srv_crosstab_residual2').':'; + + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + echo '
    '; + + echo '
    '; + echo ''; - echo '
    '; } public function displayCrosstabsTables() { @@ -708,9 +755,9 @@ class SurveyCrosstabs { $this->_CURRENT_LOOP = $loop; echo '

    '.$lang['srv_zanka_note'].$loop['text'].'

    '; $this->displayCrosstabsTable(); - echo '
    '; } - } else { + } + else { $this->displayCrosstabsTable(); } } @@ -720,9 +767,11 @@ class SurveyCrosstabs { global $admin_type; if ($this->getSelectedVariables(1) !== null && $this->getSelectedVariables(2) !== null) { + $variables1 = $this->getSelectedVariables(2); $variables2 = $this->getSelectedVariables(1); $counter = 0; + foreach ($variables1 AS $v_first) { foreach ($variables2 AS $v_second) { @@ -754,19 +803,22 @@ class SurveyCrosstabs { $numColumnPercent = $this->crossChk1 + $this->crossChk2 + $this->crossChk3; $numColumnResidual = $this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR; $tblColumn = max($numColumnPercent,$numColumnResidual); - } else if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { + } + else if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { # imamo samo procente $rowSpan = 2; $numColumnPercent = $this->crossChk1 + $this->crossChk2 + $this->crossChk3; $numColumnResidual = 1; $tblColumn = $numColumnPercent; - } else if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { + } + else if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { # imamo samo residuale $rowSpan = 2; $numColumnPercent = 1; $numColumnResidual = $this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR; $tblColumn = $numColumnResidual; - } else { + } + else { #prikazujemo samo podatke $rowSpan = 1; $numColumnPercent = 1; @@ -784,6 +836,7 @@ class SurveyCrosstabs { $sub_q1 = ''; $sub_q1 .= ''; $sub_q1 .= strip_tags($spr1['naslov']); + if ($show_variables_values == true ) { $sub_q1 .= ''; @@ -791,10 +844,13 @@ class SurveyCrosstabs { $sub_q1 .= ''; } + if ($spr1['tip'] == '16') { $sub_q1 .= '
    ' . strip_tags($grid1['naslov']) . ($show_variables_values == true ? ' (' . strip_tags($grid1['variable']) . ')' : ''); - } else { - $sub_q1 .= '
    ' . strip_tags($variable['naslov']) . ($show_variables_values == true ? ' (' . strip_tags($variable['variable']) . ')' : ''); + } + else { + if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje']) + $sub_q1 .= '
    ' . strip_tags($variable['naslov']) . ($show_variables_values == true ? ' (' . strip_tags($variable['variable']) . ')' : ''); } $sub_q1 .= '
    '; $sub_q1 .= '
    ' . NEW_LINE; @@ -826,8 +882,10 @@ class SurveyCrosstabs { } if ($spr2['tip'] == '16') { $sub_q2.= '
    ' . strip_tags($grid2['naslov']) . ($show_variables_values == true ? ' (' . strip_tags($grid2['variable']) . ')' : ''); - } else { - $sub_q2.= '
    ' . strip_tags($variable['naslov']) . ($show_variables_values == true ? ' (' . strip_tags($variable['variable']) . ')' : ''); + } + else { + if(strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje']) + $sub_q2.= '
    ' . strip_tags($variable['naslov']) . ($show_variables_values == true ? ' (' . strip_tags($variable['variable']) . ')' : ''); } $sub_q2 .= ''; $sub_q2 .= '' . NEW_LINE; @@ -843,111 +901,107 @@ class SurveyCrosstabs { $sub_q2 .= ''; $sub_q2 .= '' . NEW_LINE; } - # izrišemo tabelo - # najprej izrišemo naslovne vrstice - #echo ''; - echo $_br.'
    '; -# $_br = '
    '; -# echo '
    '.$sub_q1. '
    ==>
    '. $sub_q2.'

    '; + + # izrišemo tabelo + echo '
    '; + + + // Zgornja vrstca + echo '
    '; + + // hi2 + echo '
    '; + if ($this->displayHi2 == true) { + echo 'Χ2 = '; + echo $this->formatNumber($crosstabs['hi2'], 3, ''); + } + echo '
    '; + + // Zvezdica za vkljucitev v porocilo + $spr2 = $v_first['seq'].'-'.$v_first['spr'].'-'.$v_first['grd']; + $spr1 = $v_second['seq'].'-'.$v_second['spr'].'-'.$v_second['grd']; + + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=5, $sub_type=0, $spr1, $spr2); + + echo '
    '; + + + # najprej izrišemo naslovne vrstice #Zadnja kolona: Če imamo vodoravno checkboxe in gledamo enote, potem kolono s summo malo razmaknemo if ( $crosstabs['isCheckbox']['spr1'] == true && $this->crossNavVsEno == true) { $addVerticalSpace = 1; - } else { + } + else { $addVerticalSpace = 0; } - - # hi2 - if ($this->displayHi2 == true) { - echo 'Χ2 = '; - echo $this->formatNumber($crosstabs['hi2'], 3, ''); - } - echo '
    '; + echo '
    '; + echo '
    '; - if ($this->fromBreak == false) { - echo ''; - #echo ''; - echo ''; - if (count($crosstabs['options1']) > 0 ) { - $_width_percent = round(100 / count($crosstabs['options1'],2)); - foreach ($crosstabs['options1'] as $ckey1 =>$crossVariabla) { - echo ''; - } - } - if ($addVerticalSpace == 1) { - echo ''; - } - echo ''; - echo ''; - } - echo ''; - echo ''; + + echo ''; - #} echo ''; - echo ''; - echo ''; if ($this->fromBreak == true && $this->showAverage == true) { # če smo v break-u dodamo še povprečja - echo ''; + echo ''; } + echo ''; - echo ''; + + + echo ''; + $col_cnt=0; if (count($crosstabs['options1']) > 0 ) { foreach ($crosstabs['options1'] as $ckey1 =>$crossVariabla) { $col_cnt++; + #ime variable - //$css_backX = 'rsdl_bck_variable'.($col_cnt & 1); - $css_backX = ' rsdl_bck_variable1'; - echo ''; } } $col_cnt++; - //$css_backX = 'rsdl_bck_variable'.($col_cnt & 1); - if ($addVerticalSpace == 1) { - echo ''; - } - $css_backX = ' rsdl_bck_variable1'; - - echo ''; + + echo ''; if ($this->fromBreak == true && $this->showAverage == true) { # če smo v break-u dodamo še povprečja - echo ''; + echo ''; } + echo ''; + $cntY = 0; if (count($crosstabs['options2']) > 0) { foreach ($crosstabs['options2'] as $ckey2 =>$crossVariabla2) { $cntY++; - echo ''; + + echo ''; - - //$css_backY = 'rsdl_bck_variable'.($cntY & 1); - $css_backY = ' rsdl_bck_variable1'; - - echo ''; foreach ($crosstabs['options1'] as $ckey1 => $crossVariabla1) { - echo ''; - echo ''; - } - echo '
    '; - #if ($cntY == 1) { - # ime variable - #echo ''; + echo '
    '; echo $sub_q2; - #echo ''; + + echo ''; echo $sub_q1; echo '   
    '; + echo ''; + echo $crossVariabla['naslov']; + # če ni tekstovni odgovor dodamo key if ($crossVariabla['type'] != 't' && $show_variables_values == true) { if ($crossVariabla['vr_id'] == null ) { echo '
    ( '.$ckey1.' )'; - } else { + } + else { echo '
    ( '.$crossVariabla['vr_id'].' )'; } } + echo '
     ' . $lang['srv_analiza_crosstab_skupaj'] . '' . $lang['srv_analiza_crosstab_skupaj'] . '' . $lang['srv_analiza_crosstab_average'] . '' . $lang['srv_analiza_crosstab_average'] . '
    '; + echo ''; echo $crossVariabla2['naslov']; # če ni tekstovni odgovor dodamo key @@ -962,148 +1016,145 @@ class SurveyCrosstabs { echo ''; - # celica z vebino - { - # prikazujemo eno ali več od: frekvenc, odstotkov, residualov - echo ''; - if ($this->crossChk0) { - # izpišemo frekvence crostabov - echo ''; - echo ''; + echo ''; + } + # izpisemo residuale + if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { + # sirina celice v % + if ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 4 ) + $css_width = ' ctb_w25p'; + elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 3 ) + $css_width = ' ctb_w33p'; + elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 2 ) + $css_width = ' ctb_w50p'; + else + $css_width = ''; + $css_bt = ( $this->crossChk0 || ($this->crossChk1 && $this->crossChk2 && $this->crossChk3)) ? 'anl_dash_bt' : ''; + echo ''; + + echo ''; + echo ''; + } + echo '
    '; - echo ((int)$crosstabs_value[$ckey1][$ckey2] > 0) ? $crosstabs_value[$ckey1][$ckey2] : 0; - # .$crossTab[$crossVariabla1[cell_id]][$ckey2] - # + + # celica z vebino + echo ''; + + # prikazujemo eno ali več od: frekvenc, odstotkov, residualov + echo ''; - echo ''; - echo ''; - } - - if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { - # sirina celice v % - if ( ($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 3 ) - $css_width = ' ctb_w33p'; - elseif (($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 2 ) - $css_width = ' ctb_w50p'; - else - $css_width = ''; - $css_bt = ( $this->crossChk0 ) ? 'anl_dash_bt' : ''; - # izpisemo procente - echo ''; - echo ''; - echo '
    '; + if ($this->crossChk0) { + # izpišemo frekvence crostabov + echo '
    '; - echo ''; - $col=0; - - if ($this->crossChk1) { - #procent vrstica - $col++; + echo ''; + + echo ''; + } + + if ($this->crossChk1 || $this->crossChk2 || $this->crossChk3) { + # sirina celice v % + if ( ($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 3 ) + $css_width = ' ctb_w33p'; + elseif (($this->crossChk1 + $this->crossChk2 + $this->crossChk3) == 2 ) + $css_width = ' ctb_w50p'; + else + $css_width = ''; + $css_bt = ( $this->crossChk0 ) ? 'anl_dash_bt' : ''; + # izpisemo procente + echo ''; + echo ''; - } - if ($this->crossChk2) { - #procent stolpec - $col++; - $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'ctbChck_sp2' : 'ctbChck_sp0'; - echo ''; + } + if ($this->crossChk3) { + #procent skupni + $col++; + $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'ctbChck_sp3' : 'ctbChck_sp0'; + echo ''; - echo ''; - echo ''; - } - # izpisemo residuale - if ($this->crossChkEC || $this->crossChkRE || $this->crossChkSR || $this->crossChkAR) { - # sirina celice v % - if ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 4 ) - $css_width = ' ctb_w25p'; - elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 3 ) - $css_width = ' ctb_w33p'; - elseif ( ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR) == 2 ) - $css_width = ' ctb_w50p'; - else - $css_width = ''; - $css_bt = ( $this->crossChk0 || ($this->crossChk1 && $this->crossChk2 && $this->crossChk3)) ? 'anl_dash_bt' : ''; - echo ''; + echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaSkupna'], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo ''; + } + echo ''; + echo '
    '; + echo ((int)$crosstabs_value[$ckey1][$ckey2] > 0) ? $crosstabs_value[$ckey1][$ckey2] : 0; + echo '
    '; - $css_color = ($this->doColor == 'true') ? 'ctbChck_sp1' : 'ctbChck_sp0'; - $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; - echo ''; - echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaVrstica'][$ckey2], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo ''; + echo ''; + echo ''; + $col=0; + + if ($this->crossChk1) { + #procent vrstica + $col++; - echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaStolpec'][$ckey1], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo ''; - } - if ($this->crossChk3) { - #procent skupni - $col++; - $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'ctbChck_sp3' : 'ctbChck_sp0'; - echo ''; + $css_color = ($this->doColor == 'true') ? 'ctbChck_sp1' : 'ctbChck_sp0'; + $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; + echo ''; + } + if ($this->crossChk2) { + #procent stolpec + $col++; + $css_br = $numColumnPercent > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'ctbChck_sp2' : 'ctbChck_sp0'; + echo ''; - } - echo ''; - echo '
    '; + echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaVrstica'][$ckey2], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo ''; - echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaSkupna'], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); - echo '
    '; + echo $this->formatNumber($this->getCrossTabPercentage($crosstabs['sumaStolpec'][$ckey1], $crosstabs_value[$ckey1][$ckey2]), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo '
    '; + + echo '
    '; + echo ''; + echo ''; + $col=0; + + if ($this->crossChkEC) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_EC' : 'ctbChck_sp0'; + echo ''; + } + if ($this->crossChkRE) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_RE' : 'ctbChck_sp0'; + echo ''; + } + if ($this->crossChkSR) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_SR' : 'ctbChck_sp0'; + echo ''; + } + if ($this->crossChkAR) { + $col++; + $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; + $css_color = ($this->doColor == 'true') ? 'crossCheck_AR' : 'ctbChck_sp0'; + echo ''; + } + echo ''; + echo '
    '; + echo $this->formatNumber($crosstabs['exC'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo ''; + echo $this->formatNumber($crosstabs['res'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo ''; + echo $this->formatNumber($crosstabs['stR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo ''; + echo $this->formatNumber($crosstabs['adR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); + echo '
    '; + echo '
    '; - echo '
    '; - echo ''; - echo ''; - $col=0; - - if ($this->crossChkEC) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_EC' : 'ctbChck_sp0'; - echo ''; - } - if ($this->crossChkRE) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_RE' : 'ctbChck_sp0'; - echo ''; - } - if ($this->crossChkSR) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_SR' : 'ctbChck_sp0'; - echo ''; - } - if ($this->crossChkAR) { - $col++; - $css_br = $numColumnResidual > $col ? ' anl_dash_br' : ''; - $css_color = ($this->doColor == 'true') ? 'crossCheck_AR' : 'ctbChck_sp0'; - echo ''; - } - echo ''; - echo '
    '; - echo $this->formatNumber($crosstabs['exC'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo ''; - echo $this->formatNumber($crosstabs['res'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo ''; - echo $this->formatNumber($crosstabs['stR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo ''; - echo $this->formatNumber($crosstabs['adR'][$ckey1][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'), ''); - echo '
    '; - echo '
    '; - } # konec celice z vsebino echo '
     '; - echo ''; + echo '
    '; + echo ''; if ($this->crossChk0) { echo ''; - echo ''; @@ -1122,21 +1173,21 @@ class SurveyCrosstabs { echo ''; if ($this->crossChk1) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp1' : 'ctbChck_sp0'; - echo ''; } if ($this->crossChk2) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp2' : 'ctbChck_sp0'; $css_border = ($this->crossChk1 ? ' anl_dash_bl ' : ''); - echo ''; } if ($this->crossChk3) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp3' : 'ctbChck_sp0'; $css_border = ($this->crossChk1 || $this->crossChk2 ? ' anl_dash_bl ' : ''); - echo ''; } @@ -1148,43 +1199,32 @@ class SurveyCrosstabs { echo ''; if ($this->fromBreak == true && $this->showAverage == true) { # če smo v break dodamo še povprečja - echo ''; } echo ''; } } - #Zadnja vrstica. Če imamo navpično checkboxe in gledamo enote, potem vrstico z summo malo razmaknemo - $cssBT = 'anl_bt'; - if ( $crosstabs['isCheckbox']['spr2'] == true && $this->crossNavVsEno == true) { - echo ''; - echo ''; - } - - echo ''; - $cssBT = ''; - } + $cntY++; + echo ''; + $css_backY = ' rsdl_bck_variable1'; echo ''; - // skupni sestevki po stolpcih + + // skupni sestevki po stolpcih if (count($crosstabs['options1']) > 0) foreach ($crosstabs['options1'] as $ckey1 => $crossVariabla1) { - echo ''; } @@ -1388,91 +1413,84 @@ class SurveyMultiCrosstabs { echo ''; - echo '
    '; - echo ''.$lang['srv_multicrosstabs_settings_val'].''; - + echo '

    '.$lang['srv_multicrosstabs_settings_val'].'

    '; + + echo '
    '; + // Prikaz numerusa - echo 'table_settings[$this->table_id]['numerus'] == 1 ? ' checked="checked"':'').' value="1" />'; - + echo '
    '; + echo 'table_settings[$this->table_id]['numerus'] == 1 ? ' checked="checked"':'').' value="1" />'; + echo '
    '; // Prikaz procentov - echo 'table_settings[$this->table_id]['percent'] == 1 ? ' checked="checked"':'').' value="1" />'; - + echo '
    '; + echo 'table_settings[$this->table_id]['percent'] == 1 ? ' checked="checked"':'').' value="1" />'; + echo '
    '; // Prikaz vsot - echo 'table_settings[$this->table_id]['sums'] == 1 ? ' checked="checked"':'').' value="1" />'; - - // Navedbe / enote - /*if($this->isCheckbox){ - echo ''; - echo ''; - echo ' '; - echo ''; - }*/ + echo '
    '; + echo 'table_settings[$this->table_id]['sums'] == 1 ? ' checked="checked"':'').' value="1" />'; + echo '
    '; + + echo '
    '; - echo '
    '; - - - echo '
    '; - echo ''.$lang['srv_multicrosstabs_settings_avg'].''; + echo '

    '.$lang['srv_multicrosstabs_settings_avg'].'

    '; // Variabla za racunanje povprecja - numeric in ordinal (radio, dropdown, mg) $checked = $this->table_settings[$this->table_id]['avgVar'] == '' ? false : true; - echo ''; - echo '
    '; + echo ''; + echo ''; + + echo ''; - echo '
    '; - echo ''.$lang['srv_multicrosstabs_settings_del'].''; + echo '

    '.$lang['srv_multicrosstabs_settings_del'].'

    '; // Variabla za racunanje deleza - ordinal in nominal (radio, dropdown, mg, po novem tudi checkbox, multicheckbox) $checked = $this->table_settings[$this->table_id]['delezVar'] == '' ? false : true; - echo ''; - - echo '
    '; - echo ''; - // Gumbi na dnu - echo '
    '; - - echo ''; - echo ''; - echo ''.$lang['srv_zapri'].''; - echo ''; - echo ''; - - echo ''; - echo ''; - echo ''.$lang['srv_potrdi'].''; - echo ''; - echo ''; - - echo '
    '; + echo '
    '; + echo ''; + echo ''; + echo '
    '; } // Prikazemo opcije variable (checkboxe) za delez @@ -1490,9 +1508,13 @@ class SurveyMultiCrosstabs { else $val = 0; - echo ''; + echo '
    '; + + echo '
    '; echo ''; - echo ''; + echo '
    '; + + echo '
    '; $cnt++; } @@ -1528,10 +1550,12 @@ class SurveyMultiCrosstabs { $href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=multicrosstabs_izpis_xls&anketa='.$this->ank_id); echo ' ".$_command.""); } - - // Editiranje na dnu - brisanje vec userjev hkrati... - - if(self::$dataFileStatus != FILE_STATUS_NO_DATA && (int)self::$displayEditIcons['dataIcons_edit'] == 1){ - self::displayBottomEdit(); - } } static public function DisplayDataMultipleTable() { @@ -1933,8 +1953,7 @@ class SurveyDataDisplay{ foreach (self::$_HEADERS AS $spid => $spremenljivka) { if ( isset(self::$_SVP_PV[$spid]) && is_numeric($spremenljivka['tip']) ) { - - //$spr_id = explode('_', $spid)[0]; // PHP 5.4 + $spr_id = explode('_', $spid); $spr_id = $spr_id[0]; @@ -1954,23 +1973,18 @@ class SurveyDataDisplay{ $sequences[$spr] = explode('_', $multiple[$spr]['sequences'] ); // vsi stolpci trenutne spremenljivke (4 - 12) $subseq[$spr] = count($multiple[$spr]['grids']); // stevilo vrstic v vprasanju (4 - 4) (to je za vsa vprasanja enako) $cols[$spr] = round(count($sequences[$spr])/$subseq[$spr], 0); // koliko stolpcev zasede enkratna ponovitev vprasanja (1 - 3) - - #echo "\n\r vars: ".count($sequences[$spr]).' '.$subseq[$spr].' '.$cols[$spr].' '.$dataoffset."\n\r"; - } - $_svp_pv['uid'] = 'uid'; - //self::$_SVP_PV = array_merge($_svp_pv, self::$_SVP_PV); + + #izpišemo tabelo - echo '
    '; echo '
    '; # div v katerem po potrebi prikazujemo gumbe za skrolanje levo in desno echo '
    '; - echo '<'; - echo ' '; - echo '>'; + echo '
    '; + echo '
    '; echo '
    '; $display1kaIcon = self::$displayEditIcons['dataIcons_quick_view'] ; @@ -2129,9 +2143,17 @@ class SurveyDataDisplay{ # colspan za ikonce if ($stolpci > 0) { - //for ($i=0; $i<$stolpci; $i++) - // echo '
    '; - echo ''; + + $show_mass_delete = (self::$dataFileStatus != FILE_STATUS_NO_DATA && (int)self::$displayEditIcons['dataIcons_edit'] == 1) ? true : false; + + echo ''; } # dodamo skrit stolpec uid @@ -2432,21 +2454,24 @@ class SurveyDataDisplay{ echo ''; - + if ($stolpci > 0 ) { + if (self::$displayEditIcons['dataIcons_edit'] == true) { + // checkbox za brisanje vecih vrstic hkrati + echo ''; + } + } if ((int)$display1kaIcon == 1) { - echo ''; + echo ''; } if ($stolpci > 0 ) { if (self::$displayEditIcons['dataIcons_edit'] == true) { - // checkbox za brisanje vecih vrstic hkrati - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; + echo ''; } if (self::$displayEditIcons['dataIcons_write'] == true) { - echo ''; - echo ''; + echo ''; + echo ''; } } @@ -2478,51 +2503,50 @@ class SurveyDataDisplay{ // JS za urejanje vnosov (click in hover) (funkciji sta definirani v postProcess.js) ?> - - ".$_command.""); } - - // Editiranje na dnu - brisanje vec userjev hkrati... - if(self::$dataFileStatus != FILE_STATUS_NO_DATA && (int)self::$displayEditIcons['dataIcons_edit'] == 1){ - self::displayBottomEdit(); - } } public static function url_to_link($text) { @@ -2589,22 +2608,11 @@ class SurveyDataDisplay{ echo ""."\n"; } - echo '
    '; - echo '
    '; - // title - echo '
    '; - - //echo $rowa['naslov']; - if (self::$quickEdit_recnum[3]['hasPrev'] == true) { - echo ''; - } - echo 'Recnum '.self::$quickEdit_recnum[2]; - if (self::$quickEdit_recnum[3]['hasNext'] == true) { - echo ''; - } - - echo '
    '; + echo '
    '; + + + echo '
    '; if ($quick_view == false) { echo '
    '."\n"; @@ -2723,33 +2731,35 @@ class SurveyDataDisplay{ while (get('grupa') != \App\Controllers\FindController::getInstance()->findNextGrupa() && (\App\Controllers\FindController::getInstance()->findNextGrupa() > 0 || (get('loop_id') != null && \App\Controllers\FindController::getInstance()->findNextLoopId() != null))); } - if ($quick_view == false) { - //echo ' ';... - echo ''; - echo ''; - #echo ''."\n"; - } - else{ + if ($quick_view == false) { echo ''."\n"; } - echo '
    '; # inner - - echo '
    '; + echo '
    '; self::displayVnosIcons(); - echo '
    '; - - echo '



    '; - + + if ($quick_view == false) { + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + } + echo '
    '; + echo '
    '; # inner + + // Div na desni z metapodatki + echo '
    '; + echo '
    '; + self::displayQuickEditMeta(); + echo '
    '; + echo '
    '; - // Div na desni z metapodatki - echo '
    '; - self::displayQuickEditMeta(); echo '
    '; + // Preverimo ce gre za prvo urejanje - potem avtomatsko ustvarimo arhiv podatkov if ($quick_view == false && isset($_GET['post']) && $_GET['post'] == '1') { ob_flush(); @@ -2763,18 +2773,19 @@ class SurveyDataDisplay{ global $lang; global $site_path; - //echo '

    '.$lang['srv_data_title_quick_view'].'

    '; - if (self::$dataFileStatus == FILE_STATUS_NO_DATA || self::$dataFileStatus == FILE_STATUS_NO_FILE || self::$dataFileStatus == FILE_STATUS_SRV_DELETED){ return false; } - + + // Paginacija self::displayQuickEditPagination(); - echo '
    '; + + // Filtri - ?? todo ?? + /*echo '
    '; echo '
      '; # div za filtre statusov SurveyStatusProfiles::DisplayLink(false); @@ -2806,11 +2817,18 @@ class SurveyDataDisplay{ if ($doNewLine) { echo '
      '; - } + }*/ - echo '
      '; + + // Zgrnja vrstica z ikonami in naslovom + echo '
      '; self::displayVnosIcons(); + + // title + echo '
      '; + echo $lang['srv_recnum_long'].': '.self::$quickEdit_recnum[2]; + echo '
      '; echo '
      '; } @@ -2867,27 +2885,19 @@ class SurveyDataDisplay{ $current = count($uids)-1; } - echo '
    '; + echo ''; echo ''; // lurker @@ -3301,20 +3305,26 @@ class SurveyDataDisplay{ $lang_admin = $row['value']; } + $sqlVersion = sisplet_query("SELECT value FROM misc WHERE what = 'version'"); + $rowVersion = mysqli_fetch_assoc($sqlVersion); + #izpišemo HTML echo ''; echo ''; - echo ''; - echo ''; + + + echo ''; + + echo ''; echo ''; - echo ''; + + echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; echo ''; - echo ''; + echo ''; + echo ''; - echo ''; - echo ''; - #echo '
    '; + + echo ''; + + echo ''; + + echo '
    '; + //Izvoz v PDF / RTF / XLS $_url1 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode( serialize( @@ -3365,14 +3378,18 @@ class SurveyDataDisplay{ array( 'b'=>'export', 'a'=>'list_xls', 'anketa'=>$anketa))); - echo '
    '; - echo '  '; + + + echo '
    '; + + /*echo '  '; echo '  '; - echo ''; + echo '';*/ - echo '
    '; echo $lang['srv_data_print_preview']; + echo '
    '; + self::$printPreview = true; self::$_VARS[VAR_DATA] = 1; @@ -3387,27 +3404,23 @@ class SurveyDataDisplay{ unset(self::$_SVP_PV['invitation']); } - - # ponastavimo nastavitve- filter + + # ponastavimo nastavitve- filter self::setUpFilter(); self::DisplayDataTable(); + echo '
    '; - echo '
    '; + echo ''; # suma po vrsticah echo (int)$crosstabs['sumaVrstica'][$ckey2]; echo '
    '; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaVrstica'][$ckey2] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaVrstica'][$ckey2] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( $crosstabs['avgVrstica'][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'), ''); echo '
     '; - echo ' '; - echo ' '; - if ($addVerticalSpace == 1) { - echo '  '; - echo '
    ' . $lang['srv_analiza_crosstab_skupaj'] . ''; + echo ''; { # prikazujemo eno od treh možnosti - echo ''; + echo '
    '; if ($this->crossChk0) { echo ''; - echo ''; @@ -1196,20 +1236,20 @@ class SurveyCrosstabs { echo ''; if ($this->crossChk1) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp1' : 'ctbChck_sp0'; - echo ''; } if ($this->crossChk2) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp2' : 'ctbChck_sp0'; - echo ''; } if ($this->crossChk3) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp3' : 'ctbChck_sp0'; - echo ''; } @@ -1219,18 +1259,14 @@ class SurveyCrosstabs { } echo ''; } - # če mamo checkboxe in sumo malo razmaknemo - if ($addVerticalSpace == 1) { - echo ''; - } # zadnja celica z skupno sumo - echo '
    '; + echo ''; # suma po stolpcih echo (int)$crosstabs['sumaStolpec'][$ckey1]; echo '
    '; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaStolpec'][$ckey1] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( ($crosstabs['sumaSkupna'] > 0 ? (100 * $crosstabs['sumaStolpec'][$ckey1] / $crosstabs['sumaSkupna']) : 0), SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ' '; + echo ''; { - echo ''; + echo '
    '; if ($this->crossChk0) { echo ''; - echo ''; @@ -1243,20 +1279,20 @@ class SurveyCrosstabs { if ($this->crossChk1) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp1' : 'ctbChck_sp0'; $css_border = ($this->crossChk2 || $this->crossChk3) ? ' anl_dash_br' : ''; - echo ''; } if ($this->crossChk2) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp2' : 'ctbChck_sp0'; $css_border = ($this->crossChk3) ? ' anl_dash_br' : ''; - echo ''; } if ($this->crossChk3) { $css_color = ($this->doColor == 'true') ? ' ctbChck_sp3' : 'ctbChck_sp0'; - echo ''; } @@ -1281,15 +1317,11 @@ class SurveyCrosstabs { // skupni sestevki po stolpcih if (count($crosstabs['options1']) > 0) { foreach ($crosstabs['options1'] as $ckey1 => $crossVariabla1) { - echo ''; } } - # če mamo checkboxe in sumo malo razmaknemo - if ($addVerticalSpace == 1) { - echo ''; - } # zadnja celica z skupno sumo echo ''; @@ -1297,37 +1329,43 @@ class SurveyCrosstabs { # če smo v break dodamo še povprečja echo ''; } + echo ''; } - echo '
    '; + echo ''; # skupna suma echo (int)$crosstabs['sumaSkupna']; echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; echo $this->formatNumber( $crosstabs['avgStolpec'][$ckey1], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'), ''); echo '   
    '; - // Zvezdica za vkljucitev v porocilo - $spr2 = $v_first['seq'].'-'.$v_first['spr'].'-'.$v_first['grd']; - $spr1 = $v_second['seq'].'-'.$v_second['spr'].'-'.$v_second['grd']; - - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=5, $sub_type=0, $spr1, $spr2); - #SurveyAnalysis::addCustomReportElement($type=5, $sub_type=0, $spr1, $spr2); - + echo '
    '; + echo ''; + + + $this->displayExport(); + + // Izrisemo legendo + $this->displayCrosstabCheckboxes(); + + // Izrisemo graf za tabelo if($this->showChart && !$this->fromBreak){ $tableChart = new SurveyTableChart($this->sid, $this, 'crosstab', $counter); $tableChart->display(); } + + echo ''; $counter++; } } - } else { + } + else { # crostab variables not set echo $lang['srv_crosstab_note0']; - #print_r("Crosstab variables not set!"); } } - /** + /** * @desc prikaze izvoz za PDF/RTF */ function displayExport () { + # z javascriptom prikažemo ikonce za arhiviranje, emaijlanje arhivov, pdf, rtf, excel... if ($this->isSelectedBothVariables()) { $data1 = ''; @@ -1347,18 +1385,20 @@ class SurveyCrosstabs { $href_pdf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); $href_rtf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis_rtf&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); $href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=crosstabs_izpis_xls&anketa=' . $this->sid . '&data1='.$data1.'&data2='.$data2); - echo ''; - - } - + + echo ''; + } } /** kadar kličemo iz Break, ali pri radio grupi dodamo še povprečje po stolpcih @@ -1882,7 +1922,6 @@ class SurveyCrosstabs { } - /** Sestavi array nepravilnih odgovorov * */ @@ -2560,8 +2599,10 @@ class SurveyCrosstabs { $this->displaySessionInspectCheckbox(); } + function displaySessionInspectCheckbox() { global $lang; + echo 'enableInspect == true ? ' checked="checekd"' : '').' onClick="changeSessionInspect();">'.$lang['srv_inspect_setting']; echo Help :: display('srv_crosstab_inspect'); } @@ -2570,10 +2611,15 @@ class SurveyCrosstabs { function displayLinePercent() { global $lang; - echo 'crossChk1 == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; - echo ''; - echo 'doColor == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; - echo ''; + echo '
    '; + echo ' crossChk1 == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; + echo ' '; + echo '
    '; + + echo '
    '; + echo ' doColor == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>'; + echo ' '; + echo '
    '; } function displayResidual(){ @@ -2581,15 +2627,19 @@ class SurveyCrosstabs { $selected = ($this->crossChkEC + $this->crossChkRE + $this->crossChkSR + $this->crossChkAR == 4) ? true : false; - echo ''; - echo ''; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; } function displayShowChart() { global $lang; - echo 'showChart == true ? ' checked="checked" ' : '') . ' />'; - echo ''; + echo '
    '; + echo ' showChart == true ? ' checked="checked" ' : '') . ' />'; + echo ' '; + echo '
    '; } function presetVariables() { diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php index 6b2602a68..d56dde992 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php @@ -43,6 +43,11 @@ class SurveyMeans{ SurveyInfo :: getInstance()->SurveyInit($this->sid); $this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString(); + // Pri glasovanju tega ne pustimo + if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){ + die(); + } + # Inicializiramo in polovimo nastavitve missing profila SurveyStatusProfiles::Init($this->sid); SurveyUserSetting::getInstance()->Init($this->sid, $global_user_id); @@ -232,28 +237,26 @@ class SurveyMeans{ function displayDropdowns() { global $lang; + $variables1 = $this->getVariableList(1); $variables2 = $this->getVariableList(2); - echo '
    '; - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ' '; - } - echo $lang['srv_means_label1']; - echo '
    '; + + echo '
    '; + + echo ''.$lang['srv_means_label1'].''; + # iz header datoteke preberemo spremenljivke #js: $("#means_variable_1, #means_variable_2").live('click', function() {}) if (count($this->variabla1) > 0) { - $br=null; - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ''; - } - - foreach($this->variabla1 AS $_key => $variabla1) { - echo $_br; - echo ''; + + echo '
    '; - echo ''; # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) { @@ -271,38 +274,39 @@ class SurveyMeans{ } echo ''; - if (count($this->variabla1) > 1) { - echo ''; - } else { - #echo ' '; - } - $_br = '
     '; - echo ''; + if (count($this->variabla1) > 1) { + echo ''; + } + + echo '
    '; + } + + echo '
    '; + + // Gumb za dodajanje spremenljivke + if ((int)$this->variabla1['0']['seq'] > 0) { + echo '
    '; - echo '
    '; - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ' '; - } - echo $lang['srv_means_label2']; - echo '
    '; - + + echo '
    '; + + echo ''.$lang['srv_means_label2'].''; # za vsako novo spremenljivko 2 nardimo svoj select if (count($this->variabla2) > 0) { - if ((int)$this->variabla1['0']['seq'] > 0) { - echo ''; - } - + + echo '
    '; + foreach($this->variabla2 AS $_key => $variabla2) { - echo $_br; - echo ''; - echo 'variabla1['0']['seq'] > 0 ? '' : ' disabled="disabled" ') .'>'; @@ -327,29 +331,45 @@ class SurveyMeans{ } echo ''; + if (count($this->variabla2) > 1) { echo ''; - } else { - echo ' '; - } + } - $_br = '
     '; - echo '
    '; + echo '
    '; + } + + echo '
    '; + + // Gumb za dodajanje spremenljivke + if ((int)$this->variabla1['0']['seq'] > 0) { + echo ''; } } echo '
    '; - echo ''; - if (count($this->variabla2) > 1) { - echo ''; - - echo '
    sessionData['means']['meansSeperateTables']!=true?'':' class="displayNone"').'>'; - } - echo '
    '; - echo '
    '; - - echo '
    '; + echo '
    '; + + echo ''.$lang['settings'].':'; + + if (count($this->variabla2) > 1) { + + echo '
    '; + echo ' sessionData['means']['meansSeperateTables']==true?' checked="checked"':'' ).'>'; + echo '
    '; + + echo '
    '; + echo ' sessionData['means']['meansSeperateTables']!=true?'':' class="displayNone"').'>sessionData['means']['meansJoinPercentage']==true?' checked="checked"':'' ).'>'; + echo '
    '; + } + + echo '
    '; + echo ' sessionData['mean_charts']['showChart']==true?' checked="checked"':'' ).'>'; + echo '
    '; + + echo '
    '; + // Ikone za izvoz (so tukaj da se refreshajo ob ajax klicu) $this->displayExport(); } @@ -358,7 +378,6 @@ class SurveyMeans{ global $lang; global $admin_type; - $br=''; $means = array(); # če ne uporabljamo privzetega časovnega profila izpišemo opozorilo @@ -374,6 +393,7 @@ class SurveyMeans{ $SR = new SurveyRecoding($this->sid); $SR -> getProfileString(); + if ($this->getSelectedVariables(1) !== null && $this->getSelectedVariables(2) !== null) { $variables1 = $this->getSelectedVariables(2); $variables2 = $this->getSelectedVariables(1); @@ -418,21 +438,25 @@ class SurveyMeans{ if (is_array($means) && count($means) > 0) { $counter=0; foreach ($means AS $mean_sub_grup) { - echo($br); - $this->displayMeansTable($mean_sub_grup); - $br='
    '; - // Zvezdica za vkljucitev v porocilo + echo '
    '; + + // Zvezdica za vkljucitev v porocilo $spr2 = $mean_sub_grup[0]['v1']['seq'].'-'.$mean_sub_grup[0]['v1']['spr'].'-'.$mean_sub_grup[0]['v1']['grd']; $spr1 = $mean_sub_grup[0]['v2']['seq'].'-'.$mean_sub_grup[0]['v2']['spr'].'-'.$mean_sub_grup[0]['v2']['grd']; SurveyAnalysis::Init($this->sid); SurveyAnalysis::addCustomReportElement($type=6, $sub_type=0, $spr1, $spr2); - + + // Izris tabele + $this->displayMeansTable($mean_sub_grup); + // Izrisemo graf za tabelo - zaenkrat samo admin if($this->sessionData['mean_charts']['showChart'] && $_GET['m'] != 'analysis_creport'){ - $tableChart = new SurveyTableChart($this->sid, $this, 'mean', $counter); + $tableChart = new SurveyTableChart($this->sid, $this, 'mean', $counter); $tableChart->display(); } + + echo '
    '; $counter++; } @@ -467,14 +491,19 @@ class SurveyMeans{ $href_pdf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=mean_izpis&anketa=' . $this->sid); $href_rtf = makeEncodedIzvozUrlString('izvoz.php?b=export&m=mean_izpis_rtf&anketa=' . $this->sid); $href_xls = makeEncodedIzvozUrlString('izvoz.php?b=export&m=mean_izpis_xls&anketa=' . $this->sid); - echo ''; } } @@ -1066,68 +1095,65 @@ class SurveyMeans{ $showSingleUnits = $this->sessionData['means']['meansJoinPercentage']==true && $this->sessionData['means']['meansSeperateTables'] == false; - # izrišemo tabelo - echo ''; - echo ''; - echo ''; - echo ''; - for ($i = 0; $i < $cols; $i++) { - echo ''; - if ($showSingleUnits == false) { - echo ''; - } - } - if ($showSingleUnits == true) { - echo ''; - } - echo ''; - echo ''; - #echo ''; + # izrišemo tabelo + echo '
    xx 
    '; + + + echo ''; + # ime variable # teksti labele: $label2 = $this->getSpremenljivkaTitle($_means[0]['v2']); if ($showSingleUnits == false) { $span = ' colspan="2"'; } - echo ''; for ($i = 0; $i < $cols; $i++) { - echo ''; } if ($showSingleUnits == true) { - echo ''; + echo ''; } echo ''; - echo ''; + + + echo ''; for ($i = 0; $i < $cols; $i++) { + #Povprečje - echo ''; + #enote if ($showSingleUnits == false) { - echo ''; + echo ''; } } + if ($showSingleUnits == true) { - echo ''; + echo ''; } echo ''; + if (count($_means[0]['options']) > 0) { foreach ($_means[0]['options'] as $ckey2 =>$crossVariabla2) { $units_per_row = 0; + echo ''; - echo ''; + # celice z vsebino for ($i = 0; $i < $cols; $i++) { - echo ''; + if ($showSingleUnits == false) { - echo ''; - } else { + } + else { $units_per_row = max($units_per_row,(int)$_means[$i]['sumaVrstica'][$ckey2]); } } + if ($showSingleUnits == true) { - echo ''; } + echo ''; + $max_units += $units_per_row; } } + + echo ''; - echo ''; + + echo ''; + for ($i = 0; $i < $cols; $i++) { - echo ''; + if ($showSingleUnits == false) { - echo ''; } } + if ($showSingleUnits == true) { - echo ''; + echo ''; } echo ''; + echo '
    '; + echo ''; echo $label2; echo ''; + echo ''; $label1 = $this->getSpremenljivkaTitle($_means[$i]['v1']); echo $label1; echo '  
    '; + echo ''; echo $lang['srv_means_label']; echo ''.$lang['srv_means_label4'].''.$lang['srv_means_label4'].''.$lang['srv_means_label4'].''.$lang['srv_means_label4'].'
    '; + + echo ''; echo $crossVariabla2['naslov']; # če ni tekstovni odgovor dodamo key if ($crossVariabla2['type'] !== 't' ) { @@ -1140,48 +1166,61 @@ class SurveyMeans{ } } echo ''; + echo ''; echo $this->formatNumber($_means[$i]['result'][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL')); echo ''; + echo ''; echo (int)$_means[$i]['sumaVrstica'][$ckey2]; echo ''; + echo ''; echo $units_per_row; echo '
    '.$lang['srv_means_label3'].''.$lang['srv_means_label3'].''; + echo ''; echo $this->formatNumber($_means[$i]['sumaMeans'], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL')); echo ''; + echo ''; echo (int)$_means[$i]['sumaSkupna']; echo ''; + echo ''; echo $max_units; - echo '
    '; } @@ -1228,14 +1267,14 @@ class SurveyMeans{ $which = $_POST['which']; $variables = $this->getVariableList($which); $multiple = true; - - + + if ($which == '1') { - echo '
    '; - echo ' '; - echo ''; + + # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) { echo ''; } @@ -1249,20 +1288,23 @@ class SurveyMeans{ . $variable['variableNaslov'] . ''; } + echo ''; - echo ''; - - } else { - # which = 2 - echo '
    '; - echo ' '; - echo ''; # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable if ((int)$this->variabla1['0']['seq'] > 0) { echo ''; - } else { + } + else { # če druga variabla ni izbrana dodamo tekst za izbiro druge variable echo ''; } @@ -1277,7 +1319,10 @@ class SurveyMeans{ } echo ''; - echo ''; + + echo ''; + + echo ''; } } @@ -1311,11 +1356,14 @@ class SurveyMeans{ if (strip_tags($grid['naslov']) != $lang['srv_new_text']) { $labela .= '
    '.strip_tags($grid['naslov']); } + $labela .= ' ('.strip_tags($grid['variable']).')' ; - } else { - if (strip_tags($variable['naslov']) != $lang['srv_new_text']) { + } + else { + if (strip_tags($variable['naslov']) != $lang['srv_new_text'] && strip_tags($variable['naslov']) != $lang['srv_new_vprasanje']) { $labela .= '
    '.strip_tags($variable['naslov']); } + if ($show_variables_values == true) { $labela .= ' ('.strip_tags($variable['variable']).')'; } diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php index db9c9e448..550f08d1a 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php @@ -75,6 +75,11 @@ class SurveyMultiCrosstabs { # polovimo vrsto tabel (aktivne / neaktivne) SurveyInfo :: getInstance()->SurveyInit($this->ank_id); $this->db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString(); + + // Pri glasovanju tega ne pustimo + if(SurveyInfo::getInstance()->getSurveyColumn("survey_type") == 0){ + die(); + } $this->_CURRENT_STATUS_FILTER = STATUS_FIELD.' ~ /6|5/'; @@ -214,7 +219,7 @@ class SurveyMultiCrosstabs { if($spr['canChoose'] && in_array($spr['tip'], array(1,3,6))){ echo '
  • '; - echo ''.$spr['variable'].' - '.$this->snippet($spr['naslov'], 25); + echo ' '.$spr['variable'].' - '.$this->snippet($spr['naslov'], 25); echo '
  • '; } } @@ -225,7 +230,7 @@ class SurveyMultiCrosstabs { $this->displayMCTablesPopups(); // Izris diva za nastavitve tabele - echo '
    '; + echo '
    '; $this->displayTableSettings(); echo '
    '; @@ -250,9 +255,19 @@ class SurveyMultiCrosstabs { // Napolnimo variable ki so ze izbrane $this->getSelectedVars(); + // Zvezdica za creport - ce smo v custom reportu tega ne izpisemo + /*if($_GET['m'] != 'analysis_creport'){ + + echo '
    '; + + // Zvezdica za vkljucitev v porocilo + SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id); + + echo '
    '; + }*/ + echo ''; - // Imamo 2 nivoja if($this->colLevel2){ @@ -262,8 +277,10 @@ class SurveyMultiCrosstabs { elseif(!$this->rowLevel2) $colspan = ' colspan="2"'; else - $colspan = ' colspan="4"'; + $colspan = ' colspan="4"'; + echo ''; + if(count($this->selectedVars['ver'])){ foreach($this->selectedVars['ver'] as $var){ @@ -274,23 +291,27 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } } // Izrisemo se zadnjo prazno navpicno celico vrstico echo ''; - echo ''; + echo ''; + + // Izrisemo VARIABLE za spremenljivko - 2. vrstica if($this->rowSpan == 0) $colspan = ' colspan="1"'; elseif(!$this->rowLevel2) $colspan = ' colspan="2"'; else - $colspan = ' colspan="4"'; + $colspan = ' colspan="4"'; + echo ''; + if(count($this->selectedVars['ver'])){ foreach($this->selectedVars['ver'] as $var){ @@ -309,16 +330,18 @@ class SurveyMultiCrosstabs { } } echo ''; + // Izris vrstic za 2. nivo - 3. in 4. vrstica - if($this->rowSpan == 0) $colspan = ' colspan="1"'; elseif(!$this->rowLevel2) $colspan = ' colspan="2"'; else - $colspan = ' colspan="4"'; + $colspan = ' colspan="4"'; + echo ''; + if(count($this->selectedVars['ver'])){ foreach($this->selectedVars['ver'] as $parentVar){ @@ -333,7 +356,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -350,15 +373,19 @@ class SurveyMultiCrosstabs { } } } + echo ''; + if($this->rowSpan == 0) $colspan = ' colspan="1"'; elseif(!$this->rowLevel2) $colspan = ' colspan="2"'; else - $colspan = ' colspan="4"'; + $colspan = ' colspan="4"'; + echo ''; + if(count($this->selectedVars['ver'])){ foreach($this->selectedVars['ver'] as $parentVar){ @@ -373,7 +400,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($suboption, 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -382,10 +409,12 @@ class SurveyMultiCrosstabs { } } } + echo ''; } // Imamo samo 1 nivo else{ + // Izrisemo VERTIKALNO izbrane spremenljivkec - 1. vrstica if($this->rowSpan == 0) $colspan = ' colspan="1"'; @@ -393,7 +422,9 @@ class SurveyMultiCrosstabs { $colspan = ' colspan="2"'; else $colspan = ' colspan="4"'; + echo ''; + if(count($this->selectedVars['ver'])){ foreach($this->selectedVars['ver'] as $var){ @@ -403,7 +434,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -414,17 +445,21 @@ class SurveyMultiCrosstabs { } // Izrisemo se zadnjo prazno navpicno celico vrstico - echo ''; + echo ''; + echo ''; + // Izrisemo VARIABLE za spremenljivko - 2. vrstica if($this->rowSpan == 0) $colspan = ' colspan="1"'; elseif(!$this->rowLevel2) $colspan = ' colspan="2"'; else - $colspan = ' colspan="4"'; + $colspan = ' colspan="4"'; + echo ''; + if(count($this->selectedVars['ver'])){ foreach($this->selectedVars['ver'] as $var){ @@ -447,6 +482,7 @@ class SurveyMultiCrosstabs { } } } + echo ''; } @@ -484,7 +520,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$parentVar['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -505,7 +541,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -533,7 +569,7 @@ class SurveyMultiCrosstabs { echo ''; - echo ''; + echo ''; $crosstabs = $this->crosstabData[$parentVar['spr'].'-'.$var['spr']]; @@ -559,7 +595,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$parentVar['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -597,7 +633,7 @@ class SurveyMultiCrosstabs { echo $this->snippet($this->variablesList[$var['spr']]['naslov'], 25); // Gumb za brisanje - echo '
    '; + echo '
    '; echo ''; } @@ -620,7 +656,7 @@ class SurveyMultiCrosstabs { // Vrstica za sumo (ce jo imamo vklopljeno) if($this->table_settings[$this->table_id]['sums'] == 1 && count($this->selectedVars['ver']) > 0 && !$this->colLevel2){ echo ''; - echo ''; + echo ''; // Loop cez vse stolpce foreach($this->selectedVars['ver'] as $spr2){ @@ -681,37 +717,26 @@ class SurveyMultiCrosstabs { echo ''; - echo '
    '.$lang['srv_multicrosstabs_add'].'
    '.$lang['srv_multicrosstabs_add'].''.$lang['srv_multicrosstabs_add'].'
    '.$lang['srv_analiza_crosstab_skupaj'].''.$lang['srv_analiza_crosstab_skupaj'].'
    '.$lang['srv_analiza_crosstab_skupaj'].''.$lang['srv_analiza_crosstab_skupaj'].'
    '; - - echo '
    '; - // Izrisemo legendo + echo '
    '; $this->displayLegend(); - - - // Ce smo v custom reportu tega ne izpisemo - if($_GET['m'] != 'analysis_creport'){ - - // Zvezdica za vkljucitev v porocilo - SurveyAnalysisHelper::getInstance()->addCustomReportElement($type=10, $sub_type=0, $spr1=$this->table_id); - - - echo ''; - } - echo '
    '; + + + // JS + echo ''; } // Izpis celic v vrstici s podatki @@ -1106,7 +1131,7 @@ class SurveyMultiCrosstabs { // Numerus if($this->table_settings[$this->table_id]['numerus'] == 1){ echo '
    '; - echo $crosstabs['sumaSkupna']; + echo ($crosstabs['sumaSkupna'] != '') ? $crosstabs['sumaSkupna'] : '0'; echo '
      1 ? (' colspan="'.$stolpci.'"') : '').'>  1 ? ('colspan="'.$stolpci.'"') : '').' '.($show_mass_delete ? 'style="min-width:190px"' : '').'>'; + + // Editiranje na dnu - brisanje vec userjev hkrati... + if($show_mass_delete){ + self::displayMassDelete(); + } + + echo '
    '.$lang['status'].':
    '.$lang['status'].''.($rowu['last_status'] ? $rowu['last_status'] : ' ').'
    '; echo ''; + # checkbox - echo ''; + echo ''; foreach ($fields AS $fkey =>$field) { if ($field == 1) { - if ($fkey == 'sent' || $fkey == 'responded' || $fkey == 'unsubscribed' ) { - #echo ''; + + if ($fkey == 'sent' || $fkey == 'responded' || $fkey == 'unsubscribed' ) { echo 'addSortField($fkey).' class="anl_ac pointer tbl_icon_'.$fkey.'" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).''; - } else if ($fkey == 'last_status' ) { + } + else if ($fkey == 'last_status' ) { echo 'addSortField($fkey).' class="anl_ac pointer" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).''; - } else { + } + else { echo 'addSortField($fkey).' class="pointer" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).''; } } } echo ''; + while ($sql_row = mysqli_fetch_assoc($sql_query_filterd)) { echo ''; - # checkbox - - echo ''; - #izbriši - #echo ''; - echo ''; - #uredi - #echo ''; - echo ''; + + + echo ''; + + // Skoci na urejanje odgovorov - ce imamo identifikatorje povezane s podatki if($this->surveySettings['show_email'] == 1) echo ''; @@ -1776,18 +1816,18 @@ class SurveyInvitationsNew { if ($field == 1) { switch ($fkey) { case 'sent': - echo ''; break; case 'responded': - echo ''; break; case 'unsubscribed': - echo ''; break; case 'last_status': @@ -1832,37 +1872,48 @@ class SurveyInvitationsNew { } } + echo ''; + @ob_flush(); } + echo '
     '; + echo ' '; + echo ' 
    '.$lang['srv_inv_list_profiles_delete'].''.$lang['srv_inv_list_profiles_edit'].''; + + # checkbox + echo ''; + #izbriši + echo ''; + + #uredi + echo ''; + + echo ''; - echo ''; + echo ''; + echo ((int)$sql_row['sent'] == 1 ? $lang['sent'] : $lang['not_sent']); echo ''; + echo ''; echo ''; echo ''; - echo ''; + echo ''; + echo ((int)$sql_row['unsubscribed'] == 1 ? $lang['unsubscribed'] : $lang['not_unsubscribed']); echo '
    '; + + echo ''; + echo ''; + # če že imamo prejemnike v bazi ponudimo gumb naprej if ($count_all > 0) { - echo ''; - echo '

    '; + echo ''; + echo ''; } - echo ''; - - } else { - echo $lang['srv_inv_list_no_recipients_filtred'].'
    '; } + else { + echo ''.$lang['srv_inv_list_no_recipients_filtred'].''; + } + echo ''; - } else { - echo $lang['srv_inv_list_no_recipients'].'
    '; + } + else { + echo ''.$lang['srv_inv_list_no_recipients'].''; } } @@ -1871,28 +1922,28 @@ class SurveyInvitationsNew { $row = $this->surveySettings; - - echo '

    '; + + echo '
    '; // Text s podatki o nastavitvah posiljanja - $settings_text = ''.$lang['srv_inv_message_type'].':'; + $settings_text = ''.$lang['srv_inv_message_type'].': '; $individual = (int)$this->surveySettings['individual_invitation']; if($individual == 0){ - $settings_text .= ''.$lang['srv_inv_settings_individual_0'].''; + $settings_text .= ''.$lang['srv_inv_settings_individual_0'].''; } else{ - $settings_text .= ''.$lang['srv_inv_settings_individual_1'].''; + $settings_text .= ''.$lang['srv_inv_settings_individual_1'].''; } $settings_text .= ' - '; $noEmailing = SurveySession::get('inv_noEmailing'); if($noEmailing == 0){ - $settings_text .= ''.$lang['srv_inv_settings_noEmail_0'].''; + $settings_text .= ''.$lang['srv_inv_settings_noEmail_0'].''; } else{ - $settings_text .= ''.$lang['srv_inv_settings_noEmail_1'].''; + $settings_text .= ''.$lang['srv_inv_settings_noEmail_1'].''; } $settings_text .= ' - '; @@ -1912,25 +1963,23 @@ class SurveyInvitationsNew { } } - $settings_text .= ' '.$lang['edit4'].''; + $settings_text .= ''; echo $settings_text; + + echo '
    '; - //echo ' '; - //echo ' '; - - echo '

    '; - - + // Ce posiljamo preko emaila if($noEmailing != 1){ - echo '
    '; + echo '
    '; if ($this->checkDefaultMessage() == false) { echo ''; echo $lang['srv_invitation_note6']; echo ''; - } else { + } + else { $sql_string = "SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid'"; $sql_query = sisplet_query($sql_string); $array_messages = array(); @@ -1945,135 +1994,173 @@ class SurveyInvitationsNew { } $preview_message = $array_messages[$mid]; - echo '
    '; + + echo '
    '; + echo ''.$lang['srv_invitation_message_choose'].':
    '; - echo '
    '; + + + echo '
    '; + echo '
      '; foreach ($array_messages AS $_m => $message) { - echo '
    1. '; + echo '
    2. '; + echo $message['naslov']; + + if($message['id'] == $mid){ + + echo '
      '; + + if (count($array_messages) > 1) + echo ''; + + echo ''; + + echo '
      '; + } + echo '
    3. '; } echo '
    '; + echo '
    '; #invitation_messages - echo '
    '; - if (count($array_messages) > 1) { - echo ''.$lang['srv_inv_message_delete_profile'].'
    '; - } - echo ''.$lang['srv_inv_message_rename_profile'].''; - { - # polovimo podatke profila - $sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'"; - $sql_query = sisplet_query($sql_string); - $sql_row = mysqli_fetch_assoc($sql_query); + + + # polovimo podatke profila + $sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'"; + $sql_query = sisplet_query($sql_string); + $sql_row = mysqli_fetch_assoc($sql_query); - $avtor = array(); - $edit = array(); - if (trim($sql_row['name'])) { - $avtor[] = trim ($sql_row['name']); - } - if (trim($sql_row['surname'])) { - $avtor[] = trim ($sql_row['surname']); - } + $avtor = array(); + $edit = array(); + if (trim($sql_row['name'])) { + $avtor[] = trim ($sql_row['name']); + } + if (trim($sql_row['surname'])) { + $avtor[] = trim ($sql_row['surname']); + } - if ( count($avtor) > 0 ) { - echo '
    '.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'
    '; - } - if ( count($avtor) > 0 ) { - echo '
    '.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; - } - if (trim($sql_row['ename'])) { - $edit[] = trim ($sql_row['ename']); - } - if (trim($sql_row['esurname'])) { - $edit[] = trim ($sql_row['esurname']); - } - if ( count($edit) > 0 && $edit != $avtor) { - echo '
    '.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'
    '; - } - if ($sql_row['insert_time'] != $sql_row['edit_time']) { - echo '
    '.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; - } - - echo '
    '.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'
    '; - } - - echo '
    '; #inv_messages_profiles_holder + echo '
    '; + + if ( count($avtor) > 0 ) { + echo '
    '.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'
    '; + } + if ( count($avtor) > 0 ) { + echo '
    '.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; + } + if (trim($sql_row['ename'])) { + $edit[] = trim ($sql_row['ename']); + } + if (trim($sql_row['esurname'])) { + $edit[] = trim ($sql_row['esurname']); + } + + if ( count($edit) > 0 && $edit != $avtor) { + echo '
    '.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'
    '; + } + if ($sql_row['insert_time'] != $sql_row['edit_time']) { + echo '
    '.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; + } + + echo '
    '.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'
    '; + + echo '
    '; + + + echo '
    '; #inv_messages_profiles_holder + $MA = new MailAdapter($this->sid, $type='invitation'); + # zlistamo seznam vseh sporočil # izpišemo primer besedila - echo '
    '; - echo ''.$lang['srv_inv_message_draft_content_heading'].' '.Help::display('srv_inv_message_title'); + echo '
    '; + + echo ''.$lang['message'].' '.Help::display('srv_inv_message_title').''; + + echo '
    '; + - //echo ''.$lang['srv_inv_message_draft_settings'].''; - echo '
    '; - echo ''; echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + getUrlLists(); - if (count($urls) > 0) { - echo ''; - echo ''; - echo ''; + + echo ''; } - echo '
    '.$lang['srv_inv_message_draft_content_from'].':'; + + + echo '
    '; + + echo '
    '; + echo ' '; if($MA->getMailFrom() == '') - echo ''.$lang['srv_usermailing_setting'].''; + echo ' '.$lang['srv_usermailing_setting'].''; else echo $MA->getMailFrom(); - echo ''; - echo '
    '.$lang['srv_inv_message_draft_content_reply'].':'; + echo ' '; + echo ' '; + + echo '
    '; + echo ' '; echo $MA->getMailReplyTo(); - echo ''; - echo '
    '.$lang['srv_inv_message_draft_content_subject'].':'; - echo ''; - echo '
    '.$lang['srv_inv_message_draft_content_body'].':
    '; - echo ''; + echo ' '; + echo '
    '; + echo ''; + + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + ?> -
    '.$lang['srv_inv_message_draft_url'].''; - echo ''; foreach ($urls AS $url) { - $selected = ''; + $selected = ''; if ($preview_message['url'] == '') { - if ($preview_message['dc'] == true) { - $selected = ' selected="selected"'; + if ($preview_message['dc'] == true) { + $selected = ' selected="selected"'; } } else if ($preview_message['url'] == $url['url']) { - $selected = ' selected="selected"'; + $selected = ' selected="selected"'; } echo ''; } echo ''; - echo '
    '; + echo '
    '; - echo '
    '; - echo ''.$lang['srv_invitation_forward'].''; - echo ''.$lang['srv_inv_message_save'].''; - echo ''.$lang['srv_invitation_message_saveNew'].''; + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; - echo '
    '; + echo ''; - echo '

    '; + + echo '

    '; + echo '

    '.$lang['srv_inv_message_help_title'].'

    '; + $_indicators = $this->getAvailableIndicators(); $_sysVars = $this->getAvailableSysVars(); @@ -2104,7 +2191,7 @@ class SurveyInvitationsNew { echo $lang['srv_invitation_note12']; } - echo '

    '; + echo ''; } echo '
    '; @@ -2116,13 +2203,15 @@ class SurveyInvitationsNew { echo $lang['srv_inv_message_noemailing_text']; echo '
    '; - echo '
    '; + + echo '
    '; if ($this->checkDefaultMessage() == false) { echo ''; echo $lang['srv_invitation_note6']; echo ''; - } else { + } + else { $sql_string = "SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid'"; $sql_query = sisplet_query($sql_string); $array_messages = array(); @@ -2137,124 +2226,153 @@ class SurveyInvitationsNew { } $preview_message = $array_messages[$mid]; - echo '
    '; + + echo '
    '; + echo ''.$lang['srv_invitation_message_choose'].':
    '; - echo '
    '; + + + echo '
    '; + echo '
      '; foreach ($array_messages AS $_m => $message) { - echo '
    1. '; + + echo '
    2. '; + echo $message['naslov']; + + if($message['id'] == $mid){ + + echo '
      '; + + if (count($array_messages) > 1) + echo ''; + + echo ''; + + echo '
      '; + } + echo '
    3. '; } echo '
    '; + echo '
    '; #invitation_messages - echo '
    '; - if (count($array_messages) > 1) { - echo ''.$lang['srv_inv_message_delete_profile'].'
    '; - } - echo ''.$lang['srv_inv_message_rename_profile'].''; - { - # polovimo podatke profila - $sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'"; - $sql_query = sisplet_query($sql_string); - $sql_row = mysqli_fetch_assoc($sql_query); - $avtor = array(); - $edit = array(); - if (trim($sql_row['name'])) { - $avtor[] = trim ($sql_row['name']); - } - if (trim($sql_row['surname'])) { - $avtor[] = trim ($sql_row['surname']); - } - if ( count($avtor) > 0 ) { - echo '
    '.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'
    '; - } - if ( count($avtor) > 0 ) { - echo '
    '.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; - } - if (trim($sql_row['ename'])) { - $edit[] = trim ($sql_row['ename']); - } - if (trim($sql_row['esurname'])) { - $edit[] = trim ($sql_row['esurname']); - } + # polovimo podatke profila + $sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'"; + $sql_query = sisplet_query($sql_string); + $sql_row = mysqli_fetch_assoc($sql_query); + + $avtor = array(); + $edit = array(); + if (trim($sql_row['name'])) { + $avtor[] = trim ($sql_row['name']); + } + if (trim($sql_row['surname'])) { + $avtor[] = trim ($sql_row['surname']); + } + + + echo '
    '; + + if ( count($avtor) > 0 ) { + echo '
    '.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'
    '; + } + if ( count($avtor) > 0 ) { + echo '
    '.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; + } + if (trim($sql_row['ename'])) { + $edit[] = trim ($sql_row['ename']); + } + if (trim($sql_row['esurname'])) { + $edit[] = trim ($sql_row['esurname']); + } + + if ( count($edit) > 0 && $edit != $avtor) { + echo '
    '.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'
    '; + } + if ($sql_row['insert_time'] != $sql_row['edit_time']) { + echo '
    '.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; + } + + echo '
    '.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'
    '; + + echo '
    '; - if ( count($edit) > 0 && $edit != $avtor) { - echo '
    '.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'
    '; - } - if ($sql_row['insert_time'] != $sql_row['edit_time']) { - echo '
    '.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
    '; - } - - echo '
    '.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'
    '; - } - echo '
    '; #inv_messages_profiles_holder + echo '
    '; #inv_messages_profiles_holder + $MA = new MailAdapter($this->sid, $type='invitation'); + # zlistamo seznam vseh sporočil # izpišemo primer besedila - echo '
    '; - echo ''.$lang['srv_inv_message_draft_content_heading'].' '.Help::display('srv_inv_message_title_noEmail'); + echo '
    '; - //echo ''.$lang['srv_inv_message_draft_settings'].''; - echo '
    '; - echo ''; + echo ''.$lang['message'].' '.Help::display('srv_inv_message_title_noEmail').''; + + echo '
    '; + + echo '
    '; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + + ?> + + getUrlLists(); if (count($urls) > 0) { - echo ''; - echo ''; - echo ''; - } - echo '
    '.$lang['srv_inv_message_draft_content_subject'].':'; - echo ''; - echo '
    '.$lang['srv_inv_message_draft_content_body'].':
    '; - echo ''; - echo '
    '; - ?> -
    '.$lang['srv_inv_message_draft_url'].''; - echo ''; foreach ($urls AS $url) { - $selected = ''; + $selected = ''; if ($preview_message['url'] == '') { - if ($preview_message['dc'] == true) { - $selected = ' selected="selected"'; + if ($preview_message['dc'] == true) { + $selected = ' selected="selected"'; } } else if ($preview_message['url'] == $url['url']) { - $selected = ' selected="selected"'; + $selected = ' selected="selected"'; } echo ''; } echo ''; - echo '
    '; - echo '
    '; - - echo '
    '; - echo ''.$lang['srv_invitation_forward'].''; - echo ''.$lang['srv_inv_message_save'].''; - echo ''.$lang['srv_invitation_message_saveNew'].''; - + echo '
    '; + } + echo '
    '; + + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo '
    '; + + + echo ''; } echo '
    '; } - - echo '
    '; } function checkDefaultMessage() { @@ -2851,111 +2969,115 @@ class SurveyInvitationsNew { $active_step['1'] = ' active'; break; } + if (SurveyInfo::getInstance()->checkSurveyModule('email') || SurveyInfo::getInstance()->checkSurveyModule('phone')) { $disabled = false; $css_disabled = ''; - } else { + } + else { $disabled = true; - $css_disabled = '_disabled'; + $css_disabled = 'disabled'; } if($isEmail) { - #$spaceChar = '»'; - $spaceChar = ' '; - echo '
    '; - echo ''; + + echo '
    '; + + + // Step 1 - nastavitve + echo ''; - #space - echo '
     
    '; - echo '
    '; - - $class_yellow = ' yellow'; + + // Space + echo '
    '; - #navigacija - echo '
    '; + + // Step 2 - dodaj + echo ''; - - echo '
    '.$spaceChar.'
    '; - echo ''; - echo '
    '.$spaceChar.'
    '; - if ($disabled == false) { - echo ''; - } - echo ''; - echo '
    '.$spaceChar.'
    '; - echo ''; - - echo '
    '; - - - // Pregled - #space - echo '
     
    '; - - echo ''; - - - // Seznami - #space - echo '
     
    '; - - echo ''; + + // Space + echo '
    '; + + + // Step 3 - preglej + echo ''; + + + // Space + echo '
    '; + + + // Step 4 - sporocilo + + echo ''; + + + // Space + echo '
    '; + + + // Step 5 - poslji + echo ''; - echo '
    '; - echo '
    '; + + // Nastavitve zgoraj desno + echo '
    '; + + // Pregled + echo ''; + + // Seznami + echo ''; + + echo '
    '; + + + echo '
    '; } } @@ -2970,37 +3092,38 @@ class SurveyInvitationsNew { $row = $this->surveySettings; + # Pripravimo izbor komu lahko pošiljamo - echo '

    '; + echo '
    '; // Text s podatki o nastavitvah posiljanja - $settings_text = ''.$lang['srv_inv_message_type'].':'; + $settings_text = ''.$lang['srv_inv_message_type'].': '; $individual = (int)$this->surveySettings['individual_invitation']; if($individual == 0){ - $settings_text .= ''.$lang['srv_inv_settings_individual_0'].''; + $settings_text .= ''.$lang['srv_inv_settings_individual_0'].''; } else{ - $settings_text .= ''.$lang['srv_inv_settings_individual_1'].''; + $settings_text .= ''.$lang['srv_inv_settings_individual_1'].''; } $settings_text .= ' - '; if($noEmailing == 0){ - $settings_text .= ''.$lang['srv_inv_settings_noEmail_0'].''; + $settings_text .= ''.$lang['srv_inv_settings_noEmail_0'].''; } else{ - $settings_text .= ''.$lang['srv_inv_settings_noEmail_1'].''; + $settings_text .= ''.$lang['srv_inv_settings_noEmail_1'].''; } $settings_text .= ' - '; if($row['usercode_required'] == 0 && $individual != 0){ - $settings_text .= ''.$lang['srv_inv_settings_URL_0']; + $settings_text .= ''.$lang['srv_inv_settings_URL_0']; $settings_text .= ' ('.$lang['srv_inv_settings_code_0'].')'; } else{ - $settings_text .= ''.$lang['srv_inv_settings_URL_1']; + $settings_text .= ''.$lang['srv_inv_settings_URL_1']; if($row['usercode_skip'] == 1 || $individual == 0){ $settings_text .= ' ('.$lang['srv_inv_settings_code_2'].')'; @@ -3010,49 +3133,48 @@ class SurveyInvitationsNew { } } - $settings_text .= ' '.$lang['edit4'].''; + $settings_text .= ''; echo $settings_text; - echo '

    '; + + echo '
    '; if ($this->checkDefaultMessage() == false) { - echo ''; + echo '
    '; echo $lang['srv_invitation_note6']; - echo ''; + echo '
    '; + exit(); } - echo '
    '; + echo '
    '; # damo v tabelo zaradi prilagajanja oblike levo/desno - echo ''; + echo '
    '; // Pri volitvah vedno posiljamo samo tistim, katerim se nismo poslali if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ - echo '
    '; + echo ''; } - echo ''; - echo '
    '; + echo '
    '.$lang['srv_notifications_send_reciever2'].''; - echo '
    '; + echo '
    '; - echo $lang['srv_inv_send_who_database'].'
    '; - echo ''; - echo ''; - echo ''; - + echo ' '.$lang['srv_inv_send_who_database'].''; + echo ' '; + $this->advancedCondition(); - echo '
    '; - echo ''; - echo '
    '; - echo '
    '; + echo ' '; + echo ' '; + + echo '
    '; + echo '
    '; $this->displayMailToSourceLists((int)$_POST['source_type']); echo '
    '; #id="inv_select_mail_to_source_lists" - echo '
    '; - # polovimo sporočilo in prejemnike $sql_query_m = sisplet_query("SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid' AND isdefault='1'"); if (mysqli_num_rows($sql_query_m) > 0 ) { @@ -3067,37 +3189,42 @@ class SurveyInvitationsNew { exit(); } - echo '
    '; - + echo ''; + + + // Desna stran + echo '
    '; + // Ce posiljamo preko navadne poste ali smsov, nimamo sporocila if($noEmailing == 0){ - echo ''; - echo '
    '; + echo '
    '.$lang['message'].''; + echo ''; $this->displayMessagePreview(); - echo '
    '; // inv_select_mail_preview - echo '
    '; - - echo '
    '; + echo ''; + + echo '
    '.$lang['srv_inv_nav_email_invitations'].''; $this->selectSendTo(); - echo '
    '; // inv_select_mail_to_respondents + echo ''; } else{ - echo ''; + echo '
    '.$lang['srv_inv_nav_email_invitations'].''; + + echo ''; + $noEmailingType = SurveySession::get('inv_noEmailing_type'); echo ''; - - echo '
    '; - $this->selectSendToNoEmailing(); - echo '
    '; // inv_select_mail_to_respondents - } - - echo '
    '; + $this->selectSendToNoEmailing(); + + echo ''; + } + + echo '
    '; + echo '
    '; //inv_send_mail } @@ -3107,9 +3234,13 @@ class SurveyInvitationsNew { $canShowSubOption = false; - echo '

    '; - echo $lang['srv_inv_send_who_create1'].''.$lang['srv_inv_send_who_create2'].'
    '; - + echo '

    '; + echo ' '.$lang['srv_inv_send_who_create1'].''.$lang['srv_inv_send_who_create2'].''; + echo '
    '; + + + echo '
    '; + if ((int)$source_type == 0) { # vsi respondenti v bazi echo $lang['srv_inv_send_who_database_note']; @@ -3128,20 +3259,27 @@ class SurveyInvitationsNew { $canShowSubOption = true; echo $lang['srv_inv_send_who_archive_note']; + echo ''; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ''; while ($row_arc = mysqli_fetch_assoc($sql_query_arc)) { echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ' '; + + echo ' '; + + echo ' '; + + echo ' '; echo ''; } @@ -3170,12 +3308,14 @@ class SurveyInvitationsNew { echo $lang['srv_inv_send_who_all_units_note']; echo '
     '.$lang['srv_inv_send_who_table_address'].''.$lang['srv_inv_send_who_table_respondents'].''.$lang['srv_inv_send_who_table_date_create'].' '.$lang['srv_inv_send_who_table_address'].''.$lang['srv_inv_send_who_table_respondents'].''.$lang['srv_inv_send_who_table_date_create'].'
    '.$row_arc['naslov'].''.((int)$row_arc['cnt_succsess']+(int)$row_arc['cnt_error']).''.$row_arc['ds'].''; + echo ' '; + echo ' '.$row_arc['naslov'].''.((int)$row_arc['cnt_succsess']+(int)$row_arc['cnt_error']).''.$row_arc['ds'].'
    '; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ''; + while ($row_arc = mysqli_fetch_assoc($sql_query_arc)) { if ($row_arc['id'] > 0 && $row_arc['naslov'] == '') { @@ -3198,10 +3338,15 @@ class SurveyInvitationsNew { } echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ' '; + + echo ' '; + + echo ' '; + + echo ' '; echo ''; } } @@ -3211,29 +3356,33 @@ class SurveyInvitationsNew { echo $lang['srv_inv_send_who_no_lists']; } } - echo '

    '; + + echo ''; + if ($canShowSubOption == true) { - echo ''; - echo ''.$lang['srv_inv_send_note'].'
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; + echo '
    '; + + echo ''.$lang['srv_inv_send_note'].''; + echo ''; + echo ''; + echo ''; + echo ''; - echo ''.$lang['srv_invitation_send_advanced'].'
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; - echo '
    '; + echo ''; + + echo '
    '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo '
    '; - echo ''; // inv_select_mail_to + + echo '
    '; } } @@ -3286,53 +3435,56 @@ class SurveyInvitationsNew { $pages = ceil($numRespondents / $this->rec_send_page_limit); if (count($respondents) > 0) { - echo '
    '; + echo '
    '; + + echo '
    '; // Način pošiljanja - echo ''; - echo $lang['srv_inv_message_type'].': '; - echo $lang['email']; - echo '

    '; + echo '
    '; + echo ' '.$lang['srv_inv_message_type'].': '.$lang['email'].''; + echo '
    '; - echo ''; // Komentar pri posiljanju - echo '

    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; // Pobrisi podvojene maile - echo ' '.Help::display('srv_inv_sending_double').'
    '; - - // Gumb Poslji - echo '
    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; - // Komentiram kot workaround (če ni zakomentiran, ob ajaxu tu vrine konec forme) - MISLIM DA JE TA POPRAVEK ŠE VEDNO POTREBEN (v kombinaciji z Robertovim) - //echo '
    '; - + // Gumb Poslji + echo '
    '; + echo ' '; + echo '
    '; + + // Seznam mailov na katere bomo poslali - if ((int)$this->invitationAdvancedConditionId > 0) - { - //if (is_array($this->user_inv_ids) && count($this->user_inv_ids) > 0) - { - echo ''; - $scp = new SurveyCondition($this->sid); - $note = $scp -> getConditionString($this->invitationAdvancedConditionId ); - echo $note; - #$scp -> displayConditionNote($this->invitationAdvancedConditionId ); - echo ''; - echo '
    '; - } + if ((int)$this->invitationAdvancedConditionId > 0){ + echo '
    '; + $scp = new SurveyCondition($this->sid); + $note = $scp -> getConditionString($this->invitationAdvancedConditionId ); + echo $note; + echo '
    '; } + # izpišemo seznam e-mailov in dodamo checkboxe - echo '
    '.$lang['srv_inv_potencial_respondents'].' '.count($respondents).'
    '; + echo '
    '; + echo ''.$lang['srv_inv_potencial_respondents'].' '.count($respondents).''; + echo '
    '; # izpišemo opozorilo kadar pošiljamo na več kakor 5000 naslovov $text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit']; - echo '
    '.$text.'
    '; + echo '
    '; + echo $text; + echo '
    '; echo ''; + # da preprečimo večkratno pošiljanje session_start(); list($short,$long) = $this->generateCode(); @@ -3354,33 +3506,47 @@ class SurveyInvitationsNew { $lists['-1'] = $lang['srv_invitation_new_templist']; $lists['0'] = $lang['srv_invitation_new_templist_author']; - - echo '
    Pošiljam . . . Prosimo počakajte.
    '; - echo '
     '.$lang['srv_inv_send_who_table_list_name'].''.$lang['srv_inv_send_who_table_respondents'].''.$lang['srv_inv_send_who_table_date_create'].' '.$lang['srv_inv_send_who_table_list_name'].''.$lang['srv_inv_send_who_table_respondents'].''.$lang['srv_inv_send_who_table_date_create'].'
    '.$_naslov.''.$row_arc['cnt_succsess'].''.$row_arc['ds'].''; + echo ' '; + echo ' '.$_naslov.''.$row_arc['cnt_succsess'].''.$row_arc['ds'].'
    '; + + echo '
    '; + echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ''; + $cnt=1; foreach ($respondents as $pass => $respondent) { echo ' $this->rec_send_page_limit ? ' class="displayNone"' : '').'>'; - echo ''; - echo ''; - echo ''; - if ($lists[$respondent['list_id']] != '') { - echo ''; - } else { - echo ''; + + echo ' '; + + echo ' '; + + echo ' '; + + if ($lists[$respondent['list_id']] != '') { + echo ' '; + } + else { + echo ' '; } + echo ''; + $cnt++; } echo '
    '.''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_last_status'].''.$lang['srv_inv_recipients_list_id'].''.''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_last_status'].''.$lang['srv_inv_recipients_list_id'].'
    '.$respondent['email'].''.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.''.$lists[$respondent['list_id']].''.$lang['srv_inv_send_who_table_list_deleted'].''; + echo ' '; + echo ' '; + echo ' '.$respondent['email'].''.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.''.$lists[$respondent['list_id']].''.$lang['srv_inv_send_who_table_list_deleted'].'
    '; - echo ''; + + echo '
    '; + + echo ''; } } if ($cnt == 0) { @@ -3438,54 +3604,64 @@ class SurveyInvitationsNew { // Način pošiljanja $noEmailingType = SurveySession::get('inv_noEmailing_type'); - echo ''; - echo $lang['srv_inv_message_type_external'].': '; + echo '
    '; + echo ' '.$lang['srv_inv_message_type_external'].': '; if($noEmailingType == 1) - echo $lang['srv_inv_message_noemailing_type2']; + echo $lang['srv_inv_message_noemailing_type2']; elseif($noEmailingType == 2) - echo $lang['srv_inv_message_noemailing_type3']; + echo $lang['srv_inv_message_noemailing_type3']; else - echo $lang['srv_inv_message_noemailing_type1']; - echo '

    '; + echo $lang['srv_inv_message_noemailing_type1']; + echo '
    '; + + echo '
    '; + echo '
    '; - // Komentar pri posiljanju - echo '

    '; + // Komentar pri posiljanju + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; // Pobrisi podvojene maile - echo ' '.Help::display('srv_inv_sending_double').'
    '; - - // Gumb poslji - echo '
    '; - + echo '
    '; + echo ' '; + echo ' '; echo '
    '; + + // Gumb Poslji + echo '
    '; + echo ' '; + echo '
    '; + // Seznam mailov na katere bomo poslali - if ((int)$this->invitationAdvancedConditionId > 0) - { - #if (is_array($this->user_inv_ids) && count($this->user_inv_ids) > 0) - { - echo ''; - $scp = new SurveyCondition($this->sid); - $note = $scp -> getConditionString($this->invitationAdvancedConditionId ); - echo $note; - #$scp -> displayConditionNote($this->invitationAdvancedConditionId ); - echo ''; - echo '
    '; - } + if ((int)$this->invitationAdvancedConditionId > 0){ + + echo '
    '; + + $scp = new SurveyCondition($this->sid); + $note = $scp -> getConditionString($this->invitationAdvancedConditionId ); + echo $note; + + echo '
    '; } + # izpišemo seznam e-mailov in dodamo checkboxe - echo '
    '.$lang['srv_inv_potencial_respondents'].' '.count($respondents).'
    '; + echo '
    '; + echo ''.$lang['srv_inv_potencial_respondents'].' '.count($respondents).''; + echo '
    '; # izpišemo opozorilo kadar pošiljamo na več kakor 5000 naslovov - $text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit']; - echo '
    '.$text.'
    '; + $text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit']; + echo '
    '; + echo $text; + echo '
    '; echo ''; + # da preprečimo večkratno pošiljanje session_start(); list($short,$long) = $this->generateCode(); @@ -3508,9 +3684,8 @@ class SurveyInvitationsNew { $lists['-1'] = $lang['srv_invitation_new_templist']; $lists['0'] = $lang['srv_invitation_new_templist_author']; - echo '
    Pošiljam . . . Prosimo počakajte.
    '; - echo '
    '; + echo '
    '; echo ''; echo ''; echo ''; @@ -3520,20 +3695,34 @@ class SurveyInvitationsNew { echo ''; $cnt=1; foreach ($respondents as $pass => $respondent) { - echo ' $this->rec_send_page_limit ? ' class="displayNone"' : '').'>'; - echo ''; - echo ''; - echo ''; - echo ''; - if ($lists[$respondent['list_id']] != '') { - echo ''; - } else { - echo ''; + + echo ' $this->rec_send_page_limit ? ' class="displayNone"' : '').'>'; + + echo ' '; + + echo ' '; + + echo ' '; + + echo ' '; + + if ($lists[$respondent['list_id']] != '') { + echo ' '; + } + else { + echo ' '; } + echo ''; + $cnt++; } + echo '
    '.''.$lang['srv_inv_recipients_email'].'
    '.$respondent['email'].''.$respondent['firstname'].''.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.''.$lists[$respondent['list_id']].''.$lang['srv_inv_send_who_table_list_deleted'].''; + echo ' '; + echo ' '; + echo ' '.$respondent['email'].''.$respondent['firstname'].''.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.''.$lists[$respondent['list_id']].''.$lang['srv_inv_send_who_table_list_deleted'].'
    '; + echo '
    '; } } @@ -3566,67 +3755,55 @@ class SurveyInvitationsNew { if (mysqli_num_rows($sql_query) > 0 || count($simple_recipents) > 0) { - echo '

    '.$lang['srv_archive_invitation'].'

    '; + echo '
    '.$lang['srv_archive_invitation'].''; + + echo '

    '.$lang['srv_archive_invitation_text'].'

    '; + + echo '

    '.$lang['srv_archive_invitation_text2'].'

    '; + + echo '
    '; + echo '
    '; echo ''; echo ''; - echo ''; - echo ''; + echo ''; echo ''; echo ''; - #echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo ''; - #echo ''; echo ''; + while ($row = mysqli_fetch_assoc($sql_query)) { echo ''; - // Datum - echo ''; - - // Ura - echo ''; + // Datum in ura + echo ''; // Email sporocilo - echo ''; // Subject - echo ''; - #echo ''; - - // Nacin posiljanja (email, posta, sms...) - echo ''; # uspešno poslani - echo ''; # neuspešno poslani - echo ''; echo ''; } echo ''; echo '
    '.$lang['srv_inv_archive_date_send'].''.$lang['srv_inv_archive_hour_send'].''.$lang['srv_inv_archive_date_send'].''.$lang['srv_inv_archive_naslov'].''.$lang['srv_inv_archive_subject_text'].''.$lang['srv_inv_archive_body_text'].''.$lang['srv_inv_message_type'].''.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').''.$lang['srv_inv_archive_cnt_error'].''.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').''.$lang['srv_inv_archive_cnt_error'].''.$lang['srv_inv_archive_sender'].''.$lang['srv_inv_archive_comment'].' 
    '.$row['ds'].''.$row['hs'].''.$row['ds'].' '.$row['hs'].''; + echo ''; echo ''.$row['naslov'].''; echo ''; + echo ''; echo $row['subject_text']; echo ''.$row['body_text'].''; - if ($row['tip'] == '0') - echo ''.$lang['srv_inv_message_noemailing_type1'].''; - elseif($row['tip'] == '1') - echo ''.$lang['srv_inv_message_noemailing_type2'].''; - elseif($row['tip'] == '2') - echo ''.$lang['srv_inv_message_noemailing_type3'].''; - else - echo ''.$lang['email'].''; - echo ''; + echo ''; if ((int)$row['cnt_succsess'] > 0 ) { - echo ''.$row['cnt_succsess'].''; + echo ''.$row['cnt_succsess'].''; } else { echo ''.$row['cnt_succsess'].''; } echo ''; + echo ''; if ((int)$row['cnt_error'] > 0 ) { - echo ''.$row['cnt_error'].''; + echo ''.$row['cnt_error'].''; } else { echo ''.$row['cnt_error'].''; } @@ -3647,13 +3824,16 @@ class SurveyInvitationsNew { # komentar echo ''; - echo ''.$row['comment']; + echo (($row['comment'] == "") ? '/' : $row['comment']); echo '
    '; + + echo '
    '; + echo '
    '; # dodamo simpl pošiljanje if ( count($simple_recipents) > 0 ) { @@ -3693,19 +3873,15 @@ class SurveyInvitationsNew { echo '
    '; } - } else { - echo '
    '; - echo ''.$lang['srv_archive_invitation'].''; + } else { //Če ni še nobenih poslanih vabil echo $lang['srv_invitation_note4'].''; - echo '
    '; } - + echo ''; echo ''; # id="div_archive_content">'; - echo '
    '; } @@ -3730,11 +3906,6 @@ class SurveyInvitationsNew { unset($_SESSION['snd_inv_token'][$this->sid]); session_commit(); - - $dont_send_duplicated = false; - if (isset($_POST['dont_send_duplicated']) && $_POST['dont_send_duplicated'] == 'on') { - $dont_send_duplicated = true; - } $rids = $_POST['rids']; @@ -4011,6 +4182,7 @@ class SurveyInvitationsNew { private function sendMailToUsers($sql_recipients_query, $sending_data){ global $global_user_id; global $site_url; + global $lang; // Preverimo ce je vklopljen modul za volitve @@ -4032,6 +4204,11 @@ class SurveyInvitationsNew { } } + $dont_send_duplicated = false; + if (isset($_POST['dont_send_duplicated']) && $_POST['dont_send_duplicated'] == 'on') { + $dont_send_duplicated = true; + } + $duplicated = array(); # array za rezultate @@ -4610,19 +4787,16 @@ class SurveyInvitationsNew { # če so napake jih prikažemo če ne obdelamo datoteko if (count($errors) > 0) { - - echo '
    '; - echo ''.$lang['srv_inv_recipiens_upload_error'].''; - - echo '
    '; - echo '
    '; - - echo ''; + echo '
    '; + + echo ''.$lang['srv_inv_recipiens_upload_error'].''; + foreach($errors as $error) { - echo '* '.$error.'
    '; + echo '* '.$error.''; } - echo ''; + + echo '
    '; $this->addRecipientsView($fields, $invalid_recipiens_array); } @@ -4685,9 +4859,11 @@ class SurveyInvitationsNew { echo ''; // id="arc_content" echo '
    '; echo ''; @@ -4701,17 +4877,17 @@ class SurveyInvitationsNew { $rid = $_POST['inv_rid']; echo '
    '; + echo '

    '.$lang['srv_inv_recipient_delete'].'

    '; + echo ''; - echo 'Ali ste prepričani da želite izbrisati respondenta:'; - echo '
    '; - echo '
    '; + echo '

    '.$lang['srv_inv_recipient_delete_text'].'

    '; # polovimo podatke respondenta $sql_string = "SELECT * FROM srv_invitations_recipients WHERE id = '".(int)$_POST['inv_rid']."'"; $sql_query = sisplet_query($sql_string); $sql_row = mysqli_fetch_assoc($sql_query); - echo ''; # id="inv_view_arch_recipients" /* echo ''; echo '
    '; @@ -8948,17 +9305,19 @@ class SurveyInvitationsNew { # če so napake jih prikažemo če ne obdelamo datoteko if (count($errors) > 0) { - echo '
    '; - echo ''.$lang['srv_inv_recipiens_upload_error'].''; - echo '
    '; - echo '
    '; - echo ''; + echo '
    '; + + echo ''.$lang['srv_inv_recipiens_upload_error'].''; + foreach($errors as $error) { - echo '* '.$error.'
    '; + echo '* '.$error.''; } - echo ''; + + echo '
    '; + #$this->addRecipientsView($fields, $invalid_recipiens_array); - } else { + } + else { $fh = @fopen($file_tmp, "rb"); if ($fh) { @@ -9001,20 +9360,7 @@ class SurveyInvitationsNew { $this->showInvitationLists(); } - /* - function strpos_index($haystack = '',$needle = '',$offset = 0,$limit = 99,$return = null) - { - $length = strlen($needle); - $occurances = array(); - while((($count = count($occurances)) < $limit) && (false !== ($offset = strpos($haystack,$needle,$offset)))) - { - $occurances[$count]['length'] = $length; - $occurances[$count]['start'] = $offset; - $occurances[$count]['end'] = $offset = $offset + $length; - } - return $return === null ? $occurances : $occurances[$return]; - } - */ + /** * Find position of Nth $occurrence of $needle in $haystack * Starts from the beginning of the string @@ -9048,37 +9394,37 @@ class SurveyInvitationsNew { function displayMessagePreview() { global $lang; - $sql_string_m = "SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid' AND isdefault='1'"; - - $sql_query_m = sisplet_query($sql_string_m); + $sql_query_m = sisplet_query("SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid' AND isdefault='1'"); $preview_message = mysqli_fetch_assoc($sql_query_m); - # polovimo imena vseh sporocil - $sql_string_m = "SELECT id, naslov FROM srv_invitations_messages WHERE ank_id = '$this->sid'"; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '
    '.$lang['srv_inv_message_draft_content_name'].':'; - echo ''; - $sql_query_m = sisplet_query($sql_string_m); + # polovimo imena vseh sporocil + + echo '
    '; + + echo '
    '; + echo ' '; + $sql_query_m = sisplet_query("SELECT id, naslov FROM srv_invitations_messages WHERE ank_id = '$this->sid'"); if (mysqli_num_rows($sql_query_m) > 0 ) { - echo ''; while ($row = mysqli_fetch_assoc($sql_query_m)) { - echo ''; + echo ' '; } - echo ''; + echo ' '; } - #.$preview_message['naslov']; - echo ''; - echo '
    '.$lang['srv_inv_message_draft_content_subject'].':'; - echo ''.$preview_message['subject_text'].''; - echo '
    '.$lang['srv_inv_message_draft_content_body'].':'; - echo ''.($preview_message['body_text']).''; - echo '
    '; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '.$preview_message['subject_text'].''; + echo '
    '; + + echo '
    '; + echo ' '; + echo ' '.$preview_message['body_text'].''; + echo '
    '; + + echo '
    '; + // Opozorilo ce manjka #URL# v besedilu maila in imamo individualizirano vabilo if(strpos($preview_message['body_text'], '#URL#') == false && $this->surveySettings['usercode_required'] == 0 && $this->surveySettings['individual_invitation'] != 0) @@ -9089,7 +9435,7 @@ class SurveyInvitationsNew { echo ''.$lang['srv_inv_message_draft_url_warning'].'
    '; // Popravi sporocilo - echo ''.$lang['srv_invitation_reedit_message'].''; + echo ''.$lang['srv_invitation_reedit_message'].''; } function addSortField($field){ @@ -9204,29 +9550,34 @@ class SurveyInvitationsNew { $sqlSpremenlivka = sisplet_query($qryString); if (mysqli_num_rows($sqlSpremenlivka) > 0) { + echo ''; + echo $lang['srv_invitation_system_email_choose']; - echo ''; + + echo '
    '; while ($row = mysqli_fetch_assoc($sqlSpremenlivka)) { - $system_variables[$row['id']] = $row; - echo '
    '; - echo ''; - echo ''; - echo ''; - - echo ''; + echo ''; + + echo ''; } - echo '
    '; + $system_variables[$row['id']] = $row; + + echo '
    '; + $checked = (isset($mappingArray[$row['id']]) && $mappingArray[$row['id']] == 'email' )?' checked="checked"':''; + echo ''; - echo '
    '; - echo ''; - echo '
    '; - echo ''; + + echo ''; + + echo '
    '; + echo ' '; echo '
    '; - } else { + } + else { echo ''.$lang['srv_invitation_system_error3'].''; } } @@ -9272,7 +9623,8 @@ class SurveyInvitationsNew { } else { $errors[] = $lang['srv_invitation_system_error2']; } - } else { + } + else { if ((int)$cntSistemske == 0) { # ni sistemskih spremenljivk @@ -9282,18 +9634,25 @@ class SurveyInvitationsNew { $errors[] = $lang['srv_invitation_system_error4']; } } - echo ''.$lang['srv_invitation_system_validate'].''; - if (count($emailsToAdd)) { - echo ''.$lang['srv_invitation_system_validateAndAdd'].''; + + + echo ''; + + if (count($emailsToAdd)) { + echo ''; } - if (mysqli_num_rows($queryUser) > 0) - { # če je kaj novih zapisov v bazi + + # če že imamo prejemnike v bazi ponudimo gumb naprej + if (mysqli_num_rows($queryUser) > 0){ + echo ''; + } + + + echo '
    '; + + # če je kaj novih zapisov v bazi + if (mysqli_num_rows($queryUser) > 0){ - # če že imamo prejemnike v bazi ponudimo gumb naprej - echo ''.$lang['srv_invitation_forward'].''; - - echo '
    '; - echo '
    '; echo ''; printf($lang['srv_invitation_system_found'],mysqli_num_rows($queryUser)); echo ''; @@ -9311,12 +9670,13 @@ class SurveyInvitationsNew { echo $lang['srv_invitation_system_from_this_invalid'].(int)count($invalidEmails); } } - else - { + else{ echo '
    '; echo '
    '; echo $lang['srv_invitation_system_not_found']; } + + echo '
    '; } function addSysVarsMapping() { global $lang,$global_user_id; @@ -9754,14 +10114,16 @@ class SurveyInvitationsNew { return array(); } - function advancedCondition() - { + function advancedCondition(){ global $lang; - echo ''; + + echo '
    '; + + echo '
    '; + echo $lang['srv_inv_condition_filter'].' '; - if ((int)$this->invitationAdvancedConditionId > 0) - { + if ((int)$this->invitationAdvancedConditionId > 0){ $scp = new SurveyCondition($this->sid); echo ' '.$scp->getConditionName((int)$this->invitationAdvancedConditionId).' '; $this->user_inv_ids = $this->getConditionUserIds($this->invitationAdvancedConditionId); @@ -9773,32 +10135,37 @@ class SurveyInvitationsNew { else { } - echo ''.$lang['srv_profile_edit'].''; - echo ''.$lang['srv_profile_remove'].''; + echo ''; + echo ''; } - else - { - echo ''.$lang['srv_inv_condition_no_filter'].''; - echo ' '; + else{ + echo ''.$lang['srv_inv_condition_no_filter'].''; + echo ''; } - echo ''; + + echo '
    '; + + echo '
    '; } - function listCondition() - { + function listCondition(){ global $lang; + # get all lists $lists = $this->getSurveyInvitationLists(true); $selected = (int)(isset($_SESSION['inv_filter']['list']) ? (int)$_SESSION['inv_filter']['list'] : -2); - echo ' '; - echo ''; + echo ''; + + echo ''; } function getSurveyInvitationLists($add_all = false) @@ -9822,7 +10189,7 @@ class SurveyInvitationsNew { } - function viewServerSettings(){ + private function viewServerSettings(){ global $lang; global $site_url; global $site_url; @@ -9854,15 +10221,17 @@ class SurveyInvitationsNew { if($squalo->getSqualoEnabled()){ // Vklop squalo - echo '

    '; + echo '

    '; - echo ''.$lang['srv_squalo'].': '; + echo '
    '.$lang['srv_squalo'].':
    '; - echo ''; - echo ''; + echo '
    '; + echo ' '; + echo ' getSqualoActive() ? 'checked ="checked" ' : '').' onclick="squaloSwitch();">'; + echo ' '; + echo '
    '; - echo '

    '; + echo '
    '; // Squalo nastavitve... @@ -9878,55 +10247,78 @@ class SurveyInvitationsNew { echo '
    '; // Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve - echo '

    '.$lang['srv_email_server_settings_warning'].'

    '; + + echo '
    '.$lang['srv_email_server_settings_warning'].'
    '; + // Izbira SMTP streznika - echo ''.$lang['srv_email_setting_select_server'].' '; + echo '
    '; + + echo '
    '.$lang['srv_email_setting_select_server'].'
    '; // AAI ima Arnesov smtp if(isAAI()){ - echo ''; + echo '
    '; + echo ' is1KA() ? 'checked ="checked" ' : '').' onclick="smtpAAIPopupShow();">'; + echo ' '; + echo '
    '; } else{ - echo ''; + echo '
    '; + echo ' is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').addClass(\'displayNone\'); $(\'#send_mail_mode0\').removeClass(\'displayNone\');">'; + echo ' '; + echo '
    '; } - + // Google smtp je viden samo starim, kjer je ze vklopljen if($MA->isGoogle()){ - echo ''; + echo '
    '; + echo ' isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').addClass(\'displayNone\'); $(\'#send_mail_mode1\').removeClass(\'displayNone\');">'; + echo ' '; + echo '
    '; } // Lastni smtp - echo ''; - - echo Help :: display('srv_mail_mode'); + echo '
    '; + echo ' isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').addClass(\'displayNone\'); $(\'#send_mail_mode2\').removeClass(\'displayNone\');">'; + echo ' '; + echo '
    '; echo '
    '; #1KA $enkaSettings = $MA->get1KASettings($raziskave=true); + echo '
    is1KA() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>'; - echo '
    '.$lang['srv_email_setting_settings'].''; - echo '
    '; + + echo '
    '.$lang['srv_email_setting_settings'].'
    '; + + + echo '
    '; + # from - echo '

    '; - echo '

    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + # replyTo - echo '

    '; - echo '

    '; + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + #delay - echo '

    '; - echo '

    '; + . ''; + echo '
    '; + + echo '
    '; + + echo '
    '; + #GMAIL - Google $enkaSettings = $MA->getGoogleSettings(); + echo '
    isGoogle() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>'; - echo '
    '.$lang['srv_email_setting_adapter1_note'].'
    '; - echo '
    '.$lang['srv_email_setting_settings'].'
    '; - # from - echo '

    '; - echo '

    '; - # replyTo - echo '

    '; - echo '

    '; - #Password - echo '

    '; - echo '

    '; + + echo '
    '; + echo '
    '.$lang['srv_email_setting_adapter1_note'].'
    '; + echo '
    '.$lang['srv_email_setting_settings'].'
    '; echo '
    '; + + echo '
    '; + + # from + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + # replyTo + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + + #Password + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + + #SMTP $enkaSettings = $MA->getSMTPSettings(); + echo '
    isSMTP() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>'; - echo '
    '.$lang['srv_email_setting_adapter2_note'].'
    '; - echo '
    '.$lang['srv_email_setting_settings'].'
    '; - # from - NICE - echo '

    '; - echo '

    '; - # from - echo '

    '; - echo '

    '; - # replyTo - echo '

    '; - echo '

    '; - #Username - echo '

    '; - echo '

    '; - #Password - echo '

    '; - echo '

    '; - #autentikacija - echo '

    '; - echo $lang['srv_email_setting_autentication']; - echo ''; - echo ''; - echo '

    '; - #Varnost SMTPSecure - echo '

    '; - echo $lang['srv_email_setting_encryption']; - echo ''; - echo ''; - echo ''; - echo '

    '; - #port - echo '

    '; - echo ' '.$lang['srv_email_setting_port_note']; - echo '

    '; - #host - echo '

    '; - echo '

    '; + + echo '
    '; + echo '
    '.$lang['srv_email_setting_adapter2_note'].'
    '; + echo '
    '; + + echo '
    '; + echo '
    '.$lang['srv_email_setting_settings'].'
    '; + echo '
    '; + + echo '
    '; + + # from - NICE + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + # from + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + + # replyTo + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + + #Username + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + #Password + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + + #autentikacija + echo '
    '; + + echo ' '; + echo ' '; + + echo '
    '; + + #Varnost SMTPSecure + echo '
    '; + + echo ' '; + echo ' '; + + echo '
    '; + + echo '
    '; + + + echo '
    '; + + #port + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + #host + echo '
    '; + echo ' '; + echo ' '; + echo '
    '; + + echo '
    '; + + + echo '
    '; + #delay - echo '

    '; - echo '

    '; + . ''; + + echo '
    '; + + echo '
    '; + + echo ''; + + + echo ''; + + echo ''; + + + echo '
    '; + + // Gumb shrani + echo ''; + + // Gumb preveri nastavitve + echo ''; echo '
    '; - echo ''; - - echo '
    '; - - // Gumb shrani - echo ''; - - // Gumb preveri nastavitve - echo ''; - if ($_GET['s'] == '1') { - echo '
    '; - echo ''; + echo ''; } } @@ -10068,20 +10554,27 @@ class SurveyInvitationsNew { private function showAAISmtpPopup(){ global $lang; - echo ''; + echo ''; echo '

    '.$lang['srv_email_setting_adapter0_aai_title'].'

    '; echo ''; echo '
    '; - echo ''; - echo ''.$lang['srv_cancel'].''; + + echo '
    '; + echo ''; + echo ''; + echo '
    '; + echo '
    '; } } diff --git a/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php b/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php index a8a050522..031a88854 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php +++ b/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php @@ -117,7 +117,7 @@ class SurveyUnsubscribe { return array(substr($cookie,0,6), $cookie); } - function doUnsubscribe() { + public function doUnsubscribe() { global $lang; $anketa = self::$sid; diff --git a/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php b/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php index 1ea7bcb30..77a78f434 100644 --- a/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php +++ b/admin/survey/classes/surveyEmails/squalo/class.SqualoApi.php @@ -220,7 +220,7 @@ class SqualoApi { "gdprCanSend": true, "gdprCanTrack": true */ - public function addRecipient($email, $list_id, $custom_attributes=array()){ + public function addRecipient($email, $phone, $list_id, $custom_attributes=array()){ $action = 'create-recipient'; $method = 'POST'; @@ -240,6 +240,7 @@ class SqualoApi { $data = array( 'email' => $email, + 'phone' => $phone, 'listIds' => array($list_id), 'accept' => true, 'confirmed' => true, diff --git a/admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php b/admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php index 4cfa18a42..73bbf6ab6 100644 --- a/admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php +++ b/admin/survey/classes/surveyEmails/squalo/class.SurveyInvitationsSqualo.php @@ -144,13 +144,14 @@ class SurveyInvitationsSqualo { //'email' => $sql_row['email'], 'code' => $sql_row['password'], 'password' => $sql_row['password'], - 'phone' => $sql_row['phone'], + //'phone' => $sql_row['phone'], 'custom' => $sql_row['custom'], 'unsubscribe' => $unsubscribe, ); $recipients[] = array( 'email' => $sql_row['email'], + 'phone' => $sql_row['phone'], 'name' => $sql_row['firstname'], 'surname' => $sql_row['lastname'], 'custom_attributes' => $custom_attributes @@ -356,10 +357,11 @@ class SurveyInvitationsSqualo { foreach($recipients as $recipient){ $email = $recipient['email']; + $phone = $recipient['phone']; $custom_attributes = $recipient['custom_attributes']; - $recipient_id = $squalo_api->addRecipient($email, $list_id, $custom_attributes); + $recipient_id = $squalo_api->addRecipient($email, $phone, $list_id, $custom_attributes); // Napaka pri ustvarjanju seznama if($recipient_id == '0'){ diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index d2596438a..45054865f 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -13,26 +13,49 @@ */ class CrossRoad { + static function MainNavigation($anketa=null){ + + // Status za tracking sprememb $status = -1; + + // Lokacija v navigaciji + $first_action = ''; + $second_action = ''; + $third_action = ''; + + // Layout strani glede na to kje se nahajamo (imamo levi meni in sirina holderja) + $layout_menu = ''; + $layout_width = ''; + $hide_header = ''; + # ajaxa se poslje skupaj z ajaxom, da ob updatu vemo kaksen 'a' je bil na originalni strani # (drugace se ob updatu z ajaxom informacija o 'a'ju zgubi) $get = $_GET['a']; + if (isset ($_GET['ajaxa'])) $get = $_GET['ajaxa']; - if (trim($get) == '') { + + if (trim($get) == '') $get = A_BRANCHING; - } - + + //smo vezani na anketo if($anketa != null && $anketa > 0){ + switch ($get) { - # status + + # STATUS case A_REPORTI: $first_action = NAVI_STATUS; $second_action = NAVI_STATUS_OSNOVNI; + + $layout_width = 'wide'; + $status = 3; + break; + case A_NONRESPONSE_GRAPH: case A_USABLE_RESP: case A_KAKOVOST_RESP: @@ -48,17 +71,30 @@ class CrossRoad { case A_STATUS_ADVANCED: $first_action = NAVI_STATUS; $second_action = NAVI_STATUS_OSNOVNI; + + $layout_width = 'wide'; + if ($_GET['m'] == 'advanced') + $layout_width = 'fullwidth'; + $status = 4; + break; - # urejanje + + # UREJANJE ANKETE case A_BRANCHING: case A_GLASOVANJE: $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_BRANCHING; + + $layout_width = 'fullwidth'; + $status = 0; + break; + + # TESTIRANJE case A_TESTIRANJE: $first_action = NAVI_TESTIRANJE; $second_action = M_TESTIRANJE_DIAGNOSTIKA; @@ -71,20 +107,38 @@ class CrossRoad { if ($_GET['m'] == M_TESTIRANJE_CAS) { $second_action = NAVI_TESTIRANJE_CAS; } + + $layout_width = 'narrow'; + + if ($_GET['m'] == 'cas' || $_GET['m'] == 'predvidenicas') { + $layout_width = 'wide'; + + } + $status = 4; + break; + + # NASTAVITVE ANKETE case A_KOMENTARJI: case A_KOMENTARJI_ANKETA: $first_action = NAVI_TESTIRANJE; $second_action = NAVI_TESTIRANJE_KOMENTARJI; - $status = 0; - break; + $layout_width = 'narrow'; + if ($_GET['a'] == 'komentarji' || $_GET['a'] == 'komentarji_anketa') + $layout_width = 'wide'; + + $layout_menu = ''; + + $status = 0; + + break; + case A_SETTINGS: case A_OSNOVNI_PODATKI: case A_FORMA: - case A_COOKIE: case A_TRAJANJE: case A_DOSTOP: @@ -99,7 +153,12 @@ class CrossRoad { case A_GDPR: $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_ANKETA; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 0; + break; case A_TEMA: # nastavitve prevajanje @@ -107,30 +166,56 @@ class CrossRoad { case 'edit_css': # nastavitve prevajanje $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_TEMA; + + $layout_width = 'wide'; + if($_GET['t'] == 'upload') + $layout_width = 'narrow'; + $status = 0; + break; case A_HIERARHIJA: $first_action = NAVI_HIERARHIJA; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + break; case A_PREVAJANJE: # nastavitve prevajanje $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_PREVAJANJE; + + $layout_width = 'fullwidth'; + $status = 0; + break; case A_ALERT: $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_ANKETA; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 0; + break; case A_NAGOVORI: $first_action = NAVI_UREJANJE; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 0; + break; + + # ARHIVI case A_ARHIVI: $first_action = ($_GET['m'] == 'data') ? NAVI_RESULTS : NAVI_UREJANJE; $second_action = NAVI_ARHIVI; @@ -142,7 +227,12 @@ class CrossRoad { elseif($_GET['m'] != 'data') $third_action = NAVI_UREJANJE_ARHIVI; + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + + $status = 0; + break; case A_TRACKING: @@ -156,29 +246,50 @@ class CrossRoad { else $third_action = NAVI_UREJANJE_ARHIVI_TRACKING1; + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 0; + break; - # objave, vabila + + # OBJAVA, VABILA case A_VABILA: $first_action = NAVI_OBJAVA; $_GET['m'] == 'settings' ? $second_action = NAVI_OBJAVA_SETTINGS : ($_GET['m'] == 'url' ? $second_action = NAVI_OBJAVA_URL : $second_action = ''); + + $layout_width = 'narrow'; + $status = 5; + break; case A_EMAIL: $first_action = NAVI_OBJAVA; $second_action = NAVI_OBJAVA; + + $layout_width = 'wide'; + $status = 5; + break; case 'invitations': $first_action = NAVI_OBJAVA; $second_action = ($_GET['m'] == 'view_archive') ? NAVI_ARHIVI : 'invitations'; + + $layout_width = 'wide'; + + if ($_GET['m'] == 'view_archive') + $layout_menu = "menu_left"; + $status = 5; + break; - # analize, podatki + + # ANALIZE, PODATKI case A_ANALYSIS: $first_action = NAVI_ANALYSIS; @@ -214,45 +325,85 @@ class CrossRoad { elseif ($_GET['m'] == 'break') { $third_action = NAVI_STATISTIC_ANALYSIS_BREAK; } - + + + if ($_GET['m'] == 'charts') { + $layout_width = 'narrow'; + } + else{ + $layout_width = 'wide'; + } + + if ($_GET['m'] == 'anal_arch') { + $layout_menu = 'menu_left'; + } $status = 2; + break; case A_COLLECT_DATA: $first_action = NAVI_RESULTS; $second_action = NAVI_DATA; + $layout_width = 'fullwidth'; + if ($_GET['m'] == M_COLLECT_DATA_CALCULATION) { $second_action = NAVI_DATA_CALC; $third_action = NAVI_DATA_CALC_CALCULATION; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; } elseif($_GET['m'] == M_COLLECT_DATA_CODING){ $second_action = NAVI_DATA_CALC; $third_action = NAVI_DATA_CALC_CODING; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; } elseif($_GET['m'] == M_COLLECT_DATA_CODING_AUTO){ $second_action = NAVI_DATA_CALC; $third_action = NAVI_DATA_CALC_CODING_AUTO; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; } elseif($_GET['m'] == M_COLLECT_DATA_RECODING){ $second_action = NAVI_DATA_CALC; $third_action = NAVI_DATA_CALC_RECODING; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; } - elseif($_GET['m'] == M_COLLECT_DATA_APPEND){ + elseif($_GET['m'] == M_COLLECT_DATA_APPEND || $_GET['m'] == 'upload_xls' || $_GET['m'] == 'append_xls'){ $second_action = NAVI_DATA_IMPORT; $third_action = NAVI_DATA_IMPORT_APPEND; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; } elseif($_GET['m'] == M_COLLECT_DATA_MERGE){ $second_action = NAVI_DATA_IMPORT; $third_action = NAVI_DATA_IMPORT_MERGE; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + } + elseif ($_GET['m'] == 'quick_edit') { + $layout_width = 'wide'; + } + elseif ($_GET['m'] == 'variables') { + $layout_width = 'wide'; } $status = 4; + break; - #izvozi + + # IZVOZI case A_COLLECT_DATA_EXPORT: $first_action = NAVI_RESULTS; $second_action = NAVI_DATA_EXPORT; @@ -273,6 +424,9 @@ class CrossRoad { $third_action = NAVI_DATA_EXPORT_SPSS; } + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 4; if ($_GET['m'] == A_COLLECT_DATA_EXPORT_ALL) { @@ -285,7 +439,8 @@ class CrossRoad { break; - # dodatne nastavitve + + # DODATNE NASTAVITVE case A_ADVANCED: case A_UPORABNOST: case A_HIERARHIJA_SUPERADMIN: @@ -315,7 +470,12 @@ class CrossRoad { case 'fieldwork': $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_ANKETA; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 0; + break; case A_TELEPHONE: @@ -323,35 +483,135 @@ class CrossRoad { case T_PHONE: $first_action = NAVI_UREJANJE; $second_action = NAVI_UREJANJE_ANKETA; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 5; + break; case A_LANGUAGE_TECHNOLOGY: $first_action = NAVI_TESTIRANJE; $second_action = NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 4; + break; case A_LANGUAGE_TECHNOLOGY_OLD: $first_action = NAVI_TESTIRANJE; $second_action = NAVI_TESTIRANJE_LANGUAGE_TECHNOLOGY_OLD; + + $layout_width = 'wide'; + $layout_menu = 'menu_left'; + $status = 4; + break; default: break; } - //shrani tracking + // shrani tracking za anketo TrackingClass::update($anketa, $status); - //vrni podatke o navigaciji nazaj v SurveyAdmin - return array('first_action' => $first_action, 'second_action' => $second_action, 'third_action' => $third_action); } - //nismo vezani na anketo, tracking uporabnika + // Nismo vezani na anketo, tracking uporabnika else{ + + switch ($get) { + + # AKTIVNOST in UPORABNIKI + case 'diagnostics': + + // Uporabniki + if($_GET['t'] == 'uporabniki'){ + $layout_width = 'narrow'; + if($_GET['m'] == 'all' || $_GET['m'] == ''){ + $layout_width = 'fullwidth'; + } + } + // Ativnost + else{ + $layout_width = 'narrow'; + } + + break; + + + # KNJIZNICA + case 'knjiznica': + $layout_width = 'wide'; + + break; + + + # NASTAVITVE + case 'nastavitve': + $layout_width = 'narrow'; + + break; + + + # OBVESTILA + case 'obvestila': + $layout_width = 'narrow'; + + break; + + + # GDPR + case 'gdpr': + if ($_GET['m'] == 'gdpr_requests' || $_GET['m'] == 'gdpr_requests_all') + $layout_width = 'wide'; + else + $layout_width = 'narrow'; + + break; + + + # MODUL UL EVALVACIJE + case 'ul_evalvation': + $layout_width = 'wide'; + + break; + + + # MOJE ANKETE + case 'pregledovanje': + default: + $layout_width = 'wide'; + + if ($_GET['a'] == 'ustvari_anketo' || $_GET['b'] == 'new_survey') { + $layout_width = 'fullwidth'; + $layout_menu = 'menu_left'; + $hide_header = 'hide_header'; + } + + if ($_GET['a'] == 'narocila') { + $layout_width = 'narrow'; + } + + break; + } + + // shrani tracking za userja TrackingClass::update_user(); } - - + + // vrni podatke o navigaciji nazaj v SurveyAdmin + return array( + 'first_action' => $first_action, + 'second_action' => $second_action, + 'third_action' => $third_action, + + 'layout_width' => $layout_width, + 'layout_menu' => $layout_menu, + 'hide_header' => $hide_header, + ); } } diff --git a/admin/survey/classes/tracking/TrackingClass.php b/admin/survey/classes/tracking/TrackingClass.php index 5d5bd8a9f..7424b5e58 100644 --- a/admin/survey/classes/tracking/TrackingClass.php +++ b/admin/survey/classes/tracking/TrackingClass.php @@ -117,15 +117,11 @@ class TrackingClass { global $lang; + $surveyName = SurveyInfo::getInstance()->getSurveyTitle(); + echo '
    '; echo '' . $lang['srv_survey_archives_tracking_' . $this->sub] . ''; - // Izvoz v Excel - echo '

    Download Excel

    '; - - - echo ''; - // Tabela s podatki o spremembah podatkov if ($this->sub == 'data') { @@ -138,74 +134,97 @@ class TrackingClass OR (`get` LIKE \'%urejanje: "1"%\' AND status=\'4\') )'; - // Prva vrstica - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ''; - + // Vrstice s podatki $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $appendMerge . " " . $data . " ORDER BY datetime DESC"); - while ($row = mysqli_fetch_array($sql)) { + + if(!empty(mysqli_fetch_array($sql))) { + + + echo '

    '.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1b'].' \''.$lang['navigation_NAVI_RESULTS'].'\' - \''.$lang['navigation_NAVI_DATA'].'\' '.$lang['srv_survey_archives_tracking_survey_text1c'].' \''.$surveyName.'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

    '; + + // Izvoz v Excel + echo '
    '; + echo ''.$lang['srv_export_excel'].''; + echo '
    '; + + echo '
    ' . $lang['date'] . 'UserIPRecnumGETPOST
    '; + // Prva vrstica echo ''; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ''; - $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); - $rowu = mysqli_fetch_array($sqlu); + $count = 0; + while ($row = mysqli_fetch_array($sql)) { + echo ' 24 ? 'class="displayNone"' : '').($count == 24 ? ' class="show_as_last_row"' : '').'>'; - // Pri podatkih dobimo posebej podatke o editiranem respondentu - $usr_id = ''; - $cookie = ''; + $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); + $rowu = mysqli_fetch_array($sqlu); - // Preverimo ce imamo usr_id v GET-u - $get_array_temp = explode(', ', $row['get']); - foreach ($get_array_temp AS $get_val) { - $param = explode(': ', $get_val); - $get_array[$param[0]] = $param[1]; - } + // Pri podatkih dobimo posebej podatke o editiranem respondentu + $usr_id = ''; + $cookie = ''; - if (isset($get_array['usr_id']) && $get_array['usr_id'] != '') { - $usr_id = trim($get_array['usr_id'], '"'); - } // Preverimo ce iammo slucajno cookie - elseif (isset($get_array['survey-' . $this->anketa]) && $get_array['survey-' . $this->anketa] != '') { - $cookie = trim($get_array['survey-' . $this->anketa], '"'); - } else { - // Preverimo ce imamo usr_id v POST-u - $post_array_temp = explode(', ', $row['post']); - foreach ($post_array_temp AS $post_val) { - $param = explode(': ', $post_val); - $post_array[$param[0]] = $param[1]; + // Preverimo ce imamo usr_id v GET-u + $get_array_temp = explode(', ', $row['get']); + foreach ($get_array_temp AS $get_val) { + $param = explode(': ', $get_val); + $get_array[$param[0]] = $param[1]; } - if (isset($post_array['usr_id']) && $post_array['usr_id'] != '') - $usr_id = trim($post_array['usr_id'], '"'); + if (isset($get_array['usr_id']) && $get_array['usr_id'] != '') { + $usr_id = trim($get_array['usr_id'], '"'); + } // Preverimo ce iammo slucajno cookie + elseif (isset($get_array['survey-' . $this->anketa]) && $get_array['survey-' . $this->anketa] != '') { + $cookie = trim($get_array['survey-' . $this->anketa], '"'); + } else { + // Preverimo ce imamo usr_id v POST-u + $post_array_temp = explode(', ', $row['post']); + foreach ($post_array_temp AS $post_val) { + $param = explode(': ', $post_val); + $post_array[$param[0]] = $param[1]; + } + + if (isset($post_array['usr_id']) && $post_array['usr_id'] != '') + $usr_id = trim($post_array['usr_id'], '"'); + } + + if ($usr_id != '') { + $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE id = '$usr_id'"); + $rowR = mysqli_fetch_array($sqlR); + + $recnum = $rowR['recnum']; + } elseif ($cookie != '') { + $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE cookie = '$cookie'"); + $rowR = mysqli_fetch_array($sqlR); + + $recnum = $rowR['recnum']; + } else + $recnum = 0; + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo ''; + + $count++; } - - if ($usr_id != '') { - $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE id = '$usr_id'"); - $rowR = mysqli_fetch_array($sqlR); - - $recnum = $rowR['recnum']; - } elseif ($cookie != '') { - $sqlR = sisplet_query("SELECT recnum FROM srv_user WHERE cookie = '$cookie'"); - $rowR = mysqli_fetch_array($sqlR); - - $recnum = $rowR['recnum']; - } else - $recnum = 0; - - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - - echo ''; } + else { + echo '

    '.ucfirst($lang['srv_survey_archives_tracking_survey_text1b']).' \''.$lang['navigation_NAVI_RESULTS'].'\' - \''.$lang['navigation_NAVI_DATA'].'\' '.$lang['srv_survey_archives_tracking_survey_text1d'].'.

    '; + + } + + } // Tabela s podatki o spremembah - vse oz. merge/append else { @@ -230,32 +249,50 @@ class TrackingClass else $appendMerge = ""; - // Prva vrstica - echo ''; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ''; // Vrstice s podatki $sql = sisplet_query("SELECT * FROM srv_tracking".$this->db_table." WHERE ank_id = '$this->anketa' " . $this->status . " " . $appendMerge . " " . $data . " ORDER BY datetime DESC"); - while ($row = mysqli_fetch_array($sql)) { + + if(!empty(mysqli_fetch_array($sql))) { + + if($appendMerge == "") + echo '

    '.$lang['srv_survey_archives_tracking_survey_text1'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

    '; + else + echo '

    '.$lang['srv_survey_archives_tracking_survey_text1'].', '.$lang['srv_survey_archives_tracking_survey_text_appendmerge'].' '.$lang['srv_survey_archives_tracking_survey_text1a'].' \''. $surveyName .'\'. '.$lang['srv_survey_archives_tracking_survey_text2'].' '.$lang['srv_survey_archives_tracking_survey_text3'].'.

    '; + + // Izvoz v Excel + echo '
    '; + echo ''.$lang['srv_export_excel'].''; + echo '
    '; + + echo '
    ' . $lang['date'] . '' . $lang['user'] . 'IPRespondentGETPOST
    ' . datetime($row['datetime']) . '
    ' . $rowu['name'] . ' ' . $rowu['surname'] . '
    ' . $row['ip'] . '' . $recnum . '
    ' . $row['get'] . '
    ' . (($row['post'] != "") ? $row['post'] : '/') . '
    ' . datetime($row['datetime']) . '' . $rowu['name'] . ' ' . $rowu['surname'] . '' . $row['ip'] . '' . $recnum . '' . $row['get'] . '' . $row['post'] . '
    ' . $lang['date'] . 'UserIPPodstranGETPOST
    '; + // Prva vrstica echo ''; - - $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); - $rowu = mysqli_fetch_array($sqlu); - - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; - + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo ''; + + $count = 0; + while ($row = mysqli_fetch_array($sql)) { + echo ' 24 ? 'class="displayNone"' : '').($count == 24 ? ' class="show_as_last_row"' : '').'>'; + + $sqlu = sisplet_query("SELECT name, surname FROM users WHERE id = '$row[user]'"); + $rowu = mysqli_fetch_array($sqlu); + + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; + + echo ''; + $count++; + } } } diff --git a/admin/survey/classes/tracking/UserTrackingClass.php b/admin/survey/classes/tracking/UserTrackingClass.php index c287c9e8f..e2608a876 100644 --- a/admin/survey/classes/tracking/UserTrackingClass.php +++ b/admin/survey/classes/tracking/UserTrackingClass.php @@ -43,10 +43,10 @@ class UserTrackingClass echo '' . $lang['srv_survey_archives_tracking'] . ''; // Izvoz v Excel - echo '

    '.$lang['srv_survey_archives_tracking_last_changes'].'

    '; + echo '

    '.$lang['srv_survey_archives_tracking_last_changes'].'

    '; - echo '
    '; - echo '
    '; + //echo '
    '; + //echo '
    '; - wrapperja za scroll na mobilnem echo '
    ' . datetime($row['datetime']) . '' . $rowu['name'] . ' ' . $rowu['surname'] . '' . $row['ip'] . '' . $statuses[$row['status']] . '' . $row['get'] . '' . $row['post'] . '' . $lang['date'] . '' . $lang['user'] . 'IPPodstranGETPOST
    ' . datetime($row['datetime']) . '
    ' . $rowu['name'] . ' ' . $rowu['surname'] . '
    ' . $row['ip'] . '' . $statuses[$row['status']] . '
    ' . $row['get'] . '
    ' . (($row['post'] != "") ? $row['post'] : '/') . '
    '; @@ -65,23 +65,22 @@ class UserTrackingClass while ($row = mysqli_fetch_array($sql)) { echo ''; - echo ' '; + echo ' '; echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; echo ''; } echo '
    ' . datetime($row['datetime']) . '
    ' . datetime($row['datetime']) . '
    ' . $row['ip'] . '' . $row['get'] . '' . $row['post'] . '
    ' . $row['get'] . '
    ' . $row['post'] . '
    '; - echo ''; - echo ''; + //echo ''; + //echo ''; - wrapperja za scroll na mobilnem echo '
    '; - echo '
    '; - echo ''; + echo ''; } public function csvExport() diff --git a/admin/survey/css/print.css b/admin/survey/css/print.css index cc7c9a217..b1b41feb5 100644 --- a/admin/survey/css/print.css +++ b/admin/survey/css/print.css @@ -396,6 +396,105 @@ div.dashboard_cell table td{ padding: 2px 0px; } +.dashboard_boxes{ + display: flex; + flex-wrap: wrap; + box-sizing: border-box; + + margin-top: 32px; +} + +.dashboard_box{ + position: relative; + box-sizing: border-box; + width: 430px; + max-width: 100%; + + padding: 32px 16px; + margin: 0 32px 32px 0; + + font-size: 14px; + + border: 1px #e5e5e5 solid; +} +.dashboard_box .box_title{ + position: absolute; + top: -10px; + left: 16px; + + padding: 0 16px; + + font-size: 14px; + font-weight: bold; + color: #1E88E5; + text-transform: uppercase; + line-height: 18px; + + background-color: white; +} + +.dashboard_box .box_top_settings{ + display: flex; + align-items: center; + + margin-bottom: 8px; +} +.dashboard_box .box_top_settings span, +.dashboard_box .box_top_settings label{ + font-size: 14px; +} + +.dashboard_box .box_top_settings select.dropdown{ + width: auto; + margin: 0 0 0 8px; +} + +.dashboard_box table{ + width: 100%; + margin: 0 0 16px 0; + + +} +.dashboard_box table tr{ + height: auto; +} +.dashboard_box table tr.row1 td{ + padding: 8px 16px 8px 8px; + font-weight: 600; + background-color: #F8F8F8; +} + +.dashboard_box table tr.row_sum td{ + font-weight: 600; +} + +.dashboard_box table tr td{ + padding: 4px 16px 4px 8px; + + font-size: 14px; + + border-top: 1px #E5E5E5 solid; + border-bottom: 1px #E5E5E5 solid; +} +.dashboard_box table tr td strong{ + font-weight: 600; +} + +.dashboard_box table tr td span{ + font-size: 14px; +} +.dashboard_box table tr td .graph_db { + float: left; + height: 16px; + margin-top: 1px; + + background-color: #1E88E5; +} +.dashboard_box table tr td .graph_text { + margin-left: 8px; + font-size: 14px; +} + #div_statistic_info { } #div_statistic_answer_state { } #div_statistic_status {} diff --git a/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php b/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php index 0c7ef33d2..f842865d4 100644 --- a/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php +++ b/admin/survey/export/latexclasses/Vprasanja/DatumLatex.php @@ -64,8 +64,9 @@ class DatumLatex extends LatexSurveyElement $rowVrednost = mysqli_fetch_array($sqlVrednosti); //$sqlUserAnswer = sisplet_query("SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND vre_id='".$rowVrednost['id']."' AND loop_id $loop_id"); //$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND vre_id='".$rowVrednost['id']."' "; - $sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' "; - //echo $sqlUserAnswerString; + //$sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' "; + $sqlUserAnswerString = "SELECT text FROM srv_data_text".$db_table." WHERE spr_id='".$spremenljivke['id']."' AND usr_id='".$usr_id."' AND loop_id = $loop_id"; + //echo $sqlUserAnswerString."
    "; $sqlUserAnswer = sisplet_query($sqlUserAnswerString); $userAnswer = mysqli_fetch_assoc($sqlUserAnswer); //echo "userAnswer: ".$userAnswer['text']."
    "; diff --git a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php index 364771617..d30024d1a 100644 --- a/admin/survey/export/latexclasses/class.LatexAnalysisElement.php +++ b/admin/survey/export/latexclasses/class.LatexAnalysisElement.php @@ -804,7 +804,8 @@ class LatexAnalysisElement{ shell_exec($pretvoriPng_v_Pdf); ##### ZA TESTIRANJE ureditev pretvorbe slike v pdf - konec - $texImageOnly = " \\includegraphics[scale=0.66]{".$this->path2Charts."".$imgName."} "; //latex za sliko + $texImageOnly = " \\includegraphics[width=\linewidth, frame, scale=0.66]{".$this->path2Charts."".$imgName."} "; //latex za sliko + //$texImageOnly = " \\includegraphics[scale=0.66]{".$this->path2Charts."".$imgName."} "; //latex za sliko //$texImageOnly = " \\includegraphics[scale=0.66, draft=false]{".$this->path2Charts."".$imgName."} "; //latex za sliko //$texImageOnly = " \\includegraphics[scale=0.85]{".$this->path2Charts."".$imgName."} "; //latex za sliko //echo "ime slike: $texImageOnly
    "; diff --git a/admin/survey/export/latexclasses/class.LatexDocument.php b/admin/survey/export/latexclasses/class.LatexDocument.php index a3956d291..d5b021162 100644 --- a/admin/survey/export/latexclasses/class.LatexDocument.php +++ b/admin/survey/export/latexclasses/class.LatexDocument.php @@ -485,7 +485,7 @@ class LatexDocument{ //brisanje temp datotek tex - konec //brisanje temp slikovnih datotek - //$this->DeleteTmpImages($surveyId); + $this->DeleteTmpImages($surveyId); //brisanje temp slikovnih datotek - konec } diff --git a/admin/survey/export/latexclasses/class.LatexSurvey.php b/admin/survey/export/latexclasses/class.LatexSurvey.php index 31672e9c1..c378f6e31 100644 --- a/admin/survey/export/latexclasses/class.LatexSurvey.php +++ b/admin/survey/export/latexclasses/class.LatexSurvey.php @@ -11,6 +11,7 @@ include('../../vendor/autoload.php'); define("RADIO_BTN_SIZE", 0.13); +define("PIC_SIZE_ANS", "\includegraphics[width=3cm]"); //slika dolocene sirine class LatexSurvey{ @@ -48,6 +49,8 @@ class LatexSurvey{ protected $path2UploadedImages; protected $language = -1; // Katero verzijo prevoda izvazamo + + public static $spremenljivka; //function __construct($anketa, $export_format){ function __construct($anketa=null, $export_format='', $export_show_intro=null, $export_show_if=null, $export_data_skip_empty=null, $export_data_skip_empty_sub=null){ @@ -221,14 +224,18 @@ class LatexSurvey{ $rowl = mysqli_fetch_array($sqll); //pridobi prevod uvoda v ustreznem jeziku $intro = $rowl['naslov']; //prevod uvoda v ustreznem jeziku }else{ - $intro = (SurveyInfo::getInstance()->getSurveyIntro() == '') ? $lang['srv_intro'] : SurveyInfo::getInstance()->getSurveyIntro(); - } + //$intro = (SurveyInfo::getInstance()->getSurveyIntro() == '') ? $lang['srv_intro'] : SurveyInfo::getInstance()->getSurveyIntro(); + $sqlIntroString = "SELECT introduction FROM srv_anketa WHERE id=".$this->anketa." "; + $sqlIntro = sisplet_query($sqlIntroString); + $rowl = mysqli_fetch_array($sqlIntro); //pridobi besedilu uvoda + $intro = $rowl['introduction']; //prevod uvoda v ustreznem jeziku + } $tex .= $this->encodeTextHere($intro); if($intro){ $tex .= $this->texNewLine; $tex .= $this->texNewLine; } - + //echo "uvod: $intro
    "; } } @@ -1215,11 +1222,34 @@ class LatexSurvey{ } #funkcija ki skrbi za encode dolocenih spornih delov besedila v latex-u prijazno - function encodeTextHere($text='', $vre_id=0){ + function encodeTextHere($text='', $vre_id=0, $naslovStolpca = 0, $img_id=0){ global $site_path, $lang; - + //$text = str_replace(' ','X',$text); //nadomesti presledke //echo "Encoding ".$text."
    "; //echo "vre_id: ".$vre_id."
    "; + //echo "ime spremenljivke ".$this->variableName."
    "; + + $text = htmlspecialchars_decode($text); //vse html special chars kot je & spremeni v ustrezne simbole (npr. &=>&) + + //resevanje razbirajanja predolgih neprekinjenih besed in URL - spremenljivke za kasnejsi prilagojen izpis + //$numOfWords = str_word_count($text, 0); + $numOfSpacesPrej = substr_count($text, ' '); //stevilo presledkov v besedilu + $stringLength = strlen($text); + + $findSpace = ' '; + $posSpace1 = strpos($text, $findSpace); //najdi pozicijo prvega presledka v besedilu + $posSpace2 = strripos($text, $findSpace); //najdi pozicijo zadnjega presledka v besedilu + + + $findHttp = 'http://'; + $findHttps = 'https://'; + $posHttp = strpos($text, $findHttp); + $posHttps = strpos($text, $findHttps); + $isURL = 0; + /* if($posHttp !== false || $posHttps !== false) { //imamo URL naslov + $isURL = 1; + } */ + //resevanje razbirajanja predolgih neprekinjenih besed in URL - konec $this->path2UploadedImages = $site_path.'uploadi/editor/'; if($text == ''){ //ce ni teksta, vrni se @@ -1232,6 +1262,7 @@ class LatexSurvey{ $findImgLength = strlen($findImg); $findUl = '"; + + //ureditev izrisa slike + if($posImg !== false){ + $numOfImgs = substr_count($text, $findImg); //stevilo ''); //pozicija, kjer se konca html koda za img + $textPotem = substr($textPotem, $posImgEnd+strlen('/>')); //tekst od konca html kode za img dalje + + $imageName = $this->path2UploadedImages."".$this->getImageName($text, 0, '"; + //error_log("iz survey element: ".$imageNameTest); + //echo("iz survey element imageNameTest: ".$imageNameTest."
    "); + //echo "Obstaja ? ".file_exists($imageNameTest)."
    "; + //echo("iz survey element imageName: ".$imageName."
    "); + //echo "velikost: ".filesize($imageNameTest)."
    "; +/* if(filesize($imageNameTest) > 0){ + $text = $textPrej.' '.PIC_SIZE_ANS."{".$imageName."}".' '.$textPotem; + }else{ + $image = $lang['srv_pc_unavailable']; + $text = $textPrej.' '.$image.' '.$textPotem; + } */ + $text = ''; + //$text = $textPrej.' '; + + //if(filesize($imageNameTest) > 0){ + if(file_exists($imageNameTest)){ + $text .= $textPrej.' '.PIC_SIZE_ANS."{".$imageName."}"; + }else{ + $image = $lang['srv_pc_unavailable']; + $text .= $image; + } + $text .= ' '.$textPotem; + } + + //pred ureditvijo posebnih karakterjev, odstrani del teksta s kodo za sliko, da se ne pojavijo tezave zaradi imena datoteke od slike + $findImgCode = '\includegraphics'; + $posOfImgCode = strpos($text, $findImgCode); + //echo $posOfImgCode."
    "; + $textToImgCode = substr($text, 0, $posOfImgCode); //tekst do $findImgCode + //echo $textToImgCode."
    "; + $textFromImgCode = substr($text, $posOfImgCode); //tekst po $findImgCode + //echo $textFromImgCode."
    "; + $findImgCodeEnd = '}'; + //$posOfImgCodeEnd = strpos($text, $findImgCodeEnd); + $posOfImgCodeEnd = strpos($textFromImgCode, $findImgCodeEnd); + //echo $posOfImgCodeEnd."
    "; + $textAfterImgCode = substr($textFromImgCode, $posOfImgCodeEnd+1); //tekst po $findImgCodeEnd + //echo $textAfterImgCode."
    "; + $textOfImgCode = substr($text, $posOfImgCode, $posOfImgCodeEnd+1); + //echo $textOfImgCode."
    "; + + $text = $textToImgCode.$textAfterImgCode; + + //pred ureditvijo posebnih karakterjev, odstrani del teksta s kodo za sliko, da se ne pojavijo tezave zaradi imena datoteke od slike - konec + } + //ureditev izrisa slike - konec + //ureditev posebnih karakterjev za Latex http://www.cespedes.org/blog/85/how-to-escape-latex-special-characters, https://en.wikibooks.org/wiki/LaTeX/Special_Characters#Other_symbols $text = str_replace('\\','\textbackslash{} ',$text); //$text = str_replace('{','\{',$text); //$text = str_replace('}','\}',$text); $text = str_replace('$','\$ ',$text); - $text = str_replace('#','\# ',$text); + + if(substr_count($text, '#')){ //ce je stevilo # vecje od 1 + $text = str_replace('#','\#',$text); + }else{ + $text = str_replace('#','\# ',$text); + } $text = str_replace('%','\% ',$text); $text = str_replace('€','\euro',$text); $text = str_replace('^','\textasciicircum{} ',$text); $text = str_replace('_','\_ ',$text); $text = str_replace('~','\textasciitilde{} ',$text); - $text = str_replace('&','\&',$text); + if(strpos($text, '&')){ //ce je prisotno v besedilu &' + $text = str_replace('&','\& ',$text); + }else{ + $text = str_replace('&','\& ',$text); + } + $text = str_replace(' ','~',$text); //$text = str_replace('<','\textless ',$text); - $text = str_replace('<','\textless',$text); + $text = str_replace('<',' \textless ',$text); //$text = str_replace('>','\textgreater ',$text); - $text = str_replace('>','\textgreater',$text); + $text = str_replace('>',' \textgreater ',$text); //ureditev posebnih karakterjev za Latex - konec + //ureditev grskih crk + $text = str_replace('α','\textalpha ',$text); //ά + $text = str_replace('ά','\textalpha ',$text); + $text = str_replace('β','\textbeta ',$text); + $text = str_replace('γ','\textgamma ',$text); + $text = str_replace('δ','\textdelta ',$text); + $text = str_replace('ε','\textepsilon ',$text); + $text = str_replace('ζ','\textzeta ',$text); + $text = str_replace('η','\texteta ',$text); + $text = str_replace('θ','\texttheta ',$text); + $text = str_replace('ι','\textiota ',$text); + $text = str_replace('κ','\textkappa ',$text); + $text = str_replace('λ','\textlambda ',$text); + $text = str_replace('μ','\textmugreek ',$text); + $text = str_replace('ν','\textnu ',$text); + $text = str_replace('ξ','\textxi ',$text); + //$text = str_replace('ο','o',$text); // \textomicron ne dela + $text = str_replace('ο','\textgreek{ο}',$text); + //$text = str_replace('ς','\textvarsigma ',$text); + $text = str_replace('ς','\textgreek{ς}',$text); + $text = str_replace('π','\textpi ',$text); + $text = str_replace('ρ','\textrho ',$text); + $text = str_replace('σ','\textsigma ',$text); + $text = str_replace('τ','\texttau ',$text); + $text = str_replace('υ','\textupsilon ',$text); + $text = str_replace('φ','\textphi ',$text); + $text = str_replace('χ','\textchi ',$text); + $text = str_replace('ψ','\textpsi ',$text); + $text = str_replace('ω','\textomega ',$text); + $text = str_replace('ύ','\textgreek{ύ}',$text); + //ureditev grskih crk - konec + + //ureditev ostalih posebnih crk + $text = str_replace('ə','\textschwa ',$text); + //ureditev ostalih posebnih crk - konec + + //ureditev preureditve html kode ul in li v latex itemize if($posUl !== false){ //echo "text prej: ".$text."
    "; @@ -1270,27 +1413,133 @@ class LatexSurvey{ //if($numOfUl!=0){ if($numOfUl!=0 && $posLi !== false){ //ce imamo ul in li $text = str_replace('
      ','\begin{itemize} ', $text); - $text = str_replace('
    • ','\item ', $text); - $text = str_replace('
    ','\end{itemize} ', $text); + $text = str_replace('','\item ', $text); + $text = str_replace('','\item \ ', $text); + $text = str_replace('','\end{itemize} \ ', $text); } //echo "prazno v html: ".strpos($text, '\r')."
    "; //echo "text potem: ".$text."
    "; ###################### } //ureditev preureditve html kode ul in li v latex itemize - konec - - if($posPar !== false){ //ce je kaksen html tag

    , dodaj prazno vrstico oz. break - if($numOfUl!=0 && $posLi !== false){ //ce imamo ul in li - $divider = ' '; - }else{ - $divider = ' \\ \\\\ '; - } - //$text = str_replace('

    ',' ', $text); - //$text = str_replace('

    ',' \break ', $text); - //$text = str_replace('

    ',' \\\\ ', $text); - $text = str_replace('

    ', $divider, $text); + //ureditev preureditve html kode ol in li v latex enumerate, ki je ostevilcen + if($posOl !== false){ + //echo "text prej: ".$text."
    "; + $numOfOl = substr_count($text, $findOl); //stevilo '"; + ###################### + //if($numOfUl!=0){ + if($numOfOl!=0 && $posLi !== false){ //ce imamo ol in li + $text = str_replace('

      ','\begin{enumerate} ', $text); +/* $text = str_replace('
    1. ','\item ', $text); + $text = str_replace('','\item \ ', $text); + $text = str_replace('','\end{enumerate} \ ', $text); + } + //echo "prazno v html: ".strpos($text, '\r')."
      "; + //echo "text potem: ".$text."
      "; + ###################### } + //ureditev preureditve html kode ol in li v latex enumerate, ki je ostevilcen - konec + + //po ureditvi posebnih karakterjev, dodati del teksta s kodo za sliko, ce je slika prisotna + if($posImg !== false){ + $text = substr_replace($text, $textOfImgCode, $posOfImgCode, 0); + } + //po ureditvi posebnih karakterjev, dodati del teksta s kodo za sliko, ce je slika prisotna + + if($posPar !== false){ //ce je kaksen html tag

      , dodaj prazno vrstico oz. break + if($this->variableName=='gdpr'){ + if($numOfUl!=0 && $posLi !== false){ //ce imamo ul in li + $divider = ' '; + }else{ + $divider = ' \\ \\\\ '; + } + $text = str_replace('

      ',$divider, $text); + }else{ + $text = str_replace('

      ',' ', $text); + } + } + + + //priprava izpisa zelo dolgega besedila brez presledkov (URL, email, ...) + //if($numOfSpacesPrej == 0 && ($stringLength >= MAX_STRING_LENGTH)){ //ce v besedilu ni presledkov in je besedilo daljse od max dovoljene dolzine + if( ($numOfSpacesPrej == 0 && ($stringLength >= MAX_STRING_LENGTH)) || ($numOfSpacesPrej == 1 && $posSpace1 == $posSpace2 && $stringLength >= MAX_STRING_LENGTH)){ //ce v besedilu ni presledkov in je besedilo daljse od max dovoljene dolzine + //$text = "\seqsplit{".$text."}"; //ni v redu seqsplit, ker ne dela, če so posebni znaki + $text = substr_replace($text, $this->texNewLine, MAX_STRING_LENGTH, 0); //dodaj na ustrezni dolzini besedila prehod v novo vrstico + } + //priprava izpisa zelo dolgega besedila brez presledkov - konec + + //echo "text potem: ".$text."
      "; + + //detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa + $findAt = '@'; + $numOfAt = substr_count($text, $findAt); //stevilo '@' v besedilu + + $posAt = strpos($text, $findAt); + if($posAt && $posSpace1){ //ce je prisotna afna in je prisoten presledek v besedilu + //echo "afna je: $posAt
      "; + //echo "Encoding: ".$text."
      "; + + //najdi prvi presledek po afni + //echo substr($text, $posAt) ."
      "; + $posSpace1Mail = strpos(substr($text, $posAt), $findSpace); //najdi pozicijo prvega presledka v besedilu po e-naslovu + $posSpace1Mail = $posSpace1Mail+$posAt; //koncna pozicija, ce se gleda celotno besedilo + //echo $posSpace1Mail."
      "; + + //najdi prvi presledek pred afno + $posSpace2Mail = strripos(substr($text, 0, $posAt), $findSpace); //najdi pozicijo zadnjega presledka v besedilu pred e-naslovom + //echo $posSpace2Mail."
      "; + + //dodaj po e-naslovu potrebno latex kodo za zakljucek url + $text = substr_replace($text, '}', $posSpace1Mail, 0); + + //dodaj pred e-naslovom potrebno latex kodo za url + //substr_replace(string_name, replacement_string, start_pos, length) + $text = substr_replace($text, ' \url{', $posSpace2Mail+1, 0); + //echo $text."
      "; + } + //detekcija prisotnosti e-naslova v besedilu in primerna preureditev, da pride do pravilnega izpisa - konec + + + //RESEVANJE BESEDILA V CIRILICI + $contains_cyrillic = (bool) preg_match('/[\p{Cyrillic}]/u', $text); //ali je v besedilu cirilica? + if($contains_cyrillic){ // ce je cirilica v besedilu + $text = '\foreignlanguage{russian}{'.$text.'}'; + } + //RESEVANJE BESEDILA V CIRILICI - konec + + + + //RESEVANJE odstranitve dodatnih style tag-ov po ul, ipd. ####################################################### + $findStyleTagFull = '"; if($pos === false && $posImg === false) { //v tekstu ni br in img @@ -1298,37 +1547,39 @@ class LatexSurvey{ return strip_tags($text); }else { //v tekstu sta prisotna br ali img $text2Return = ''; //tekst ki bo vrnjen - + //ureditev preureditev html kode za novo vrstico v latex, ureditev prenosa v novo vrstico - if($pos !== false){ - $pos = strpos($text, $findme); - $numOfBr = substr_count($text, $findme); //stevilo '
      ' v tekstu - for($i=0; $i<$numOfBr; $i++){ - if($i == 0){ //ce je prvi najdeni '
      ' - $textPrej = substr($text, 0, $pos); - $textPotem = substr($text, $pos+$findmeLength); - if($i == $numOfBr-1){ - //$text2Return .= $textPrej.' \break '.$textPotem; - $text2Return .= $textPrej.' \\\\ '.$textPotem; - }else{ - //$text2Return .= $textPrej.' \break '; - $text2Return .= $textPrej.' \\\\ '; - } - }else{ //drugace - $pos = strpos($textPotem, $findme); - $textPrej = substr($textPotem, 0, $pos); - $textPotem = substr($textPotem, $pos+$findmeLength); - if($i == $numOfBr-1){ - //$text2Return .= $textPrej.' \break '.$textPotem; - $text2Return .= $textPrej.' \\\\ '.$textPotem; - }else{ - //$text2Return .= $textPrej.' \break '; - $text2Return .= $textPrej.' \\\\ '; + if($naslovStolpca==0){ // ce besedilo ni naslov stolpca tabele + if($pos !== false){ + $pos = strpos($text, $findme); + $numOfBr = substr_count($text, $findme); //stevilo '
      ' v tekstu + for($i=0; $i<$numOfBr; $i++){ + if($i == 0){ //ce je prvi najdeni '
      ' + $textPrej = substr($text, 0, $pos); + $textPotem = substr($text, $pos+$findmeLength); + if($i == $numOfBr-1){ + //$text2Return .= $textPrej.' \break '.$textPotem; + $text2Return .= $textPrej.' \\\\ '.$textPotem; + }else{ + //$text2Return .= $textPrej.' \break '; + $text2Return .= $textPrej.' \\\\ '; + } + }else{ //drugace + $pos = strpos($textPotem, $findme); + $textPrej = substr($textPotem, 0, $pos); + $textPotem = substr($textPotem, $pos+$findmeLength); + if($i == $numOfBr-1){ + //$text2Return .= $textPrej.' \break '.$textPotem; + $text2Return .= $textPrej.' \\\\ '.$textPotem; + }else{ + //$text2Return .= $textPrej.' \break '; + $text2Return .= $textPrej.' \\\\ '; + } } } + $text = $text2Return; } - $text = $text2Return; - } + } //ureditev preureditev html kode za novo vrstico v latex, ureditev prenosa v novo vrstico - konec //echo "text potem: ".$text."
      "; $text = preg_replace("/(\R){2,}/", "$1", $text); @@ -1336,5 +1587,184 @@ class LatexSurvey{ } } #funkcija ki skrbi za encode dolocenih spornih delov besedila v latex-u prijazno - konec + + #funkcija, ki skrbi za pridobitev imena slike, ki jo je potrebno izrisati ###################################### + function getImageName($text='', $sprId=null, $findme='', $vre_id=0, $img_id=0){ + global $site_path, $site_url; + $imageName = ''; + //echo "id slike $img_id
      "; + if($text == 'hotspot' && $findme == 'hotspot_image='){ + $sqlParametrov = sisplet_query("SELECT params FROM srv_spremenljivka WHERE id='".$sprId."'"); + $rowParametrov = mysqli_fetch_row($sqlParametrov); + $text = $rowParametrov[0]; + } + + $pos = strpos($text, $findme); //najdi pozicijo teksta v $findme + //echo "text za echo: ".$text."
      "; + //if($pos!=''){ //ce je slika v bazi + if($pos!=''||$pos==0){ //ce je slika v bazi + $imageName = substr($text,$pos); //pokazi le del text od besedila $findme dalje (vkljucno z besedilom) + //echo "imageName prej: ".$imageName."
      "; + + //$findme = $site_path.'uploadi/editor/'; + $findme = $site_url.'uploadi/editor/'; + //$findme = 'uploadi/editor/'; + //$findme = 'editor/'; + //echo "findme: ".$findme."
      "; + $pos = strpos($imageName, $findme); //najdi pozicijo teksta v $findme + //echo "najdi tole: ".$findme."
      "; + //echo "najdi tukaj: ".$imageName."
      "; + //echo "pozicija tega: ".$pos."
      "; + if($pos){ //ce je slika na strezniku + $slikaNaStrezniku = 1; + }else{//ce slike ni na strezniku + $slikaNaStrezniku = 0; + } + //echo "ali je slika na strežniku: ".$slikaNaStrezniku."
      "; + if($slikaNaStrezniku==1){ //ce je slika na strezniku + $findEditor = 'editor/'; + $posEditor = strpos($imageName, $findEditor); //najdi pozicijo teksta v $findEditor + $imageName = substr($imageName,$posEditor+7); //pokazi le del params od besedila 'editor/' dalje, brez besedila 'editor/' + //echo "imagename : ".$imageName."
      "; + $pos = $this->getEndPosition($imageName); //najdi pozicijo konca URL slike + $imageExtension = substr($imageName, $pos-3, 3); //pridobi koncnico slike (za gif je potrebno sliko pretvoriti v png, saj latex ne podpira gif) + $imageName = substr($imageName, 0, $pos); //pokazi le del params od zacetka besedila do '"' oz. konca URL slike + + $path = $site_path.'uploadi/editor/'.$imageName; + //$path = $site_url.'uploadi/editor/'.$imageName; + + if($imageExtension == 'gif'){ //ce je slika gif, jo je potrebno pretvoriti v png + $this->convertGifToPng($path, $slikaNaStrezniku); + } + + if($imageExtension == 'jpg' || $imageExtension == 'peg'){ //ce je slika jpg ali jpeg, jo je potrebno pretvoriti v png + $this->convertJpgToPng($path, $slikaNaStrezniku, $imageExtension); + } + }elseif($slikaNaStrezniku==0){ //ce slike ni na strezniku + //echo "vre_id: $vre_id
      "; + $imageName = $this->getOnlineImageName($imageName, $slikaNaStrezniku, $vre_id, $img_id); //pridobi njen URL + } + + $imageName = substr($imageName, 0, strrpos($imageName, '.')); + + } + + //echo "imagename pred return: ".$imageName."
      "; + return $imageName; + } + #funkcija, ki skrbi za pridobitev imena slike, ki jo je potrebno izrisati - konec ############################### + function getEndPosition($imageName=''){ + $findme = '"'; + $pos = strpos($imageName, $findme); //najdi pozicijo teksta '"' + return $pos; + } + + function convertGifToPng($path='', $slikaNaStrezniku=null){ + //echo "path: ".$path."
      "; + $image = imagecreatefromgif($path); //pripravi sliko iz gif za pretvorbo + $imageName = substr($path, 0, -3); //ime slike brez extension-a + //echo $imageName."
      "; + $imageNamePNG = $imageName.'png'; //ime slike z ustreznim extension + imagepng($image, $imageNamePNG); //pretvori pripravljeno gif sliko v png + + if($slikaNaStrezniku==0){ //ce slika je iz URL in ni na strezniku, GIF izbrisi + unlink($imageName.'gif'); //izbrisi gif sliko + } + } + + function convertJpgToPng($path='', $slikaNaStrezniku=null, $imageExtension=''){ + $image = imagecreatefromjpeg($path); //pripravi sliko iz jpg za pretvorbo + $imageName = substr($path, 0, strrpos($path, '.')); //ime slike brez extension-a + //echo $imageName."
      "; + $imageNamePNG = $imageName.'.png'; //ime slike z ustreznim extension + imagepng($image, $imageNamePNG); //pretvori pripravljeno jpg sliko v png + //echo "pretvorba v png: ".$imageNamePNG."
      "; + //echo "xtens: ".$imageExtension."
      "; + //$origExtension = strrchr($path, '.'); + //echo "ali je slika na strežniku: ".$slikaNaStrezniku."
      "; + if($slikaNaStrezniku==0){ //ce slika je iz URL in ni na strezniku, izbrisi jo + //echo "tukaj
      "; + if($imageExtension == 'jpg'){ + unlink($imageName.'.'.$imageExtension); //izbrisi sliko + }elseif($imageExtension == 'peg'){ + unlink($imageName.'.j'.$imageExtension); //izbrisi sliko + } + } + } + #funkcija, ki skrbi za pridobitev slike, ki se nahaja nekje online in jo je potrebno izrisati, in vrne lokalno ime slike ###################################### + function getOnlineImageName($imageName='', $slikaNaStrezniku=null, $vre_id=null, $img_id=0){ + global $site_path; + //echo "imageName v getOnlineImageName nekje vmes 1: ".$imageName."
      "; + $row = Cache::srv_spremenljivka(self::$spremenljivka); + //echo "sprem: ".self::$spremenljivka."
      "; + $spremenljivkaParams = new enkaParameters($row['params']); + //echo "params: ".$spremenljivkaParams->get('hotspot_image')."
      "; + $imageNameTmp = $spremenljivkaParams->get('hotspot_image'); + //if($imageNameTmp!=''){ //ce je hotspot + if($imageNameTmp!=''&&$vre_id==0){ //ce je hotspot + $imageName = $imageNameTmp; + } + + $findHttp = 'http'; + $posHttp = strpos($imageName, $findHttp); + $imageName = substr($imageName,$posHttp); //besedilo do zacetka http + + $pos = $this->getEndPosition($imageName); //najdi pozicijo konca URL slike + $imageName = substr($imageName, 0, $pos); //pokazi le del params od zacetka besedila do '"' oz. konca URL slike + //echo "imageName v getOnlineImageName nekje vmes 2: ".$imageName."
      "; + $imageExtension = substr($imageName, $pos-3, 3); //pridobi koncnico slike + //echo "imageExtension: ".$imageExtension."
      "; + + //if($imageExtension!='jpg'&&$imageExtension!='png'&&$imageExtension!='gif'&&$imageExtension!='jpeg'){ //ce ni veljavnen extension, spremeni ga v png + if($imageExtension=='jpg'||$imageExtension=='gif'||$imageExtension=='jpeg'){ //ce ni veljavnen extension, spremeni ga v png + //echo "spremeni extension
      "; + $imageExtension='png'; + } + + if($vre_id){ //ce se pridobiva imena tmp slik iz vrednosti vprasanja + //$imgFilename = self::$spremenljivka.'_'.$vre_id.'_tmpImage.'.$imageExtension; //tmp ime slike, ki je sestavljeno iz id spremenljivke+tmpImage+extension + $imgFilename = self::$spremenljivka.'_'.$vre_id.'_tmpImage_'.$img_id.'.'.$imageExtension; //tmp ime slike, ki je sestavljeno iz id spremenljivke+tmpImage+extension + }else{ + //$imgFilename = self::$spremenljivka.'_tmpImage.'.$imageExtension; //tmp ime slike, ki je sestavljeno iz id spremenljivke+tmpImage+extension + $imgFilename = self::$spremenljivka.'_tmpImage_'.$img_id.'.'.$imageExtension; //tmp ime slike, ki je sestavljeno iz id spremenljivke+tmpImage+extension + } + + $pathDir = $site_path.'uploadi/editor/'; //pot za novo mapo, kjer se bodo shranjevale slike za trenutno anketo + $path = $pathDir.$imgFilename; //pot do datoteke z imenom datoteke + + # ukaz za pretakanje slike + if(IS_WINDOWS){ + //za windows sisteme //powershell -command "& { iwr URL -OutFile 'PATH' }" + $command = 'powershell -command "& { iwr \''.$imageName.'\' -OutFile \''.$path.'\' }"'; + //$command = 'wget -O \''.$imageName.'\' -O '.$path.' '; + }elseif(IS_LINUX){ + //za linux sisteme //exec('wget URL -P PATH '); + //$command = 'wget \''.$imageName.'\' -P '.$path.' '; + $command = 'wget -O '.$path.' \''.$imageName.'\' '; + //echo "ukaz za pobiranje: $command
      "; + } + + //echo "command: ".$command."
      "; + exec($command); //pretoci sliko + + //$path = $pathDir.$imgFilename; //pot do datoteke z imenom datoteke + +/* if($imageExtension == 'gif'){ //ce je slika gif, jo je potrebno pretvoriti v png, saj latex ne podpira gif + $this->convertGifToPng($path, $slikaNaStrezniku); + } */ + //echo "imgfilename na koncu: ".$imgFilename."
      "; + if($imageExtension != 'png'){ //ce slika ni png, jo pretvori + if($imageExtension == 'gif'){ //ce je slika gif, jo je potrebno pretvoriti v png, saj latex ne podpira gif + $this->convertGifToPng($path, $slikaNaStrezniku); + }else{ + $this->convertJpgToPng($path, $slikaNaStrezniku, $imageExtension); + } + } + + //echo "imgfilename na koncu: ".$imgFilename."
      "; + return $imgFilename; + } + #funkcija, ki skrbi za pridobitev slike, ki se nahaja nekje online in jo je potrebno izrisati, in vrne lokalno ime slike - konec ############################### + } \ No newline at end of file diff --git a/admin/survey/export/latexclasses/class.LatexSurveyElement.php b/admin/survey/export/latexclasses/class.LatexSurveyElement.php index 671eda253..3c7443909 100644 --- a/admin/survey/export/latexclasses/class.LatexSurveyElement.php +++ b/admin/survey/export/latexclasses/class.LatexSurveyElement.php @@ -869,6 +869,7 @@ class LatexSurveyElement{ $imageName = $this->path2UploadedImages."".$this->getImageName($text, 0, '"; //error_log("iz survey element: ".$imageNameTest); //echo("iz survey element imageNameTest: ".$imageNameTest."
      "); //echo "Obstaja ? ".file_exists($imageNameTest)."
      "; @@ -882,7 +883,7 @@ class LatexSurveyElement{ } */ $text = ''; //$text = $textPrej.' '; - + //if(filesize($imageNameTest) > 0){ if(file_exists($imageNameTest)){ $text .= $textPrej.' '.PIC_SIZE_ANS."{".$imageName."}"; @@ -1185,8 +1186,6 @@ class LatexSurveyElement{ //$findme = $site_path.'uploadi/editor/'; $findme = $site_url.'uploadi/editor/'; - //$findme = 'uploadi/editor/'; - //$findme = 'editor/'; //echo "findme: ".$findme."
      "; $pos = strpos($imageName, $findme); //najdi pozicijo teksta v $findme //echo "najdi tole: ".$findme."
      "; @@ -1205,15 +1204,11 @@ class LatexSurveyElement{ //echo "imagename : ".$imageName."
      "; $pos = $this->getEndPosition($imageName); //najdi pozicijo konca URL slike $imageExtension = substr($imageName, $pos-3, 3); //pridobi koncnico slike (za gif je potrebno sliko pretvoriti v png, saj latex ne podpira gif) -/* echo "exr1: ".$imageExtension."
      "; - $imageExtension = strrchr($imageName, '.'); //pridobi koncnico slike (za gif je potrebno sliko pretvoriti v png, saj latex ne podpira gif, jpg in jpeg) - echo "exr2: ".$imageExtension."
      "; */ - $imageName = substr($imageName, 0, $pos); //pokazi le del params od zacetka besedila do '"' oz. konca URL slike - //$path = $site_path.'uploadi/editor/'.$imageName; - $path = $site_url.'uploadi/editor/'.$imageName; - + $path = $site_path.'uploadi/editor/'.$imageName; + //$path = $site_url.'uploadi/editor/'.$imageName; + if($imageExtension == 'gif'){ //ce je slika gif, jo je potrebno pretvoriti v png $this->convertGifToPng($path, $slikaNaStrezniku); } @@ -1298,7 +1293,9 @@ class LatexSurveyElement{ $imageExtension = substr($imageName, $pos-3, 3); //pridobi koncnico slike //echo "imageExtension: ".$imageExtension."
      "; - if($imageExtension!='jpg'&&$imageExtension!='png'&&$imageExtension!='gif'&&$imageExtension!='jpeg'){ //ce ni veljavnen extension, spremeni ga v png + //if($imageExtension!='jpg'&&$imageExtension!='png'&&$imageExtension!='gif'&&$imageExtension!='jpeg'){ //ce ni veljavnen extension, spremeni ga v png + if($imageExtension=='jpg'||$imageExtension=='gif'||$imageExtension=='jpeg'){ //ce ni veljavnen extension, spremeni ga v png + //echo "spremeni extension
      "; $imageExtension='png'; } @@ -1322,6 +1319,7 @@ class LatexSurveyElement{ //za linux sisteme //exec('wget URL -P PATH '); //$command = 'wget \''.$imageName.'\' -P '.$path.' '; $command = 'wget -O '.$path.' \''.$imageName.'\' '; + //echo "ukaz za pobiranje: $command
      "; } //echo "command: ".$command."
      "; @@ -1332,7 +1330,7 @@ class LatexSurveyElement{ /* if($imageExtension == 'gif'){ //ce je slika gif, jo je potrebno pretvoriti v png, saj latex ne podpira gif $this->convertGifToPng($path, $slikaNaStrezniku); } */ - + //echo "imgfilename na koncu: ".$imgFilename."
      "; if($imageExtension != 'png'){ //ce slika ni png, jo pretvori if($imageExtension == 'gif'){ //ce je slika gif, jo je potrebno pretvoriti v png, saj latex ne podpira gif $this->convertGifToPng($path, $slikaNaStrezniku); @@ -1341,7 +1339,7 @@ class LatexSurveyElement{ } } - //echo "imgfilename: ".$imgFilename."
      "; + //echo "imgfilename na koncu: ".$imgFilename."
      "; return $imgFilename; } #funkcija, ki skrbi za pridobitev slike, ki se nahaja nekje online in jo je potrebno izrisati, in vrne lokalno ime slike - konec ############################### @@ -1363,13 +1361,15 @@ class LatexSurveyElement{ function convertJpgToPng($path='', $slikaNaStrezniku=null, $imageExtension=''){ $image = imagecreatefromjpeg($path); //pripravi sliko iz jpg za pretvorbo $imageName = substr($path, 0, strrpos($path, '.')); //ime slike brez extension-a - - $imageNamePNG = $imageName.'.png'; //ime slike z ustreznim extension + //echo $imageName."
      "; + $imageNamePNG = $imageName.'.png'; //ime slike z ustreznim extension imagepng($image, $imageNamePNG); //pretvori pripravljeno jpg sliko v png - + //echo "pretvorba v png: ".$imageNamePNG."
      "; + //echo "xtens: ".$imageExtension."
      "; //$origExtension = strrchr($path, '.'); - + //echo "ali je slika na strežniku: ".$slikaNaStrezniku."
      "; if($slikaNaStrezniku==0){ //ce slika je iz URL in ni na strezniku, izbrisi jo + //echo "tukaj
      "; if($imageExtension == 'jpg'){ unlink($imageName.'.'.$imageExtension); //izbrisi sliko }elseif($imageExtension == 'peg'){ diff --git a/admin/survey/export/latexclasses/textemp/images/logo1ka.png b/admin/survey/export/latexclasses/textemp/images/logo1ka.png index 87419dc4a..f2537bd71 100644 Binary files a/admin/survey/export/latexclasses/textemp/images/logo1ka.png and b/admin/survey/export/latexclasses/textemp/images/logo1ka.png differ diff --git a/admin/survey/export/latexclasses/textemp/images/logo1kaeng.png b/admin/survey/export/latexclasses/textemp/images/logo1kaeng.png index 25ffad067..91cf415e5 100644 Binary files a/admin/survey/export/latexclasses/textemp/images/logo1kaeng.png and b/admin/survey/export/latexclasses/textemp/images/logo1kaeng.png differ diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls index 5e4838c1a..fa222fbaa 100644 --- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls +++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisAndOtherLandscape.cls @@ -97,4 +97,6 @@ \DeclareUnicodeCharacter{2265}{$\geq$} \DeclareUnicodeCharacter{03B5}{$\epsilon$ \DeclareUnicodeCharacter{2003}{$\enspace$}} -\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja \ No newline at end of file +\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja +\DeclareUnicodeCharacter{0301}{$'$} +\DeclareUnicodeCharacter{2212}{-} \ No newline at end of file diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls index 6b41c7474..952ddf599 100644 --- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls +++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfAnalysisPortrait.cls @@ -95,4 +95,6 @@ \DeclareUnicodeCharacter{2265}{$\geq$} \DeclareUnicodeCharacter{03B5}{$\epsilon$} \DeclareUnicodeCharacter{2003}{$\enspace$} -\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja \ No newline at end of file +\DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja +\DeclareUnicodeCharacter{0301}{$'$} +\DeclareUnicodeCharacter{2212}{-} \ No newline at end of file diff --git a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls index 3b4b536d2..f7957dc4b 100644 --- a/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls +++ b/admin/survey/export/latexclasses/textemp/latexTemplatePdfSurvey.cls @@ -27,6 +27,7 @@ \usepackage[utf8]{inputenc} % za uporabo utf8 \usepackage{amssymb} %za unicode simbole +%\usepackage[T1]{fontenc} %DEFINIRANJE NADOMESTIL NEIZPISLJIVIH UNICODE CHARACTER-JEV \DeclareUnicodeCharacter{200B}{{\hskip 0pt}} @@ -35,6 +36,8 @@ \DeclareUnicodeCharacter{03B5}{$\epsilon$} \DeclareUnicodeCharacter{2003}{$\enspace$} \DeclareUnicodeCharacter{0014}{$\thinspace$} %ni ta pravi nadomestek, ker v Latexu tak simbol ne obstaja +\DeclareUnicodeCharacter{0301}{$'$} +\DeclareUnicodeCharacter{2212}{-} %namesto minusa, pomisljaj %Emoji - izpis urejen s slikicami emoji-jev \DeclareUnicodeCharacter{1F600}{\includegraphics[height=1em]{1F600.png}} diff --git a/admin/survey/index.php b/admin/survey/index.php index 90d360150..a252abbcf 100644 --- a/admin/survey/index.php +++ b/admin/survey/index.php @@ -137,7 +137,9 @@ } // Fonts - echo ''; + echo ''; + + //echo ''; ?> /u' - ,array($this, '_commentCB') - ,$this->_html); + '//u', + array($this, '_commentCB'), + $this->_html + ); // replace PREs with placeholders - $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/iu' - ,array($this, '_removePreCB') - ,$this->_html); + $this->_html = preg_replace_callback('/\\s*]*?>[\\s\\S]*?<\\/pre>)\\s*/iu', array($this, '_removePreCB'), $this->_html); // replace TEXTAREAs with placeholders $this->_html = preg_replace_callback( - '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/iu' - ,array($this, '_removeTextareaCB') - ,$this->_html); + '/\\s*]*?>[\\s\\S]*?<\\/textarea>)\\s*/iu', + array($this, '_removeTextareaCB'), + $this->_html + ); // trim each line. // @todo take into account attribute values that span multiple lines. @@ -139,24 +141,25 @@ class Minify_HTML // remove ws outside of all elements $this->_html = preg_replace( - '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<' - ,$this->_html); + '/>(\\s(?:\\s*))?([^<]+)(\\s(?:\s*))?$1$2$3<', + $this->_html + ); // use newlines before 1st attribute in open tags (to limit line lengths) $this->_html = preg_replace('/(<[a-z\\-]+)\\s+([^>]+>)/iu', "$1\n$2", $this->_html); // fill placeholders $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html + array_keys($this->_placeholders), + array_values($this->_placeholders), + $this->_html ); // issue 229: multi-pass to catch scripts that didn't get replaced in textareas $this->_html = str_replace( - array_keys($this->_placeholders) - ,array_values($this->_placeholders) - ,$this->_html + array_keys($this->_placeholders), + array_values($this->_placeholders), + $this->_html ); return $this->_html; @@ -164,7 +167,7 @@ class Minify_HTML protected function _commentCB($m) { - return (0 === strpos($m[1], '[') || false !== strpos($m[1], '_reservePlace($this->_needsCdata($css) + return $this->_reservePlace( + $this->_needsCdata($css) ? "{$openStyle}/**/" : "{$openStyle}{$css}" ); @@ -238,7 +242,8 @@ class Minify_HTML : 'trim'; $js = call_user_func($minifier, $js); - return $this->_reservePlace($this->_needsCdata($js) + return $this->_reservePlace( + $this->_needsCdata($js) ? "{$ws1}{$openScript}/**/{$ws2}" : "{$ws1}{$openScript}{$js}{$ws2}" ); diff --git a/admin/survey/minify/lib/Minify/ImportProcessor.php b/admin/survey/minify/lib/Minify/ImportProcessor.php index 85d9ff51e..00e413b31 100644 --- a/admin/survey/minify/lib/Minify/ImportProcessor.php +++ b/admin/survey/minify/lib/Minify/ImportProcessor.php @@ -66,7 +66,7 @@ class Minify_ImportProcessor $this->_currentDir = dirname($file); // remove UTF-8 BOM if present - if (pack("CCC",0xef,0xbb,0xbf) === substr($content, 0, 3)) { + if (pack("CCC", 0xef, 0xbb, 0xbf) === substr($content, 0, 3)) { $content = substr($content, 3); } // ensure uniform EOLs @@ -182,7 +182,7 @@ class Minify_ImportProcessor private function truepath($path) { // whether $path is unix or not - $unipath = ('' === $path) || ($path{0} !== '/'); + $unipath = ('' === $path) || ($path[0] !== '/'); // attempts to detect if path is relative in which case, add cwd if (strpos($path, ':') === false && $unipath) { diff --git a/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php b/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php index b84262208..191903518 100644 --- a/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php +++ b/admin/survey/minify/lib/Minify/JS/ClosureCompiler.php @@ -195,13 +195,13 @@ class Minify_JS_ClosureCompiler curl_close($ch); } else { throw new Minify_JS_ClosureCompiler_Exception( - "Could not make HTTP request: allow_url_open is false and cURL not available" + "Could not make HTTP request: allow_url_open is false and cURL not available" ); } if (false === $contents) { throw new Minify_JS_ClosureCompiler_Exception( - "No HTTP response from server" + "No HTTP response from server" ); } diff --git a/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php b/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php index bdc49da8c..8ce45200c 100644 --- a/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php +++ b/admin/survey/minify/lib/Minify/NailgunClosureCompiler.php @@ -110,4 +110,4 @@ class Minify_NailgunClosureCompiler extends Minify_ClosureCompiler $this->shell("$serverCommand /dev/null 2>/dev/null & sleep 10"); } -} \ No newline at end of file +} diff --git a/admin/survey/minify/lib/Minify/Source/Factory.php b/admin/survey/minify/lib/Minify/Source/Factory.php index f36d1b25c..3e6e378c0 100644 --- a/admin/survey/minify/lib/Minify/Source/Factory.php +++ b/admin/survey/minify/lib/Minify/Source/Factory.php @@ -170,7 +170,7 @@ class Minify_Source_Factory if ($this->options['noMinPattern'] && preg_match($this->options['noMinPattern'], $basename)) { if (preg_match('~\.(css|less)$~i', $basename)) { $spec['minifyOptions']['compress'] = false; - // we still want URI rewriting to work for CSS + // we still want URI rewriting to work for CSS } else { $spec['minifier'] = 'Minify::nullMinifier'; } diff --git a/admin/survey/minify/lib/Minify/YUICompressor.php b/admin/survey/minify/lib/Minify/YUICompressor.php index a45f57230..47723fc93 100644 --- a/admin/survey/minify/lib/Minify/YUICompressor.php +++ b/admin/survey/minify/lib/Minify/YUICompressor.php @@ -154,4 +154,3 @@ class Minify_YUICompressor } } } - diff --git a/admin/survey/minify/lib/MrClay/Cli.php b/admin/survey/minify/lib/MrClay/Cli.php index e9ef3b3bc..fc736abe2 100644 --- a/admin/survey/minify/lib/MrClay/Cli.php +++ b/admin/survey/minify/lib/MrClay/Cli.php @@ -390,4 +390,3 @@ class Cli $this->errors[$letter][] = sprintf($msg, $value); } } - diff --git a/admin/survey/minify/phpunit.xml b/admin/survey/minify/phpunit.xml index b6c77a566..3c54e248b 100644 --- a/admin/survey/minify/phpunit.xml +++ b/admin/survey/minify/phpunit.xml @@ -1,6 +1,6 @@ - + @@ -32,6 +31,7 @@ . tests + vendor diff --git a/admin/survey/minify/server-info.php b/admin/survey/minify/server-info.php index e0c6af871..e6369c28c 100644 --- a/admin/survey/minify/server-info.php +++ b/admin/survey/minify/server-info.php @@ -13,7 +13,8 @@ if (!$enabled) { die('Set $enabled to true to see server info.'); } -function assertTrue($test, $message) { +function assertTrue($test, $message) +{ if (!$test) { echo "Warning: $message\n"; } diff --git a/admin/survey/minify/static/gen.php b/admin/survey/minify/static/gen.php index f07aac21f..c39cefae7 100644 --- a/admin/survey/minify/static/gen.php +++ b/admin/survey/minify/static/gen.php @@ -7,12 +7,12 @@ if (is_file(__DIR__ . '/bootstrap.php')) { $bootstrap_file = __DIR__ . '/../bootstrap.php'; } -$send_400 = function($content = 'Bad URL') { +$send_400 = function ($content = 'Bad URL') { http_response_code(400); die($content); }; -$send_301 = function($url) { +$send_301 = function ($url) { http_response_code(301); header("Cache-Control: max-age=31536000"); header("Location: $url"); diff --git a/admin/survey/minify/static/lib.php b/admin/survey/minify/static/lib.php index 665bc1311..864e0f770 100644 --- a/admin/survey/minify/static/lib.php +++ b/admin/survey/minify/static/lib.php @@ -10,7 +10,8 @@ namespace Minify\StaticService; * @param string $type "css" or "js" * @return string */ -function build_uri($static_uri, $query, $type) { +function build_uri($static_uri, $query, $type) +{ $static_uri = rtrim($static_uri, '/'); $query = ltrim($query, '?'); @@ -30,7 +31,8 @@ function build_uri($static_uri, $query, $type) { * @param bool $auto_create Automatically create the directory if missing? * @return null|string null if missing or can't create */ -function get_cache_time($auto_create = true) { +function get_cache_time($auto_create = true) +{ foreach (scandir(__DIR__) as $entry) { if (ctype_digit($entry)) { return $entry; @@ -50,14 +52,16 @@ function get_cache_time($auto_create = true) { return $time; } -function flush_cache() { +function flush_cache() +{ $time = get_cache_time(false); if ($time) { remove_tree(__DIR__ . "/$time"); } } -function remove_tree($dir) { +function remove_tree($dir) +{ $files = array_diff(scandir($dir), array('.', '..')); foreach ($files as $file) { diff --git a/admin/survey/minify/utils.php b/admin/survey/minify/utils.php index 46e29d768..dddffab0c 100644 --- a/admin/survey/minify/utils.php +++ b/admin/survey/minify/utils.php @@ -48,7 +48,7 @@ function Minify_getUri($keyOrFiles, $opts = array()) * * Since this makes a bunch of stat() calls, you might not want to check this * on every request. - * + * * @param array $keysAndFiles group keys and/or file paths/URIs. * @return int latest modification time of all given keys/files */ diff --git a/admin/survey/modules/Evalvacija/class.GC.php b/admin/survey/modules/Evalvacija/class.GC.php index f2da9e048..f1e5b218e 100644 --- a/admin/survey/modules/Evalvacija/class.GC.php +++ b/admin/survey/modules/Evalvacija/class.GC.php @@ -51,10 +51,8 @@ class GC{ var $login = 'AnketniSistem'; // User za login var $password = 'AnketniSistem'; // Password za login - //var $year = '2017_2018'; // Letnica za porocilo - //var $year = '2018_2019'; // Letnica za porocilo - //var $year = '2019_2020'; // Letnica za porocilo - var $year = '2020_2021'; // Letnica za porocilo + //var $year = '2020_2021'; // Letnica za porocilo + var $year = '2021_2022'; // Letnica za porocilo var $izvajalec_table = ''; // Katero tabelo izvajalcev uporabljamo - navadna (eval_izvajalec) ali testna (eval_izvajalec2) @@ -188,14 +186,14 @@ class GC{ '4_1' => 'predmeti' ); - $reports_id = '11112021'; - $report_type = '2_7'; - $fak_id = '3000021'; + $reports_id = '02032022'; + $report_type = '1_1'; + $fak_id = '3000001'; $zip_name = ''; // Nastavimo pot do pdf-jev - $this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'; - //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'; + //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'; + $this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'; //$this->pdf_path = 'modules/Evalvacija/pdf/unzipped/'.$fakultete[$fak_id]['kratica'].'/'.$report_type_array[$report_type].'/'; echo 'Parametri:'; @@ -211,7 +209,7 @@ class GC{ //$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false); // BRANJE POROCIL - IZVAJALEC - //$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2', $fakultete[$fak_id]['kratica']); + //$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_321', $fakultete[$fak_id]['kratica']); // BRANJE POROCIL - FAKULTETA //$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2020_2021', $fakultete[$fak_id]['kratica']); diff --git a/admin/survey/modules/mod_EVOLI/R/Evoli_ang.R b/admin/survey/modules/mod_EVOLI/R/Evoli_ang.R index 37dfdb00c..58d36ed64 100644 --- a/admin/survey/modules/mod_EVOLI/R/Evoli_ang.R +++ b/admin/survey/modules/mod_EVOLI/R/Evoli_ang.R @@ -85,7 +85,7 @@ gradient.rect(0,-.5,podatki$totaleq,.5,col=smoothColors("Steel Blue 1",100.0,"Bl #install.packages("TeachingDemos") #sen?en tekst #library(TeachingDemos) # Sen?enje tekstapodatkovni.okvir_action_plann -shadowtext(podatki$totaleq, y =0, pos=2,label=podatki$totaleq, col="yellow", bg = "yellow",cex=2.4,r=0.1) +shadowtext(podatki$totaleq, y =0, pos=2,label=podatki$totaleq, col="yellow", bg = "yellow",cex=2.4,r=0.01) #box() #box("figure", lwd = 10) diff --git a/admin/survey/modules/mod_EVOLI/R/Evoli_dan.R b/admin/survey/modules/mod_EVOLI/R/Evoli_dan.R index f0c2077da..d6da55ac2 100644 --- a/admin/survey/modules/mod_EVOLI/R/Evoli_dan.R +++ b/admin/survey/modules/mod_EVOLI/R/Evoli_dan.R @@ -96,7 +96,7 @@ gradient.rect(0,-.5,podatki$totaleq,.5,col=smoothColors("Steel Blue 1",100.0,"Bl #install.packages("TeachingDemos") #senen tekst #library(TeachingDemos) # Senenje tekstapodatkovni.okvir_action_plann -shadowtext(podatki$totaleq, y =0, pos=2,label=podatki$totaleq, col="yellow", bg = "yellow",cex=2.4,r=0.1) +shadowtext(podatki$totaleq, y =0, pos=2,label=podatki$totaleq, col="yellow", bg = "yellow",cex=2.4,r=0.01) #box() #box("figure", lwd = 10) diff --git a/admin/survey/modules/mod_EVOLI/R/Evoli_slo.R b/admin/survey/modules/mod_EVOLI/R/Evoli_slo.R index 650a8baf3..d60147ed7 100644 --- a/admin/survey/modules/mod_EVOLI/R/Evoli_slo.R +++ b/admin/survey/modules/mod_EVOLI/R/Evoli_slo.R @@ -89,7 +89,7 @@ gradient.rect(0,-.5,podatki$totaleq,.5,col=smoothColors("Steel Blue 1",100.0,"Bl #install.packages("TeachingDemos") #senen tekst #library(TeachingDemos) # Senenje tekstapodatkovni.okvir_action_plann -shadowtext(podatki$totaleq, y =0, pos=2,label=podatki$totaleq, col="yellow", bg = "yellow",cex=2.4,r=0.1) +shadowtext(podatki$totaleq, y =0, pos=2,label=podatki$totaleq, col="yellow", bg = "yellow",cex=2.4,r=0.01) #box() #box("figure", lwd = 10) @@ -229,10 +229,10 @@ value <- c(podatki$sar,podatki$esr,podatki$obr,podatki$ser, podatki$smr,podatki$icr,podatki$srr,podatki$adr, podatki$psr,podatki$opr,podatki$acr,podatki$cor, podatki$emr,podatki$irr,podatki$gor) -names <- c("Samoocenjevanje"," ustveno samozavedanje", +names <- c("Samoocenjevanje","ustveno samozavedanje", "Objektivnost","Samoizra\u017Eanje","Obvladovanje stresa", "Nadzor nad impulzi", "Samozaupanje","Prilagodljivost", - "Re\u0161evanje problemov","Optimizem","Mo dose\u017Ekov","Zadovoljstvo", + "Re\u0161evanje problemov","Optimizem","Mo dose\u017Ekov","Zadovoljstvo", "Empatija","Medosebni odnosi","Skupinska usmerjenost") df <- data.frame(value, names) df$names <- as.character(df$names) @@ -242,7 +242,7 @@ df$names = factor(df$names, "Medosebni odnosi", "Empatija", "Zadovoljstvo", - "Mo dose\u017Ekov", + "Mo dose\u017Ekov", "Optimizem", "Re\u0161evanje problemov", "Prilagodljivost", @@ -251,7 +251,7 @@ df$names = factor(df$names, "Obvladovanje stresa", "Samoizra\u017Eanje", "Objektivnost", - " ustveno samozavedanje", + "ustveno samozavedanje", "Samoocenjevanje"), ordered=T) diff --git a/admin/survey/modules/mod_EVOLI/R/SPSS_rekodiranje.R b/admin/survey/modules/mod_EVOLI/R/SPSS_rekodiranje.R index e8a625a16..d50685fcf 100644 --- a/admin/survey/modules/mod_EVOLI/R/SPSS_rekodiranje.R +++ b/admin/survey/modules/mod_EVOLI/R/SPSS_rekodiranje.R @@ -1,8 +1,8 @@ recode.data <- podatki -# e ima ve kot 3 manjkajoe vrednosti test ni veljaven (vse spremeni v missing). -# e so manj kot 3 manjkajoe, potem njihove vrednosti spremeni v 2. +# �e ima� ve� kot 3 manjkajo�e vrednosti test ni veljaven (vse spremeni v missing). +# �e so manj kot 3 manjkajo�e, potem njihove vrednosti spremeni v 2. for (i in names(recode.data[,14:141])) { missing <- sum(is.na(recode.data[,14:141])) if (missing > 3) { @@ -238,7 +238,7 @@ recode.data$totaleq = recode.data$sa + recode.data$es + recode.data$ob + recode. recode.data$sm + recode.data$ic + recode.data$sr + recode.data$ad + recode.data$ps + recode.data$op + recode.data$ac + recode.data$co + recode.data$em + recode.data$ir + recode.data$go -# Skupni doseek. +# Skupni dose�ek. #### SINTAKSA 2: PEQM Recode ##### @@ -359,7 +359,7 @@ recode.data[ c("ssk")] <- -recode.data$totaleq = (((recode.data$totaleq - 381.36) / 36.46) * 20) + 100 +recode.data$totaleq = (((recode.data$totaleq - 381.36) / 36.46) * 10) + 100 recode.data$totaleq <- round(recode.data$totaleq, 0) diff --git a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php index 631814071..517787cec 100644 --- a/admin/survey/modules/mod_EVOLI/class.EvoliForm.php +++ b/admin/survey/modules/mod_EVOLI/class.EvoliForm.php @@ -830,7 +830,7 @@ class EvoliForm { if ($add) { $f = @fopen($site_path.'.htaccess', 'a'); if ($f !== false) { - fwrite($f, "\nRewriteRule ^".$nice_url.'\b(.*) '.$link."&foo=\$1&%{QUERY_STRING}"); + fwrite($f, "\nRewriteRule ^".$nice_url.'\b(?!-)(.*) '.$link."&foo=\$1&%{QUERY_STRING}"); fclose($f); $sqlI = sisplet_query("INSERT INTO srv_nice_links_skupine (id,ank_id,nice_link_id,vre_id,link) VALUES ('','$ank_id','$row[id]','$vre_id','$nice_url')"); diff --git a/admin/survey/modules/mod_NIJZ/R/Nijz_report.R b/admin/survey/modules/mod_NIJZ/R/Nijz_report.R index 19dbbe41d..120756d18 100644 --- a/admin/survey/modules/mod_NIJZ/R/Nijz_report.R +++ b/admin/survey/modules/mod_NIJZ/R/Nijz_report.R @@ -213,8 +213,8 @@ radarchart2 <- if (!is.null(vlabels)) VLABELS <- vlabels if (is.null(vlcex)) - text(xx * 1.2, yy * 1.2, VLABELS, srt=20) - else text(xx * 1.2, yy * 1.2, VLABELS, cex = vlcex, srt=20) + text(xx * 1.4, yy * 1.4, VLABELS, srt=20) + else text(xx * 1.4, yy * 1.4, VLABELS, cex = vlcex, srt=20) series <- length(df[[1]]) SX <- series - 2 if (length(pty) < SX) { @@ -340,7 +340,7 @@ radarchart2 <- #-------------------------- RADAR CHART -----------------------------# -CairoPNG('modules/mod_NIJZ/results/img/radar.png', width = 900, height = 700) # Export chart to png +CairoPNG('modules/mod_NIJZ/results/img/radar.png', width = 1000, height = 800) # Export chart to png # cairo_pdf( # paste('modules/mod_NIJZ/results/img/radar.pdf', sep = ''), @@ -368,7 +368,7 @@ colnames(mydf) <- labels #par(col="#004078", font = 2, cex = 1.4) -par(col="#004078", font = 2, cex = 0.9, xpd = TRUE) +par(col="#004078", font = 2, cex = 1.8, xpd = TRUE) # Plot a radar chart radarchart2( mydf, diff --git a/admin/survey/modules/mod_chat/class.SurveyChat.php b/admin/survey/modules/mod_chat/class.SurveyChat.php index 34694f47d..bb2883400 100644 --- a/admin/survey/modules/mod_chat/class.SurveyChat.php +++ b/admin/survey/modules/mod_chat/class.SurveyChat.php @@ -26,6 +26,10 @@ class SurveyChat{ // Nastavitve chat-a (na kateri strani se prikaze...) public function displaySettings(){ global $lang; + global $site_url; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; $row = SurveyInfo::getInstance()->getSurveyRow(); @@ -40,27 +44,44 @@ class SurveyChat{ $row = mysqli_fetch_array($sql); $code = $row['code']; } - echo ''.$lang['srv_chat_code'].':'; - echo ''; - - echo '

      '; + + echo '

      '.$lang['srv_vrsta_survey_note_14_1a'].':

      '; + + echo '
      '; + echo '

      '.$lang['srv_chat_code'].':

      '; + echo ''; + echo '
      '; // Prikaz vklopa chata - echo ''.$lang['srv_chat_type'].':'; - echo ''; - echo ''; - echo ''; - - echo '

      '; + echo '

      '.$lang['srv_vrsta_survey_note_14_1c'].'

      '; + + echo '
      '; + echo ''.$lang['srv_chat_type'].':'; + + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + + echo '
      '; echo ''; // Gumb shrani - echo '
      '; - echo ''; - echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; } diff --git a/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php b/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php index 7632b7e98..6c64d45bc 100644 --- a/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php +++ b/admin/survey/modules/mod_geoIP/class.SurveyGeoIP.php @@ -258,7 +258,7 @@ class SurveyGeoIP{ echo'
    2. '; #space - echo'
    3. '; + echo'
    4. '; echo'
    5. '; echo'
    6. '; diff --git a/admin/survey/modules/mod_hierarhija/css/vendor/datatables.min.css b/admin/survey/modules/mod_hierarhija/css/vendor/datatables.min.css index a27ea54cd..77d3cfd67 100644 --- a/admin/survey/modules/mod_hierarhija/css/vendor/datatables.min.css +++ b/admin/survey/modules/mod_hierarhija/css/vendor/datatables.min.css @@ -10,7 +10,7 @@ * DataTables 1.10.12, Responsive 2.1.0, Scroller 1.4.2 */ -table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px;border-bottom:1px solid #111}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px;border-top:1px solid #111}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc{cursor:pointer;*cursor:hand}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background-repeat:no-repeat;background-position:center right}table.dataTable thead .sorting{background-image:url("DataTables-1.10.12/images/sort_both.png")}table.dataTable thead .sorting_asc{background-image:url("DataTables-1.10.12/images/sort_asc.png")}table.dataTable thead .sorting_desc{background-image:url("DataTables-1.10.12/images/sort_desc.png")}table.dataTable thead .sorting_asc_disabled{background-image:url("DataTables-1.10.12/images/sort_asc_disabled.png")}table.dataTable thead .sorting_desc_disabled{background-image:url("DataTables-1.10.12/images/sort_desc_disabled.png")}table.dataTable tbody tr{background-color:#ffffff}table.dataTable tbody tr.selected{background-color:#B0BED9}table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}table.dataTable.no-footer{border-bottom:1px solid #111}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;box-sizing:content-box}.dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}.dataTables_wrapper .dataTables_length{float:left}.dataTables_wrapper .dataTables_filter{float:right;text-align:right}.dataTables_wrapper .dataTables_filter input{margin-left:0.5em}.dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}.dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}.dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;color:#333 !important;border:1px solid transparent;border-radius:2px}.dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{color:#333 !important;border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}.dataTables_wrapper .dataTables_paginate .paginate_button:hover{color:white !important;border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}.dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}.dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}.dataTables_wrapper .dataTables_scroll{clear:both}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td{vertical-align:middle}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}.dataTables_wrapper.no-footer div.dataTables_scrollHead table,.dataTables_wrapper.no-footer div.dataTables_scrollBody table{border-bottom:none}.dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}.dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}.dataTables_wrapper .dataTables_filter{margin-top:0.5em}} +table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px;border-bottom:1px solid #111}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px;border-top:1px solid #111}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc{cursor:pointer;*cursor:hand}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background-repeat:no-repeat;background-position:center right}table.dataTable thead .sorting{background-image:url("DataTables-1.10.12/images/sort_both.png")}table.dataTable thead .sorting_asc{background-image:url("DataTables-1.10.12/images/sort_asc.png")}table.dataTable thead .sorting_desc{background-image:url("DataTables-1.10.12/images/sort_desc.png")}table.dataTable thead .sorting_asc_disabled{background-image:url("DataTables-1.10.12/images/sort_asc_disabled.png")}table.dataTable thead .sorting_desc_disabled{background-image:url("DataTables-1.10.12/images/sort_desc_disabled.png")}table.dataTable tbody tr{background-color:#ffffff}table.dataTable tbody tr.selected{background-color:#B0BED9}table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}table.dataTable.no-footer{border-bottom:1px solid #111}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;box-sizing:content-box}.dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}.dataTables_wrapper .dataTables_length{float:left}.dataTables_wrapper .dataTables_filter{float:right;text-align:right}.dataTables_wrapper .dataTables_filter input{margin-left:0.5em}.dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}.dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}.dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;border:1px solid transparent;border-radius:2px}.dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}.dataTables_wrapper .dataTables_paginate .paginate_button:hover{border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}.dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}.dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}.dataTables_wrapper .dataTables_scroll{clear:both}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td{vertical-align:middle}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}.dataTables_wrapper.no-footer div.dataTables_scrollHead table,.dataTables_wrapper.no-footer div.dataTables_scrollBody table{border-bottom:none}.dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}.dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}.dataTables_wrapper .dataTables_filter{margin-top:0.5em}} table.dataTable.dtr-inline.collapsed>tbody>tr>td.child,table.dataTable.dtr-inline.collapsed>tbody>tr>th.child,table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty{cursor:default !important}table.dataTable.dtr-inline.collapsed>tbody>tr>td.child:before,table.dataTable.dtr-inline.collapsed>tbody>tr>th.child:before,table.dataTable.dtr-inline.collapsed>tbody>tr>td.dataTables_empty:before{display:none !important}table.dataTable.dtr-inline.collapsed>tbody>tr>td:first-child,table.dataTable.dtr-inline.collapsed>tbody>tr>th:first-child{position:relative;padding-left:30px;cursor:pointer}table.dataTable.dtr-inline.collapsed>tbody>tr>td:first-child:before,table.dataTable.dtr-inline.collapsed>tbody>tr>th:first-child:before{top:9px;left:4px;height:14px;width:14px;display:block;position:absolute;color:white;border:2px solid white;border-radius:14px;box-shadow:0 0 3px #444;box-sizing:content-box;text-align:center;font-family:'Courier New', Courier, monospace;line-height:14px;content:'+';background-color:#31b131}table.dataTable.dtr-inline.collapsed>tbody>tr.parent>td:first-child:before,table.dataTable.dtr-inline.collapsed>tbody>tr.parent>th:first-child:before{content:'-';background-color:#d33333}table.dataTable.dtr-inline.collapsed>tbody>tr.child td:before{display:none}table.dataTable.dtr-inline.collapsed.compact>tbody>tr>td:first-child,table.dataTable.dtr-inline.collapsed.compact>tbody>tr>th:first-child{padding-left:27px}table.dataTable.dtr-inline.collapsed.compact>tbody>tr>td:first-child:before,table.dataTable.dtr-inline.collapsed.compact>tbody>tr>th:first-child:before{top:5px;left:4px;height:14px;width:14px;border-radius:14px;line-height:14px;text-indent:3px}table.dataTable.dtr-column>tbody>tr>td.control,table.dataTable.dtr-column>tbody>tr>th.control{position:relative;cursor:pointer}table.dataTable.dtr-column>tbody>tr>td.control:before,table.dataTable.dtr-column>tbody>tr>th.control:before{top:50%;left:50%;height:16px;width:16px;margin-top:-10px;margin-left:-10px;display:block;position:absolute;color:white;border:2px solid white;border-radius:14px;box-shadow:0 0 3px #444;box-sizing:content-box;text-align:center;font-family:'Courier New', Courier, monospace;line-height:14px;content:'+';background-color:#31b131}table.dataTable.dtr-column>tbody>tr.parent td.control:before,table.dataTable.dtr-column>tbody>tr.parent th.control:before{content:'-';background-color:#d33333}table.dataTable>tbody>tr.child{padding:0.5em 1em}table.dataTable>tbody>tr.child:hover{background:transparent !important}table.dataTable>tbody>tr.child ul{display:inline-block;list-style-type:none;margin:0;padding:0}table.dataTable>tbody>tr.child ul li{border-bottom:1px solid #efefef;padding:0.5em 0}table.dataTable>tbody>tr.child ul li:first-child{padding-top:0}table.dataTable>tbody>tr.child ul li:last-child{border-bottom:none}table.dataTable>tbody>tr.child span.dtr-title{display:inline-block;min-width:75px;font-weight:bold}div.dtr-modal{position:fixed;box-sizing:border-box;top:0;left:0;height:100%;width:100%;z-index:100;padding:10em 1em}div.dtr-modal div.dtr-modal-display{position:absolute;top:0;left:0;bottom:0;right:0;width:50%;height:50%;overflow:auto;margin:auto;z-index:102;overflow:auto;background-color:#f5f5f7;border:1px solid black;border-radius:0.5em;box-shadow:0 12px 30px rgba(0,0,0,0.6)}div.dtr-modal div.dtr-modal-content{position:relative;padding:1em}div.dtr-modal div.dtr-modal-close{position:absolute;top:6px;right:6px;width:22px;height:22px;border:1px solid #eaeaea;background-color:#f9f9f9;text-align:center;border-radius:3px;cursor:pointer;z-index:12}div.dtr-modal div.dtr-modal-close:hover{background-color:#eaeaea}div.dtr-modal div.dtr-modal-background{position:fixed;top:0;left:0;right:0;bottom:0;z-index:101;background:rgba(0,0,0,0.6)}@media screen and (max-width: 767px){div.dtr-modal div.dtr-modal-display{width:95%}} diff --git a/admin/survey/modules/mod_panel/class.SurveyPanel.php b/admin/survey/modules/mod_panel/class.SurveyPanel.php index 5fc0cf12d..0c1613416 100644 --- a/admin/survey/modules/mod_panel/class.SurveyPanel.php +++ b/admin/survey/modules/mod_panel/class.SurveyPanel.php @@ -27,7 +27,11 @@ class SurveyPanel{ // Prikazemo nastavitve pri vklopu naprednega modula public function displaySettings(){ - global $lang; + global $lang; + global $site_url; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; echo '
      '.$lang['settings'].''; @@ -35,49 +39,51 @@ class SurveyPanel{ $row = $this->getPanelSettings(); // Url za preusmeritev - echo ''.$lang['srv_panel_url'].':'; - echo ''; - - echo '

      '; + echo '
      '; + echo '

      '.$lang['srv_panel_url'].':

      '; + echo ''; + echo '
      '; // Ime parametra za id respondenta - echo ''.$lang['srv_panel_user_id_name'].':'; - echo ''; - - echo '

      '; + echo '
      '; + echo '

      '.$lang['srv_panel_user_id_name'].':

      '; + echo ''; + echo '
      '; // Ime parametra za status - echo ''.$lang['srv_panel_status_name'].':'; - echo ''; - - echo '
      '; + echo '
      '; + echo ''.$lang['srv_panel_status_name'].':

      '; + echo ''; + echo '
      '; // Privzeta vrednost status parametra - echo ''.$lang['srv_panel_status_default'].':'; - echo ''; - - echo '

      '; + echo '
      '; + echo '

      '.$lang['srv_panel_status_default'].':

      '; + echo ''; + echo '
      '; // Primer zacetnega url-ja $link = SurveyInfo::getSurveyLink(); - echo ''.$lang['srv_panel_url1_example'].':'; - echo $link.'?'.$row['user_id_name'].'=RESPONDENT_PANEL_ID'; - - echo '

      '; + echo '
      '; + echo '

      '.$lang['srv_panel_url1_example'].':

      '; + echo '

      '.$link.'?'.$row['user_id_name'].'=RESPONDENT_PANEL_ID

      '; + echo '
      '; // Primer končnega url-ja - echo ''.$lang['srv_panel_url2_example'].':'; - echo $rowA['url'].'?'.$row['user_id_name'].'=RESPONDENT_PANEL_ID&'.$row['status_name'].'=PANEL_STATUS'; - + echo '
      '; + echo '

      '.$lang['srv_panel_url2_example'].':

      '; + echo '

      '.$rowA['url'].'?'.$row['user_id_name'].'=RESPONDENT_PANEL_ID&'.$row['status_name'].'=PANEL_STATUS

      '; + echo '
      '; echo '
      '; - // Gumb shrani - echo '
      '; - echo ''; - echo '
      '; + + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; } diff --git a/admin/survey/modules/mod_quiz/class.SurveyQuiz.php b/admin/survey/modules/mod_quiz/class.SurveyQuiz.php index d053d23ab..3f6e26097 100644 --- a/admin/survey/modules/mod_quiz/class.SurveyQuiz.php +++ b/admin/survey/modules/mod_quiz/class.SurveyQuiz.php @@ -25,45 +25,56 @@ class SurveyQuiz{ // Nastavitve kviza (prikaz rezultatov, grafa...) public function displaySettings(){ global $lang; - - - // Posebne opcije in navodile za anketo kviz - /*echo '
      '.$lang['srv_kviz_navodila_1'].''; - echo '

      '.$lang['srv_kviz_navodila_2'].'

      '; - echo '

      '.$lang['srv_kviz_navodila_3'].'

      '; - echo '

      '.$lang['srv_kviz_navodila_4'].'

      '; - echo '

      '.$lang['srv_kviz_navodila_6'].' '.Help::display('DataPiping').'

      '; - echo '

      '.$lang['srv_kviz_navodila_7'].'

      '; - echo '
      ';*/ + global $site_url; + + $preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/"); + $preklici_url = "'". $site_url . $preklici_url . "'"; - + echo '
      '.$lang['settings'].''; // Pridobimo trenutne nastavitve - $settings = $this->getSettings(); - + $settings = $this->getSettings(); + // Prikaz rezultatov v zakljucku - echo ''.$lang['srv_quiz_results'].':'; - echo ''; - echo ''; - - echo '
      '; + + echo '
      '; + echo ''.$lang['srv_quiz_results'].':'; + + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + + echo '
      '; // Prikaz grafa rezultatov v zakljucku - echo ''.$lang['srv_quiz_results_chart'].':'; - echo ''; - echo ''; - - echo '

      '; + echo '
      '; + echo ''.$lang['srv_quiz_results_chart'].':'; + + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + + echo '
      '; echo '
      '; - // Gumb shrani - echo '
      '; - echo ''; - echo '
      '; + echo '
      '; + echo ''; + echo ''; + echo '
      '; + echo '
      '; } diff --git a/admin/survey/redesign_test.php b/admin/survey/redesign_test.php index 7b618b26e..2cc9bfa48 100644 --- a/admin/survey/redesign_test.php +++ b/admin/survey/redesign_test.php @@ -44,7 +44,7 @@
    7. - 1ka.si + 1ka.si
    8. @@ -68,19 +68,19 @@
    9. -
    '.$lang['srv_narocilo_paket'].''.$lang['srv_narocilo_trajanje'].' ('.$lang['srv_narocilo_trajanje_mesecev'].')'.$lang['srv_narocilo_cas'].''.$lang['srv_narocilo_nacin_placila'].''.$lang['srv_narocilo_cena'].''.$lang['srv_narocilo_paket'].''.$lang['srv_narocilo_veljavnodo'].''.$lang['srv_narocilo_samo_cena'].''.$lang['srv_narocilo_status'].''.$lang['srv_narocilo_pdf'].''.$lang['srv_narocilo_pdf_predracun'].''.$lang['srv_narocilo_pdf_racun'].'
    '.$data_row['package_name'].''.$data_row['trajanje'].''.date("j.n.Y H:i", strtotime($data_row['time'])).''.$data_row['payment_method'].''.$package_name.' ('.$trajanje.')'.$veljaven_do.''.$cena['final_without_tax'].''.$cena['final_without_tax'].'€'.$cena['final'].''.$cena['final'].'€'.$lang['srv_narocilo_status_'.$data_row['status']].''; - echo ''.$lang['srv_narocilo_pdf_predracun'].''; + echo '
    '; diff --git a/frontend/simple/classes/DisplayController.php b/frontend/simple/classes/DisplayController.php index e361e42d9..ab915d8a0 100644 --- a/frontend/simple/classes/DisplayController.php +++ b/frontend/simple/classes/DisplayController.php @@ -73,7 +73,7 @@ class DisplayController{ echo ' '; echo ' '; - echo ' '; + echo ' '; echo ' '; echo ' '; echo ' '; @@ -94,6 +94,9 @@ class DisplayController{ echo ' '; echo ' '; + if(isAAI()){ + echo ' '; + } echo ' '; echo ' '; @@ -114,22 +117,81 @@ class DisplayController{ global $site_url; global $lang; + // if(isAAI()){ + // echo '
    '; + // } + // Logo v glavi echo ''; + if(isAAI()){ + + echo '
    '; + echo ' '; + + echo ''; + echo '
    '; + + echo ' '; + } // Navigacija - echo ''; + } + + // if(isAAI()){ + // echo '
    '; + // } + + } // Izris vsebine @@ -232,46 +309,68 @@ class DisplayController{ // Izris footerja public function displayFooter(){ global $lang; - + global $site_url; // Stolpec 1 - echo '
    '; + echo '
    '; echo '

    '.$lang['simple_footer_about'].'

    '; - echo ' '.$lang['simple_footer_about_1ka'].''; - if(isAAI()) - echo ' '.$lang['simple_footer_about_faq'].''; - echo ' '.$lang['simple_footer_about_general'].''; - echo ' '.$lang['simple_footer_about_privacy'].''; - echo ' '.$lang['simple_footer_about_cookies'].''; - echo ' '.$lang['simple_footer_about_antispam'].''; - echo ' '; + echo '
    '; + echo ' '.$lang['simple_footer_about_1ka'].''; + if(isAAI()) + echo ' '.$lang['simple_footer_about_faq'].''; + echo ' '.$lang['simple_footer_about_general'].''; + echo ' '.$lang['simple_footer_about_privacy'].''; + echo ' '.$lang['simple_footer_about_cookies'].''; + echo ' '.$lang['simple_footer_about_antispam'].''; + // echo ' '; + echo '
    '; echo '
    '; - + if(isAAI()){ // Stolpec 2 - echo '
    '; - echo '

    '.$lang['simple_footer_company'].'

    '; - echo ' '.AppSettings::getInstance()->getSetting('app_settings-owner').''; - echo ' '.AppSettings::getInstance()->getSetting('app_settings-admin_email').''; - echo ' '.AppSettings::getInstance()->getSetting('app_settings-owner_website').''; - echo '
    '; + echo '
    '; + echo '

    '.$lang['simple_footer_company'].'

    '; + + echo ' Arnes '; + + // echo ' '.AppSettings::getInstance()->getSetting('app_settings-owner').''; + // echo ' '.AppSettings::getInstance()->getSetting('app_settings-admin_email').''; + // echo ' '.AppSettings::getInstance()->getSetting('app_settings-owner_website').''; + + + echo '
    '; - // Stolpec 3 - logotipi - echo '
    '; + // stolpec 3 - spremljajte nas + echo '
    '; + echo '

    '.$lang['simple_footer_about_follow'].'

    '; + echo ' '; + echo '
    '; + // Stolpec 4 - logotipi + echo '
    '; + echo '

    '.$lang['simple_footer_namestitev'].'

    '; + + // Logotipa FDV in CDI - samo pri virtualkah + if(isVirtual() || isAAI()){ + echo '
    '; + + echo ' ministrstvo za izobraževanje znanost in šport'; + echo ' '; + echo ' '; + + + + echo '
    '; + } - // Logotipa FDV in CDI - samo pri virtualkah - if(isVirtual() || isAAI()){ - echo '
    '; - echo ' '; - echo ' '; echo '
    '; } - - echo '
    '; } @@ -346,33 +445,71 @@ class DisplayController{ // Izris okna na prvi strani - AAI private function displayFrontPageFormAAI(){ global $lang; - global $site_url; + + // HERO + echo '
    '; - // WHITE BOX FOR LOGIN / REGISTRATION - echo '
    '; - - // APP TITLE - aai - echo '
    '.AppSettings::getInstance()->getSetting('app_settings-app_name').'
    '; - - // AAI logo - //echo ''; - - // AAI text - echo '
    '; - echo '
    '.$lang['app_aai_installation_text'].'
    '; - echo '
    '; - - // AAI login/register - echo ' '; + echo '
    '; + echo '

    '.$lang["hero_heading"].'

    '; + echo '

    '.$lang["hero_text"].'

    '; + + echo ' '.$lang["AAI_prijava"].' '; + + echo '
    '; + + echo 'hero image'; + echo '
    '; + // POMEMBNE POVEZAVE + echo '
    '; + echo '
    '; + echo '

    '.$lang["povezave_pomembne_povezave"].'

    '; + + echo '
    '; + + echo '
    '; + echo 'kako deluje'; + echo '

    '.$lang["povezave__kako_deluje_h2"].'

    '; + echo '

    '.$lang["povezave__kako_deluje_text"].'

    '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo '
    '; + + echo '
    '; + echo 'o 1ka'; + echo '

    '.$lang["povezave_o_1ka_h2"].'

    '; + echo '

    '.$lang["povezave_o_1ka_text"].'

    '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo '
    '; + + echo '
    '; + echo '1ka podpora'; + echo '

    '.$lang["povezave_1ka_podpora_h2"].'

    '; + echo '

    '.$lang["povezave_1ka_podpora_text"].'

    '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo '
    '; + + echo '
    '; + echo 'arnes podpora'; + echo '

    '.$lang["povezave_arnes_podpora_h2"].'

    '; + echo '

    '.$lang["povezave_arnes_podpora_text"].'

    '; + echo ' '.$lang["povezave_preberi_vec"].'hero image '; + echo '
    '; + + echo '
    '; + echo '
    '; + echo '
    '; + + // APP SUBTITLE /*echo '
    '; echo $lang['app_aai_installation']; echo '
    ';*/ + + } // Izris okna za login na prvi strani @@ -471,7 +608,7 @@ class DisplayController{ echo ' '.$lang['cms_register_user_text'].''; // Email - echo ' '; + echo '