diff options
Diffstat (limited to 'admin/survey/classes/class.SurveyDataSettingProfiles.php')
| -rw-r--r-- | admin/survey/classes/class.SurveyDataSettingProfiles.php | 900 |
1 files changed, 465 insertions, 435 deletions
diff --git a/admin/survey/classes/class.SurveyDataSettingProfiles.php b/admin/survey/classes/class.SurveyDataSettingProfiles.php index 5b48f41..6185116 100644 --- a/admin/survey/classes/class.SurveyDataSettingProfiles.php +++ b/admin/survey/classes/class.SurveyDataSettingProfiles.php @@ -35,13 +35,11 @@ class SurveyDataSettingProfiles { *
* @param $_surveyId
*/
- static function Init($_surveyId)
- {
-
+ static function Init($_surveyId){
global $global_user_id, $lang;
- if ($_surveyId && $global_user_id)
- {
+ if ($_surveyId && $global_user_id){
+
self::$surveyId = $_surveyId;
self::$uId = $global_user_id;
@@ -52,7 +50,8 @@ class SurveyDataSettingProfiles { $dsp = SurveyUserSetting :: getInstance()->getSettings('default_dataSettingProfile_profile');
if ($dsp == -1 || $dsp > 0 ) {
self::$currentProfileId = $dsp;
- } else {
+ }
+ else {
self::$currentProfileId = 0;
self::SetDefaultProfile(0);
}
@@ -64,120 +63,121 @@ class SurveyDataSettingProfiles { # ime damo iz lang fajla
self::$profiles['-1']['id'] = '-1';
self::$profiles['-1']['name'] =$lang['srv_temp_profile'];
- } else if($dsp == -1 ) {
+ }
+ else if($dsp == -1 ) {
// #seja ne obstaja zato privzet profil popravimo na 0
$dsp = 0;
self::$currentProfileId = 0;
self::SetDefaultProfile(0);
}
+
#dodamo privzet sistemski profil
- self::$profiles['0'] = array('id'=>0,
- 'name'=>$lang['srv_default_profile1'],
- 'dsp_ndp' => NUM_DIGIT_PERCENT, # stevilo digitalnih mest za odstotek
- 'dsp_nda' => NUM_DIGIT_AVERAGE, # stevilo digitalnih mest za povprecje
- 'dsp_ndd' => NUM_DIGIT_DEVIATION, # stevilo digitalnih mest za odklon
- 'dsp_res' => NUM_DIGIT_RESIDUAL, # stevilo digitalnih mest za residual
- 'dsp_sep' => self::$defaultSeperator, # privzet seperator
- 'crossChk0' => '1', # izpis frekvenc
- 'crossChk1' => '0', # izpis procentov po vrsticah
- 'crossChk2' => '0', # izpis procentov po stolpcih
- 'crossChk3' => '0', # izpis skupnih procentov
- 'crossChkEC' => '0', # izpis skupnih procentov
- 'crossChkRE' => '0', # izpis skupnih procentov
- 'crossChkSR' => '0', # izpis skupnih procentov
- 'crossChkAR' => '0', # izpis skupnih procentov
- 'doColor' => '1', # barvanje celic
- 'doValues' => '1', # prikaz vrednosti
- 'showCategories' => '1', # prikaz kategorij
- 'showOther' => '1', # prikaz polj drugo
- 'showNumbers' => '1', # prikaz števil
- 'showText' => '1', # prikaz tekstovnih odgovorov
- 'chartNumbering' => '0', # ostevilcevanje grafov
- 'chartFontSize' => '8', # velikost fonta grafov
- 'chartFP' => '0', # izpis prve strani pri izvozu grafov (PDF/RTF)
- 'chartTableAlign' => '0', # default poravnava tabel pri grafih (0->sredinska, 1->leva)
- 'chartTableMore' => '0', # prikaz vseh textovnih odg. v tabelah (0->ne prikazi vseh, 1->vsi)
- 'chartNumerusText' => '0', # pozicija numerusa
- 'chartAvgText' => '1', # prikaz povprecja
- 'chartPieZeros' => '0', # prikaz nicelnih vrednosti v kroznih grafih
- 'hideEmpty' => '1', # skrivanje spremenljivke, ki nima veljavnih vnosov
- 'hideAllSystem' => '0', # skrivanje vseh sistemskih spremenljivk
- 'numOpenAnswers' => self::$textAnswersMore['10'], # koliko odprtih odgovorov prikažemo privzeto
-# 'enableInspect' => '0', # ali je Inspect vklopljen
- 'dataPdfType' => '0', # način izpisa pdf - navaden, dolg, kratek pri izviozu podatkov v pdf/rtf
- 'exportDataNumbering' => '1', # ostevilcevanje vprasanj pri izvozu ankete s podatki v pdf/rtf
- 'exportDataShowIf' => '1', # prikaz if stavkov pri izvozu ankete s podatki v pdf/rtf
- 'exportDataFontSize' => '10', # velikost fonta pri izvozu ankete spodatki v pdf/rtf
- 'exportDataShowRecnum' => '1', # prikaz recnuma respondenta pri izvozu ankete s podatki v pdf/rtf
- 'exportDataPB' => '0', # vsak respondent na svoji strani pri izvozu ankete s podatki v pdf/rtf
- 'exportDataSkipEmpty' => '0', # izpusti vprasanja brez odgovora pri izvozu ankete s podatki v pdf/rtf
- 'exportDataSkipEmptySub' => '0', # izpusti podvprasanja (multigridi) brez odgovora pri izvozu ankete s podatki v pdf/rtf
- 'exportDataLandscape' => '0', # landscape postavitev pri izvozu ankete s podatki v pdf/rtf
- 'exportNumbering' => '1', # ostevilcevanje vprasanj pri izvozu ankete v pdf/rtf
- 'exportShowIf' => '1', # prikaz if stavkov pri izvozu ankete v pdf/rtf
- 'exportFontSize' => '10', # velikost fonta pri izvozu ankete v pdf/rtf
- 'exportShowIntro' => '0', # prikaz uvoda pri izvozu ankete v pdf/rtf
- 'dataShowIcons' => '1', # ali prikazujemo ikone za urejanje pri podatkih
- 'analysisGoTo' => '1', # Privzeto gremo na grafe
- 'analiza_legenda' => '0', # Privzeto ne prikazujemo legende
- );
+ self::$profiles['0'] = array(
+ 'id'=>0,
+ 'name'=>$lang['srv_default_profile1'],
+ 'dsp_ndp' => NUM_DIGIT_PERCENT, # stevilo digitalnih mest za odstotek
+ 'dsp_nda' => NUM_DIGIT_AVERAGE, # stevilo digitalnih mest za povprecje
+ 'dsp_ndd' => NUM_DIGIT_DEVIATION, # stevilo digitalnih mest za odklon
+ 'dsp_res' => NUM_DIGIT_RESIDUAL, # stevilo digitalnih mest za residual
+ 'dsp_sep' => self::$defaultSeperator, # privzet seperator
+ 'crossChk0' => '1', # izpis frekvenc
+ 'crossChk1' => '0', # izpis procentov po vrsticah
+ 'crossChk2' => '0', # izpis procentov po stolpcih
+ 'crossChk3' => '0', # izpis skupnih procentov
+ 'crossChkEC' => '0', # izpis skupnih procentov
+ 'crossChkRE' => '0', # izpis skupnih procentov
+ 'crossChkSR' => '0', # izpis skupnih procentov
+ 'crossChkAR' => '0', # izpis skupnih procentov
+ 'doColor' => '1', # barvanje celic
+ 'doValues' => '1', # prikaz vrednosti
+ 'showCategories' => '1', # prikaz kategorij
+ 'showOther' => '1', # prikaz polj drugo
+ 'showNumbers' => '1', # prikaz števil
+ 'showText' => '1', # prikaz tekstovnih odgovorov
+ 'chartNumbering' => '0', # ostevilcevanje grafov
+ 'chartFontSize' => '8', # velikost fonta grafov
+ 'chartFP' => '0', # izpis prve strani pri izvozu grafov (PDF/RTF)
+ 'chartTableAlign' => '0', # default poravnava tabel pri grafih (0->sredinska, 1->leva)
+ 'chartTableMore' => '0', # prikaz vseh textovnih odg. v tabelah (0->ne prikazi vseh, 1->vsi)
+ 'chartNumerusText' => '0', # pozicija numerusa
+ 'chartAvgText' => '1', # prikaz povprecja
+ 'chartPieZeros' => '0', # prikaz nicelnih vrednosti v kroznih grafih
+ 'hideEmpty' => '1', # skrivanje spremenljivke, ki nima veljavnih vnosov
+ 'hideAllSystem' => '0', # skrivanje vseh sistemskih spremenljivk
+ 'numOpenAnswers' => self::$textAnswersMore['10'], # koliko odprtih odgovorov prikažemo privzeto
+ 'dataPdfType' => '0', # način izpisa pdf - navaden, dolg, kratek pri izviozu podatkov v pdf/rtf
+ 'exportDataNumbering' => '1', # ostevilcevanje vprasanj pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataShowIf' => '1', # prikaz if stavkov pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataFontSize' => '10', # velikost fonta pri izvozu ankete spodatki v pdf/rtf
+ 'exportDataShowRecnum' => '1', # prikaz recnuma respondenta pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataPB' => '0', # vsak respondent na svoji strani pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataSkipEmpty' => '0', # izpusti vprasanja brez odgovora pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataSkipEmptySub' => '0', # izpusti podvprasanja (multigridi) brez odgovora pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataLandscape' => '0', # landscape postavitev pri izvozu ankete s podatki v pdf/rtf
+ 'exportNumbering' => '1', # ostevilcevanje vprasanj pri izvozu ankete v pdf/rtf
+ 'exportShowIf' => '1', # prikaz if stavkov pri izvozu ankete v pdf/rtf
+ 'exportFontSize' => '10', # velikost fonta pri izvozu ankete v pdf/rtf
+ 'exportShowIntro' => '0', # prikaz uvoda pri izvozu ankete v pdf/rtf
+ 'dataShowIcons' => '1', # ali prikazujemo ikone za urejanje pri podatkih
+ 'analysisGoTo' => '1', # Privzeto gremo na grafe
+ 'analiza_legenda' => '0', # Privzeto ne prikazujemo legende
+ );
# poiščemo še seznam vseh ostalih profilov uporabnika
-
- $stringSelect = "SELECT * FROM srv_datasetting_profile WHERE uid = '".self::getGlobalUserId()."' || uid = '0' ORDER BY id";
- $querySelect = sisplet_query($stringSelect);
+ $querySelect = sisplet_query("SELECT * FROM srv_datasetting_profile WHERE uid = '".self::getGlobalUserId()."' || uid = '0' ORDER BY id");
if(mysqli_num_rows($querySelect) > 0){
while ( $rowSelect = mysqli_fetch_assoc($querySelect) ) {
- self::$profiles[$rowSelect['id']] = array( 'id'=>$rowSelect['id'],
- 'name'=>$rowSelect['name'],
- 'dsp_ndp' => $rowSelect['dsp_ndp'],
- 'dsp_nda' => $rowSelect['dsp_nda'],
- 'dsp_ndd' => $rowSelect['dsp_ndd'],
- 'dsp_res' => $rowSelect['dsp_res'],
- 'dsp_sep' => $rowSelect['dsp_sep'],
- 'crossChk0' => 1, // $rowSelect['crossChk0'],
- 'crossChk1' => $rowSelect['crossChk1'],
- 'crossChk2' => $rowSelect['crossChk2'],
- 'crossChk3' => $rowSelect['crossChk3'],
- 'crossChkEC' => $rowSelect['crossChkEC'],
- 'crossChkRE' => $rowSelect['crossChkRE'],
- 'crossChkSR' => $rowSelect['crossChkSR'],
- 'crossChkAR' => $rowSelect['crossChkAR'],
- 'doColor' => $rowSelect['doColor'],
- 'doValues' => $rowSelect['doValues'],
- 'showCategories' => $rowSelect['showCategories'],
- 'showOther' => $rowSelect['showOther'],
- 'showNumbers' => $rowSelect['showNumbers'],
- 'showText' => $rowSelect['showText'],
- 'chartNumbering' => $rowSelect['chartNumbering'],
- 'chartFontSize' => $rowSelect['chartFontSize'],
- 'chartFP' => $rowSelect['chartFP'],
- 'chartTableAlign' => $rowSelect['chartTableAlign'],
- 'chartTableMore' => $rowSelect['chartTableMore'],
- 'chartNumerusText' => $rowSelect['chartNumerusText'],
- 'chartAvgText' => $rowSelect['chartAvgText'],
- 'chartPieZeros' => $rowSelect['chartPieZeros'],
- 'hideEmpty' => $rowSelect['hideEmpty'],
- 'hideAllSystem' => $rowSelect['hideAllSystem'],
- 'numOpenAnswers' => $rowSelect['numOpenAnswers'],
- # 'enableInspect' => $rowSelect['enableInspect'],
- 'dataPdfType' => $rowSelect['dataPdfType'],
- 'exportDataNumbering' => $rowSelect['exportDataNumbering'],
- 'exportDataShowIf' => $rowSelect['exportDataShowIf'],
- 'exportDataFontSize' => $rowSelect['exportDataFontSize'],
- 'exportDataShowRecnum' => $rowSelect['exportDataShowRecnum'],
- 'exportDataPB' => $rowSelect['exportDataPB'],
- 'exportDataSkipEmpty' => $rowSelect['exportDataSkipEmpty'],
- 'exportDataSkipEmptySub' => $rowSelect['exportDataSkipEmptySub'],
- 'exportDataLandscape' => $rowSelect['exportDataLandscape'],
- 'exportNumbering' => $rowSelect['exportNumbering'],
- 'exportShowIf' => $rowSelect['exportShowIf'],
- 'exportFontSize' => $rowSelect['exportFontSize'],
- 'exportShowIntro' => $rowSelect['exportShowIntro'],
- 'dataShowIcons' => $rowSelect['dataShowIcons'],
- 'analysisGoTo' => $rowSelect['analysisGoTo'],
- 'analiza_legenda' => $rowSelect['analiza_legenda'],
- );
+
+ self::$profiles[$rowSelect['id']] = array(
+ 'id'=>$rowSelect['id'],
+ 'name'=>$rowSelect['name'],
+ 'dsp_ndp' => $rowSelect['dsp_ndp'],
+ 'dsp_nda' => $rowSelect['dsp_nda'],
+ 'dsp_ndd' => $rowSelect['dsp_ndd'],
+ 'dsp_res' => $rowSelect['dsp_res'],
+ 'dsp_sep' => $rowSelect['dsp_sep'],
+ 'crossChk0' => 1, // $rowSelect['crossChk0'],
+ 'crossChk1' => $rowSelect['crossChk1'],
+ 'crossChk2' => $rowSelect['crossChk2'],
+ 'crossChk3' => $rowSelect['crossChk3'],
+ 'crossChkEC' => $rowSelect['crossChkEC'],
+ 'crossChkRE' => $rowSelect['crossChkRE'],
+ 'crossChkSR' => $rowSelect['crossChkSR'],
+ 'crossChkAR' => $rowSelect['crossChkAR'],
+ 'doColor' => $rowSelect['doColor'],
+ 'doValues' => $rowSelect['doValues'],
+ 'showCategories' => $rowSelect['showCategories'],
+ 'showOther' => $rowSelect['showOther'],
+ 'showNumbers' => $rowSelect['showNumbers'],
+ 'showText' => $rowSelect['showText'],
+ 'chartNumbering' => $rowSelect['chartNumbering'],
+ 'chartFontSize' => $rowSelect['chartFontSize'],
+ 'chartFP' => $rowSelect['chartFP'],
+ 'chartTableAlign' => $rowSelect['chartTableAlign'],
+ 'chartTableMore' => $rowSelect['chartTableMore'],
+ 'chartNumerusText' => $rowSelect['chartNumerusText'],
+ 'chartAvgText' => $rowSelect['chartAvgText'],
+ 'chartPieZeros' => $rowSelect['chartPieZeros'],
+ 'hideEmpty' => $rowSelect['hideEmpty'],
+ 'hideAllSystem' => $rowSelect['hideAllSystem'],
+ 'numOpenAnswers' => $rowSelect['numOpenAnswers'],
+ 'dataPdfType' => $rowSelect['dataPdfType'],
+ 'exportDataNumbering' => $rowSelect['exportDataNumbering'],
+ 'exportDataShowIf' => $rowSelect['exportDataShowIf'],
+ 'exportDataFontSize' => $rowSelect['exportDataFontSize'],
+ 'exportDataShowRecnum' => $rowSelect['exportDataShowRecnum'],
+ 'exportDataPB' => $rowSelect['exportDataPB'],
+ 'exportDataSkipEmpty' => $rowSelect['exportDataSkipEmpty'],
+ 'exportDataSkipEmptySub' => $rowSelect['exportDataSkipEmptySub'],
+ 'exportDataLandscape' => $rowSelect['exportDataLandscape'],
+ 'exportNumbering' => $rowSelect['exportNumbering'],
+ 'exportShowIf' => $rowSelect['exportShowIf'],
+ 'exportFontSize' => $rowSelect['exportFontSize'],
+ 'exportShowIntro' => $rowSelect['exportShowIntro'],
+ 'dataShowIcons' => $rowSelect['dataShowIcons'],
+ 'analysisGoTo' => $rowSelect['analysisGoTo'],
+ 'analiza_legenda' => $rowSelect['analiza_legenda'],
+ );
}
}
@@ -189,7 +189,63 @@ class SurveyDataSettingProfiles { }
return true;
- } else {
+ }
+ // Gre za demo anketo
+ elseif(isDemoSurvey($_surveyId)){
+
+ #dodamo privzet sistemski profil
+ self::$profiles['0'] = array(
+ 'id'=>0,
+ 'name'=>$lang['srv_default_profile1'],
+ 'dsp_ndp' => NUM_DIGIT_PERCENT, # stevilo digitalnih mest za odstotek
+ 'dsp_nda' => NUM_DIGIT_AVERAGE, # stevilo digitalnih mest za povprecje
+ 'dsp_ndd' => NUM_DIGIT_DEVIATION, # stevilo digitalnih mest za odklon
+ 'dsp_res' => NUM_DIGIT_RESIDUAL, # stevilo digitalnih mest za residual
+ 'dsp_sep' => self::$defaultSeperator, # privzet seperator
+ 'crossChk0' => '1', # izpis frekvenc
+ 'crossChk1' => '0', # izpis procentov po vrsticah
+ 'crossChk2' => '0', # izpis procentov po stolpcih
+ 'crossChk3' => '0', # izpis skupnih procentov
+ 'crossChkEC' => '0', # izpis skupnih procentov
+ 'crossChkRE' => '0', # izpis skupnih procentov
+ 'crossChkSR' => '0', # izpis skupnih procentov
+ 'crossChkAR' => '0', # izpis skupnih procentov
+ 'doColor' => '1', # barvanje celic
+ 'doValues' => '1', # prikaz vrednosti
+ 'showCategories' => '1', # prikaz kategorij
+ 'showOther' => '1', # prikaz polj drugo
+ 'showNumbers' => '1', # prikaz števil
+ 'showText' => '1', # prikaz tekstovnih odgovorov
+ 'chartNumbering' => '0', # ostevilcevanje grafov
+ 'chartFontSize' => '8', # velikost fonta grafov
+ 'chartFP' => '0', # izpis prve strani pri izvozu grafov (PDF/RTF)
+ 'chartTableAlign' => '0', # default poravnava tabel pri grafih (0->sredinska, 1->leva)
+ 'chartTableMore' => '0', # prikaz vseh textovnih odg. v tabelah (0->ne prikazi vseh, 1->vsi)
+ 'chartNumerusText' => '0', # pozicija numerusa
+ 'chartAvgText' => '1', # prikaz povprecja
+ 'chartPieZeros' => '0', # prikaz nicelnih vrednosti v kroznih grafih
+ 'hideEmpty' => '1', # skrivanje spremenljivke, ki nima veljavnih vnosov
+ 'hideAllSystem' => '0', # skrivanje vseh sistemskih spremenljivk
+ 'numOpenAnswers' => self::$textAnswersMore['10'], # koliko odprtih odgovorov prikažemo privzeto
+ 'dataPdfType' => '0', # način izpisa pdf - navaden, dolg, kratek pri izviozu podatkov v pdf/rtf
+ 'exportDataNumbering' => '1', # ostevilcevanje vprasanj pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataShowIf' => '1', # prikaz if stavkov pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataFontSize' => '10', # velikost fonta pri izvozu ankete spodatki v pdf/rtf
+ 'exportDataShowRecnum' => '1', # prikaz recnuma respondenta pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataPB' => '0', # vsak respondent na svoji strani pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataSkipEmpty' => '0', # izpusti vprasanja brez odgovora pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataSkipEmptySub' => '0', # izpusti podvprasanja (multigridi) brez odgovora pri izvozu ankete s podatki v pdf/rtf
+ 'exportDataLandscape' => '0', # landscape postavitev pri izvozu ankete s podatki v pdf/rtf
+ 'exportNumbering' => '1', # ostevilcevanje vprasanj pri izvozu ankete v pdf/rtf
+ 'exportShowIf' => '1', # prikaz if stavkov pri izvozu ankete v pdf/rtf
+ 'exportFontSize' => '10', # velikost fonta pri izvozu ankete v pdf/rtf
+ 'exportShowIntro' => '0', # prikaz uvoda pri izvozu ankete v pdf/rtf
+ 'dataShowIcons' => '1', # ali prikazujemo ikone za urejanje pri podatkih
+ 'analysisGoTo' => '1', # Privzeto gremo na grafe
+ 'analiza_legenda' => '0', # Privzeto ne prikazujemo legende
+ );
+ }
+ else {
return false;
}
@@ -199,7 +255,11 @@ class SurveyDataSettingProfiles { *
*/
static function GetCurentProfileData() {
- return self::$profiles[self::$currentProfileId];
+
+ if(isset(self::$profiles[self::$currentProfileId]))
+ return self::$profiles[self::$currentProfileId];
+
+ return 0;
}
/** Vrne podatke podanega profofila
@@ -572,14 +632,9 @@ class SurveyDataSettingProfiles { $css = (self::$currentProfileId == SDS_DEFAULT_PROFILE ? ' gray' : '');
if ($hideAdvanced == false || self::$currentProfileId != SDS_DEFAULT_PROFILE) {
- if ($_GET['a'] != 'data') {
- # v podatkih imamo nastavitve na prvem mestum zato ne rišemo spejsrja
- echo '<li class="space"> </li>';
- }
echo '<li>';
- echo '<span class="as_link'.$css.'" id="dsp_link" title="' . $lang['srv_dsp_link_title'] . '">' . $lang['srv_dsp_link'] . '</span>'."\n";
+ echo ' <span class="'.$css.'" id="dsp_link" title="' . $lang['srv_dsp_link_title'] . '">' . $lang['srv_dsp_link'] . '</span>'."\n";
echo '</li>';
-
}
}
@@ -616,47 +671,60 @@ class SurveyDataSettingProfiles { }
$currentFilterProfile = $_all_profiles[$current_pid];
if ( self::$currentProfileId != SDS_DEFAULT_PROFILE ) {
- echo '<div id="not_default_setting">';
+ echo '<div id="not_default_setting" class="popup_note">';
echo $lang['srv_not_default_setting'];
- echo '</div><br class="clr displayNone">';
+ echo '</div>';
}
- echo '<div id="dsp_profiles_left">';
- echo '<span id="dsp_profiles_holder">';
+
+ echo '<div class="popup_main with_menu">';
+
+ echo '<div id="dsp_profiles_left" class="popup_left">';
+ echo '<div id="dsp_profiles_holder">';
+
# zlistamo vse profile
- echo '<span id="dsp_profiles" class="select">';
+ echo '<div id="dsp_profiles" class="list select">';
if (count($_all_profiles)) {
- foreach ($_all_profiles as $id=>$profile) {
-
- echo '<div class="option' . ($current_pid == $id ? ' active' : '') . '" id="dataSetting_profile_' . $id . '" value="'.$id.'">';
+ foreach ($_all_profiles as $id=>$profile) {
+
+ echo '<div class="list-item option '.($current_pid == $id ? 'active' : '').'" id="dataSetting_profile_' . $id . '" value="'.$id.'">';
echo $profile['name'];
if($current_pid == $id){
- # sistemskega ne moremo izbrisati
+ echo '<div class="profile_icons">';
+
+ # sistemskega ne moremo izbrisati
if ($current_pid != 0) {
- echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
+ echo ' <a href="#" onclick="dataSettingProfileAction(\'show_delete\'); return false;" value="'.$lang['srv_delete_profile'].'"><span class="faicon delete_circle icon-orange_link floatRight" style="margin-top:1px;"></span></a>'."\n";
}
# sistemskega in seje ne moremo preimenovati
if ($current_pid > 0) {
- echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
+ echo ' <a href="#" onclick="dataSettingProfileAction(\'show_rename\'); return false;" value="'.$lang['srv_rename_profile'].'"><span class="faicon edit floatRight spaceRight"></span></a>'."\n";
}
+
+ echo '</div>';
}
echo '</div>';
}
}
- echo '</span>'; # dataSetting_profile
- echo '</span>'; # dsp_profiles_holder
-
- echo '</div>'; # dsp_profiles_left
+ echo '</div>'; # dataSetting_profile
- echo '<div id="dsp_profiles_right">'."\n";
+ // Gumb za dodajanje novega profila
+ echo '<button class="small white-black" title="'.$lang['srv_create_new_profile'].'" onclick="dataSettingProfileAction(\'show_create\'); return false;">';
+ echo ' <span class="faicon plus_32"></span>'.$lang['srv_create_new_profile'];
+ echo '</button>';
+
+ echo '</div>'; # dsp_profiles_holder
+ echo '</div>'; # dsp_profiles_left
+
+
+ echo '<div id="dsp_profiles_right" class="popup_right">'."\n";
if ($current_pid == 0) {
- echo '<div id="dsp_note">';
+ echo '<div id="dsp_note" class="popup_right_note">';
echo $lang['srv_change_default_profile'];
echo '</div>'; // dataSetting_profile_note
- echo '<br class="clr" />'."\n";
}
echo '<div id="dsp_content">';
@@ -665,21 +733,25 @@ class SurveyDataSettingProfiles { echo '</div>'; // dataSetting_profile_right
+ echo '</div>';
+
- echo '<div id="dsp_button_holder">'."\n";
+ echo '<div id="dsp_button_holder" class="button_holder">'."\n";
if ((int)$current_pid <= 0 ) {
- if ((int)$current_pid == 0) {
- echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
- echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
- } else {
- echo '<span class="floatRight spaceRight" title="'.$lang['srv_run_as_session_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;"><span>'.$lang['srv_run_as_session_profile'] . '</span></a></div></span>';
+
+ echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+
+ if ((int)$current_pid == 0) {
+ echo '<button class="medium white-blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
+ echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
+ }
+ else {
+ echo '<button class="medium blue" title="'.$lang['srv_run_as_session_profile'] . '" onclick="dataSettingProfileAction(\'run_session_profile\'); return false;">'.$lang['srv_run_as_session_profile'] . '</button>';
}
- echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
- echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
- } else {
- echo '<span class="floatRight" title="'.$lang['srv_save_run_profile'] . '"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'run_profile\'); return false;"><span>'.$lang['srv_run_profile'] . '</span></a></div></span>';
- echo '<span class="floatRight spaceRight" title="'.$lang['srv_create_new_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'show_create\'); return false;"><span>'.$lang['srv_create_new_profile'] . '</span></a></div></span>';
- echo '<span class="floatRight spaceRight" title="'.$lang['srv_close_profile'].'"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel\'); return false;"><span>'.$lang['srv_close_profile'] . '</span></a></div></span>';
+ }
+ else {
+ echo '<button class="medium white-blue" title="'.$lang['srv_close_profile'].'" onclick="dataSettingProfileAction(\'cancel\'); return false;">'.$lang['srv_close_profile'] . '</button>';
+ echo '<button class="medium blue" title="'.$lang['srv_save_run_profile'] . '" onclick="dataSettingProfileAction(\'run_profile\'); return false;">'.$lang['srv_run_profile'] . '</button>';
}
echo '</div>'."\n"; // dsp_button_holder
@@ -688,26 +760,51 @@ class SurveyDataSettingProfiles { echo '<div id="dsp_cover_div"></div>'."\n";
// div za kreacijo novega
- echo '<div id="newProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
- echo '<input id="newProfileName" name="newProfileName" type="text" value="" size="45" />'."\n";
- echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_create\'); return false;"><span>'.$lang['srv_analiza_arhiviraj_save'].'</span></a></span></span>'."\n";
- echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_create\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
- echo '</div>'."\n";
+ echo '<div id="newProfileDiv">';
+
+ echo '<div class="setting_holder">';
+
+ echo '<div class="setting_item">';
+ echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+ echo '<input id="newProfileName" name="newProfileName" type="text" class="text large" value=""/>';
+ echo '</div>';
+ echo '</div>';
+
+ echo '<div class="button_holder">';
+ echo '<button class="medium white-blue" onClick="dataSettingProfileAction(\'cancel_create\'); return false;">'.$lang['srv_close_profile'].'</button>';
+ echo '<button class="medium blue" onclick="dataSettingProfileAction(\'do_create\'); return false;">'.$lang['srv_analiza_arhiviraj_save'].'</button>';
+ echo '</div>';
+
+ echo '</div>';
// div za preimenovanje
- echo '<div id="renameProfileDiv">'.$lang['srv_missing_profile_name'].': '."\n";
- echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" size="45" />'."\n";
- echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />'."\n";
- echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_rename\'); return false;"><span>'.$lang['srv_rename_profile_yes'].'</span></a></span></span>'."\n";
- echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_rename\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
- echo '</div>'."\n";
+ echo '<div id="renameProfileDiv">';
+
+ echo '<div class="setting_item">';
+ echo '<label>'.$lang['srv_missing_profile_name'].':</label>';
+ echo '<input id="renameProfileName" name="renameProfileName" type="text" value="' . $currentFilterProfile['name'] . '" class="text large"/>';
+ echo '<input id="renameProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />';
+ echo '</div>';
+
+ echo '<div class="button_holder">';
+ echo '<button class="medium white-blue" onClick="dataSettingProfileAction(\'cancel_rename\'); return false;">'.$lang['srv_close_profile'].'</button>';
+ echo '<button class="medium blue" onclick="dataSettingProfileAction(\'do_rename\'); return false;">'.$lang['srv_rename_profile_yes'].'</button>';
+ echo '</div>';
+
+ echo '</div>';
// div za brisanje
- echo '<div id="deleteProfileDiv">'.$lang['srv_missing_profile_delete_confirm'].': <b>' . $currentFilterProfile['name'] . '</b>?'."\n";
- echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />'."\n";
- echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="dataSettingProfileAction(\'do_delete\'); return false;"><span>'.$lang['srv_delete_profile_yes'].'</span></a></span></span>'."\n";
- echo '<span class="floatRight spaceLeft" ><span class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="dataSettingProfileAction(\'cancel_delete\'); return false;"><span>'.$lang['srv_close_profile'].'</span></a></span></span>'."\n";
- echo '</div>'."\n";
+ echo '<div id="deleteProfileDiv">';
+
+ echo $lang['srv_missing_profile_delete_confirm'].': <span class="semi-bold">' . $currentFilterProfile['name'] . '</span>?';
+ echo '<input id="deleteProfileId" type="hidden" value="' . $currentFilterProfile['id'] . '" />';
+
+ echo '<div class="button_holder">';
+ echo '<button class="medium white-blue" onClick="dataSettingProfileAction(\'cancel_delete\'); return false;">'.$lang['srv_close_profile'].'</button>';
+ echo '<button class="medium blue" onclick="dataSettingProfileAction(\'do_delete\'); return false;">'.$lang['srv_delete_profile_yes'].'</button>';
+ echo '</div>';
+
+ echo '</div>';
}
/** Funkcija prikaze osnovnih informacije profila
@@ -725,64 +822,64 @@ class SurveyDataSettingProfiles { echo '<fieldset>';
echo '<legend>'.$lang['srv_results_filter_settings'].'</legend>';
- echo '<label><input id="showCategories" name="showCategories" type="checkbox" ' .
- (($cp['showCategories']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_analiza_kategorialneSpremenljivke'];
- echo '</label>';
-
- echo '<label><input id="showOther" name="showOther" type="checkbox" ' .
- (($cp['showOther']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- #(($cp['showCategories']) ? '' : ' disabled="disabled" ')
- echo $lang['srv_analiza_ShowOthersText'] ;
- echo '</label>';
+
+ echo '<div class="setting_line">';
+
+ echo ' <input id="showCategories" name="showCategories" type="checkbox" '.(($cp['showCategories']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+ echo ' <label for="showCategories">'.$lang['srv_analiza_kategorialneSpremenljivke'].'</label>';
- echo '<label><input id="showNumbers" name="showNumbers" type="checkbox" ' .
- (($cp['showNumbers']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_analiza_numericneSpremenljivke'];
- echo '</label>';
+ echo ' <input id="showOther" name="showOther" type="checkbox" '.(($cp['showOther']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+ echo ' <label for="showOther">'.$lang['srv_analiza_ShowOthersText'].'</label>';
- echo '<label><input id="showText" name="showText" type="checkbox" ' .
- (($cp['showText']) ? ' checked="checked" ' : ' ') . ' autocomplete="off"/>';
- echo '</label>';
+ echo ' <input id="showNumbers" name="showNumbers" type="checkbox" '.(($cp['showNumbers']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+ echo ' <label for="showNumbers">'.$lang['srv_analiza_numericneSpremenljivke'].'</label>';
- echo $lang['srv_analiza_textovneSpremenljivke'];
+ echo ' <input id="showText" name="showText" type="checkbox" '.(($cp['showText']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+ echo ' <label for="showText">'.$lang['srv_analiza_textovneSpremenljivke'].'</label>';
- echo '<br />'.$lang['srv_analiza_link'].': ';
- echo '<select id="analysisGoTo">';
- echo '<option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
- echo '<option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
- echo '</select>';
+ echo '</div>';
+
- echo '<br/>';
+ echo '<div class="setting_line">';
+
+ echo ' <label>'.$lang['srv_analiza_link'].':<label>';
+ echo ' <select id="analysisGoTo">';
+ echo ' <option value="0"'.((int)$cp['analysisGoTo'] == 0 ? ' selected="selected"' : '').'>'.$lang['srv_analiza_charts'].'</option>';
+ echo ' <option value="1"'.((int)$cp['analysisGoTo'] == 1 ? ' selected="selected"' : '').'>'.$lang['srv_sumarnik'].'</option>';
+ echo ' </select>';
+
+ echo '</div>';
- echo '<label>';
- echo '<input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_analiza_showLegend'];
- echo '</label>';
- echo '<br/>';
+ echo '<div class="setting_line">';
+
+ echo ' <input id="analiza_legenda" name="analiza_legenda" type="checkbox" ' .(($cp['analiza_legenda'] == '1') ? ' checked="checked" ' : '') . ' autocomplete="off" />';
+ echo ' <label for="analiza_legenda">'.$lang['srv_analiza_showLegend'].'</label>';
+
+ echo '</div>';
+
- echo '<label>';
- echo '<input id="hideEmpty" name="hideEmpty" type="checkbox" ' .
- (($cp['hideEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_analiza_hideEmpty'] ;
- echo '</label>';
+ echo '<div class="setting_line">';
+
+ echo ' <input id="hideEmpty" name="hideEmpty" type="checkbox" '.(($cp['hideEmpty']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+ echo ' <label for="hideEmpty">'.$lang['srv_analiza_hideEmpty'].'</label>';
- echo '<br/>';
+ echo '</div>';
+
- echo '<label>';
- echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" ' .
- (($cp['hideAllSystem']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_analiza_hideAllEmpty'] ;
- echo '</label>';
+ echo '<div class="setting_line">';
+
+ echo '<input id="hideAllSystem" name="hideAllSystem" type="checkbox" '.(($cp['hideAllSystem']) ? ' checked="checked" ' : '').' autocomplete="off" />';
+ echo '<label for="hideAllSystem">'.$lang['srv_analiza_hideAllEmpty'].'</label>';
- echo '<br/>';
+ echo '</div>';
+
- echo '<label>';
- echo $lang['srv_analiza_defAnsCnt'].": ";
+ echo '<div class="setting_line">';
+
+ echo '<label>'.$lang['srv_analiza_defAnsCnt'].":</label>";
echo '<select id="numOpenAnswers" name="numOpenAnswers" autocomplete="off">';
$lastElement = end(self::$textAnswersMore);
-
foreach (self::$textAnswersMore AS $key => $values) {
echo '<option'.((int)$cp['numOpenAnswers'] == $values ? ' selected="selected"' : '').' value="'.$values.'">';
if ($values != $lastElement) {
@@ -793,80 +890,100 @@ class SurveyDataSettingProfiles { echo '</option>';
}
echo '</select>';
- echo '</label>';
+
+ echo '</div>';
echo '</fieldset>';
echo '<fieldset>';
echo '<legend>'.$lang['srv_results_base_settings'].'</legend>';
- echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
- echo ' <span clsss="dsp_sett_label">'.$lang['srv_results_for_percents'].': </span><input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
- echo ' <span class="dsp_sett_label">'.$lang['srv_results_for_average'].': </span><input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
- echo ' <span class="dsp_sett_label">'.$lang['srv_results_for_deviation'].': </span><input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
-
- echo '<br/>'.$lang['srv_results_decimal_sign'].': ';
+
+
+ echo '<div class="setting_line">';
+ echo ' <label>'.$lang['srv_results_num_digits'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <label for="dsp_ndp">'.$lang['srv_results_for_percents'].':</label>';
+ echo ' <input type="text" id="dsp_ndp" name="dsp_ndp" value="'.$cp['dsp_ndp'].'" size="2" autocomplete="off">';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <label for="dsp_nda">'.$lang['srv_results_for_average'].':</label>';
+ echo ' <input type="text" id="dsp_nda" name="dsp_nda" value="'.$cp['dsp_nda'].'" size="2" autocomplete="off">';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <label for="dsp_ndd">'.$lang['srv_results_for_deviation'].':</label>';
+ echo ' <input type="text" id="dsp_ndd" name="dsp_ndd" value="'.$cp['dsp_ndd'].'" size="2" autocomplete="off">';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo '<label>'.$lang['srv_results_decimal_sign'].':</label>';
foreach (self::$seperators AS $skey => $seperators) {
- echo '<label>';
- echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
- echo self::formatNumber('1234.56',2,$seperators);
- echo '</label>';
+ echo '<input type="radio" id="radio_dsp_sep_'.$skey.'" name="radio_dsp_sep" value="'.$skey.'"'.($cp['dsp_sep'] == $skey ? ' checked="checked"' : '').' autocomplete="off">';
+ echo '<label for="radio_dsp_sep_'.$skey.'">'.self::formatNumber('1234.56', 2, $seperators).'</label>';
}
+ echo '</div>';
+
echo '</fieldset>';
// Nastavitve za crosstabe - prikazemo samo v crosstabih
echo '<fieldset '.(isset($_POST['podstran']) && $_POST['podstran'] == 'crosstabs' ? '' : ' style="display:none;"').'>';
echo '<legend>'.$lang['srv_results_crostabs_settings'].'</legend>';
- echo '<span class="dsp_sett_label">'.$lang['srv_results_num_digits'].'</span>';
- echo ' <span clsss="dsp_sett_label">'.$lang['srv_results_for_residual'].': </span><input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
+
+ echo '<div class="setting_line">';
+ echo ' <label for="dsp_res">'.$lang['srv_results_num_digits'].' '.$lang['srv_results_for_residual'].':</label>';
+ echo ' <input type="text" id="dsp_res" name="dsp_res" value="'.$cp['dsp_res'].'" size="2" autocomplete="off">';
+ echo '</div>';
- echo '<div class="crossCheckHolder">' ;
- echo '<div class="crossCheckHolder">' ;
-// echo '<input id="crossCheck0" name="crossCheck0" type="checkbox" ' . ($cp['crossChk0'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span name="spn_residual" class="ctbChck_sp0">' . $lang['srv_analiza_crosstab_frekvence'] . '</span><br />';
- echo '<label>';
- echo '<input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp1" class="ctbChck_sp1">' . $lang['srv_analiza_crosstab_odstotek_vrstice'] . '</span><br />';
- echo '</label>';
- echo '<label>';
- echo '<input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp2" class="ctbChck_sp2">' . $lang['srv_analiza_crosstab_odstotek_stolpci'] . '</span><br />';
- echo '</label>';
- echo '<label>';
- echo '<input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_sp3" class="ctbChck_sp3">' . $lang['srv_analiza_crosstab_odstotek_skupni'] . '</span><br />';
- echo '</label>';
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheck1" name="crossCheck1" type="checkbox" ' . ($cp['crossChk1'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheck1">'.$lang['srv_analiza_crosstab_odstotek_vrstice'].'</label>';
echo '</div>';
- echo '<div class="crossCheckHolder">' ;
- echo '<label>';
- echo '<input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_EC" class="crossCheck_EC">' . $lang['srv_analiza_crosstab_expected_count'] . '</span><br />';
- echo '</label>';
- echo '<label>';
- echo '<input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_RE" class="crossCheck_RE">' . $lang['srv_analiza_crosstab_residual'] . '</span><br />';
- echo '</label>';
- echo '<label>';
- echo '<input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_SR" class="crossCheck_SR">' . $lang['srv_analiza_crosstab_stnd_residual'] . '</span><br />';
- echo '</label>';
- echo '<label>';
- echo '<input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span id="spn_residual_AR" class="crossCheck_AR">' . $lang['srv_analiza_crosstab_adjs_residual'] . '</span><br />';
- echo '</label>';
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheck2" name="crossCheck2" type="checkbox" ' . ($cp['crossChk2'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheck2">'.$lang['srv_analiza_crosstab_odstotek_stolpci'].'</label>';
echo '</div>';
-
- echo '<div class="crossCheckHolder">' ;
- echo '<label>';
- echo '<input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckColor">' . $lang['srv_analiza_crosstab_color_residual1'] . '</span><br />';
- echo '</label>';
- echo '<label>';
- echo '<input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/><span class="crossCheckValues">' . $lang['srv_analiza_crosstab_doValues'] . '</span>';
- echo '</label>';
- /*
- echo '<table id="tbl_color_ersidual" class="residual">';
- echo '<tr><td>'.$lang['srv_analiza_crosstab_value'].'</td><th>+</th><th>-</th></tr>';
- echo '<tr><td>1.1 - 2.0</td><td class="rsdl_bck1"> </td><td class="rsdl_bck4"> </td></tr>';
- echo '<tr><td>2.1 - 3.0</td><td class="rsdl_bck2"> </td><td class="rsdl_bck5"> </td></tr>';
- echo '<tr><td>3.1 '.$lang['srv_analiza_crosstab_and_more'].'</td><td class="rsdl_bck3"> </td><td class="rsdl_bck6"> </td></tr>';
- echo '</table>';
-*/
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheck3" name="crossCheck3" type="checkbox" ' . ($cp['crossChk3'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheck3">'.$lang['srv_analiza_crosstab_odstotek_skupni'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheckEC" name="crossCheckEC" type="checkbox" ' . ($cp['crossChkEC'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheckEC">'.$lang['srv_analiza_crosstab_expected_count'].'</label>';
echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheckRE" name="crossCheckRE" type="checkbox" ' . ($cp['crossChkRE'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheckRE">'.$lang['srv_analiza_crosstab_residual'].'</label>';
echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheckSR" name="crossCheckSR" type="checkbox" ' . ($cp['crossChkSR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheckSR">'.$lang['srv_analiza_crosstab_stnd_residual'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheckAR" name="crossCheckAR" type="checkbox" ' . ($cp['crossChkAR'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheckAR">'.$lang['srv_analiza_crosstab_adjs_residual'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheckColor" name="crossCheckColor" type="checkbox" ' . ($cp['doColor'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheckColor">'.$lang['srv_analiza_crosstab_color_residual1'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <input id="crossCheckValues" name="crossCheckValues" type="checkbox" ' . ($cp['doValues'] == true ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
+ echo ' <label for="crossCheckValues">'.$lang['srv_analiza_crosstab_doValues'].'</label>';
+ echo '</div>';
+
echo '</fieldset>';
@@ -874,195 +991,97 @@ class SurveyDataSettingProfiles { echo '<fieldset>';
echo '<legend>'.$lang['srv_results_charts_settings'].'</legend>';
+
// default poravnava tabel
- echo $lang['srv_chart_table_defAlign'].': ';
- echo '<label>';
- echo '<input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_0'];
- echo '</label>';
- echo '<label>';
- echo '<input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">'.$lang['srv_chart_table_defAlign_1'];
- echo '</label>';
+ echo '<div class="setting_line">';
+
+ echo ' <label>'.$lang['srv_chart_table_defAlign'].':</label>';
+
+ echo ' <input type="radio" id="chartTableAlign_0" name="chartTableAlign" value="0"'.($cp['chartTableAlign'] == 0 ? ' checked="checked"' : '').' autocomplete="off">';
+ echo ' <label for="chartTableAlign_0">'.$lang['srv_chart_table_defAlign_0'].'</label>';
+
+ echo ' <input type="radio" id="chartTableAlign_1" name="chartTableAlign" value="1"'.($cp['chartTableAlign'] == 1 ? ' checked="checked"' : '').' autocomplete="off">';
+ echo ' <label for="chartTableAlign_1">'.$lang['srv_chart_table_defAlign_1'].'</label>';
+
+ echo '</div>';
+
+
// velikost pisave v grafih
- echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
- echo '<select name="chartFontSize" id="chartFontSize" >';
+ echo '<div class="setting_line">';
+
+ echo '<label for="chartFontSize">'.$lang['srv_export_font'].':</label>';
+ echo '<select name="chartFontSize" id="chartFontSize">';
echo ' <option value="8"'.((int)$cp['chartFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
echo ' <option value="9"'.((int)$cp['chartFontSize'] == 9 ? ' selected="selected"' : '').'>9</option>';
echo ' <option value="10"'.((int)$cp['chartFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
echo ' <option value="11"'.((int)$cp['chartFontSize'] == 11 ? ' selected="selected"' : '').'>11</option>';
echo ' <option value="12"'.((int)$cp['chartFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
echo '</select>';
+
+ echo '</div>';
+
// prikaz texta ob numerusu
- echo '<br /><label>' . $lang['srv_chart_numerusText'] . ': </label>';
- echo '<select name="chartNumerusText" id="chartNumerusText" >';
+ echo '<div class="setting_line">';
+
+ echo '<label for="chartNumerusText">' . $lang['srv_chart_numerusText'] . ':</label>';
+ echo '<select name="chartNumerusText" id="chartNumerusText">';
echo ' <option value="0"'.((int)$cp['chartNumerusText'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_0'] . '</option>';
echo ' <option value="1"'.((int)$cp['chartNumerusText'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_1'] . '</option>';
echo ' <option value="2"'.((int)$cp['chartNumerusText'] == 2 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_2'] . '</option>';
echo ' <option value="3"'.((int)$cp['chartNumerusText'] == 3 ? ' selected="selected"' : '').'>' . $lang['srv_chart_numerusText_3'] . '</option>';
echo ' <option value="4"'.((int)$cp['chartNumerusText'] == 4 ? ' selected="selected"' : '').'>' . $lang['without'] . '</option>';
echo '</select>';
+
+ echo '</div>';
+
// prikaz povprecja
- echo '<br /><label>' . $lang['srv_chart_showAvg_long'] . ': </label>';
- echo '<select name="chartAvgText" id="chartAvgText" >';
+ echo '<div class="setting_line">';
+
+ echo '<label for="chartAvgText">' . $lang['srv_chart_showAvg_long'] . ':</label>';
+ echo '<select name="chartAvgText" id="chartAvgText">';
echo ' <option value="1"'.((int)$cp['chartAvgText'] == 1 ? ' selected="selected"' : '').'>' . $lang['yes'] . '</option>';
echo ' <option value="0"'.((int)$cp['chartAvgText'] == 0 ? ' selected="selected"' : '').'>' . $lang['no'] . '</option>';
echo '</select>';
+
+ echo '</div>';
+
// stevilcenje vprasanj
- echo '<br />';
- echo '<label>';
- echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" ' .
- (($cp['chartNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_nastavitveStevilcenje'];
- echo '</label>';
+ echo '<div class="setting_line">';
+
+ echo '<input id="chartNumbering" name="chartNumbering" type="checkbox" '.(($cp['chartNumbering']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
+ echo '<label for="chartNumbering">' . $lang['srv_nastavitveStevilcenje'] . ':</label>';
+
+ echo '</div>';
+
+
// uvodna stran v izvozu
- echo '<br />';
- echo '<label>';
- echo '<input id="chartFP" name="chartFP" type="checkbox" ' .
- (($cp['chartFP']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_chart_frontpage'] ;
- echo '</label>';
- // prikaz textovnih odgovorov (vec)
- /*echo '<br />';
- echo '<label>';
- echo '<input id="chartTableMore" name="chartTableMore" type="checkbox" ' .
- (($cp['chartTableMore']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_chart_table_more'] ;
- echo '</label>';*/
+ echo '<div class="setting_line">';
+
+ echo '<input id="chartFP" name="chartFP" type="checkbox" '.(($cp['chartFP']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
+ echo '<label for="chartFP">' . $lang['srv_chart_frontpage'] . ':</label>';
+
+ echo '</div>';
+
+
// prikaz nicelnih vrednosti v kroznih grafih
- echo '<br />';
- echo '<label>';
- echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" ' .
- (($cp['chartPieZeros']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_chart_pieZeros'] ;
- echo '</label>';
- echo '</fieldset>';
-
-# echo '<label>'.$lang['srv_displaydata_showIcon'].'</label>';
-# echo ' <input id="dataShowIcons0" name="dataShowIcons" type="radio" value="0"' .
-# (($cp['dataShowIcons'] != 1) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-# echo '<label for="dataShowIcons0">'.$lang['no'].'</label>';
-#
-# echo ' <input id="dataShowIcons1" name="dataShowIcons" type="radio" value="1"' .
-# (($cp['dataShowIcons'] == 1) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
-# echo '<label for="dataShowIcons1">'.$lang['yes'].'</label>';
-# echo '<br/>';
-
-
- #Nastavitve za izvoz podatkov - PRESTAVLJENO V SPLOSNE NASTAVITVE ANKETE
- /*echo '<fieldset style="width: 43%; float: left;">';
- echo '<legend>'.$lang['srv_export_results_settings'].'</legend>';
-
- echo '<label>' . $lang['srv_displaydata_type'] . ': </label>';
- echo '<select name="dataPdfType" id="dataPdfType" >';
- echo ' <option value="0"'.((int)$cp['dataPdfType'] == 0 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type0'] . '</option>';
- echo ' <option value="1"'.((int)$cp['dataPdfType'] == 1 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type1'] . '</option>';
- echo ' <option value="2"'.((int)$cp['dataPdfType'] == 2 ? ' selected="selected"' : '').'>' . $lang['srv_displaydata_type2'] . '</option>';
- echo '</select>';
- echo Help :: display('displaydata_pdftype');
-
- // ostevilcevanje vprasanj pri izvozih
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataNumbering" name="exportDataNumbering" type="checkbox" ' .
- (($cp['exportDataNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_nastavitveStevilcenje'];
- echo '</label>';
- // prikaz recnumov respondentov pri izvozih
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataShowRecnum" name="exportDataShowRecnum" type="checkbox" ' .
- (($cp['exportDataShowRecnum']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_show_recnum'];
- echo '</label>';
- // page break med posameznimi respondenti
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataPB" name="exportDataPB" type="checkbox" ' .
- (($cp['exportDataPB']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_pagebreak'];
- echo '</label>';
- // izpusti vprasanja brez odgovora
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataSkipEmpty" name="exportDataSkipEmpty" type="checkbox" ' .
- (($cp['exportDataSkipEmpty']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_skip_empty'];
- echo '</label>';
- // izpusti podvprasanja brez odgovora
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataSkipEmptySub" name="exportDataSkipEmptySub" type="checkbox" ' .
- (($cp['exportDataSkipEmptySub']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_skip_empty_sub'];
- echo '</label>';
- // landscape postavitev izvoza - V DELU
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataLandscape" name="exportDataLandscape" type="checkbox" ' .
- (($cp['exportDataLandscape']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_landscape'];
- echo '</label>';
- // prikaz pogojev pri izvozih
- echo '<br />';
- echo '<label>';
- echo '<input id="exportDataShowIf" name="exportDataShowIf" type="checkbox" ' .
- (($cp['exportDataShowIf']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_if'];
- echo '</label>';
- // velikost pisave v izvozih
- echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
- echo '<select name="exportDataFontSize" id="exportDataFontSize" >';
- echo ' <option value="8"'.((int)$cp['exportDataFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
- echo ' <option value="10"'.((int)$cp['exportDataFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
- echo ' <option value="12"'.((int)$cp['exportDataFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
- echo '</select>';
-
+ echo '<div class="setting_line">';
+
+ echo '<input id="chartPieZeros" name="chartPieZeros" type="checkbox" '.(($cp['chartPieZeros']) ? ' checked="checked" ' : '').' autocomplete="off"/>';
+ echo '<label for="chartPieZeros">' . $lang['srv_chart_pieZeros'] . ':</label>';
+
+ echo '</div>';
+
+
echo '</fieldset>';
-
-
- #Nastavitve za izvoz vprasalnika - PRESTAVLJENO V SPLOSNE NASTAVITVE ANKETE
- echo '<fieldset style="width: 43%; float: right; margin-bottom: 40px;">';
- echo '<legend>'.$lang['srv_export_survey_settings'].'</legend>';
-
- // ostevilcevanje vprasanj pri izvozih
- echo '<label>';
- echo '<input id="exportNumbering" name="exportNumbering" type="checkbox" ' .
- (($cp['exportNumbering']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_nastavitveStevilcenje'];
- echo '</label>';
- // prikaz pogojev pri izvozih
- echo '<br />';
- echo '<label>';
- echo '<input id="exportShowIf" name="exportShowIf" type="checkbox" ' .
- (($cp['exportShowIf']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_if'];
- echo '</label>';
- // velikost pisave v izvozih
- echo '<br /><label>' . $lang['srv_export_font'] . ': </label>';
- echo '<select name="exportFontSize" id="exportFontSize" >';
- echo ' <option value="8"'.((int)$cp['exportFontSize'] == 8 ? ' selected="selected"' : '').'>8</option>';
- echo ' <option value="10"'.((int)$cp['exportFontSize'] == 10 ? ' selected="selected"' : '').'>10</option>';
- echo ' <option value="12"'.((int)$cp['exportFontSize'] == 12 ? ' selected="selected"' : '').'>12</option>';
- echo '</select>';
-
- // prikaz uvoda pri izvozih
- echo '<br />';
- echo '<label>';
- echo '<input id="exportShowIntro" name="exportShowIntro" type="checkbox" ' .
- (($cp['exportShowIntro']) ? ' checked="checked" ' : '') . ' autocomplete="off"/>';
- echo $lang['srv_export_intro'];
- echo '</label>';
- echo '</fieldset>';*/
-
- //echo '<span class="clr"></span>';
}
public static function ajax() {
switch ($_GET['a']) {
case 'showProfile':
- self::displayProfiles($_POST['pid']);
+ self::displayProfiles(isset($_POST['pid'])?$_POST['pid']:'');
break;
case 'createProfile':
self::createNewProfile();
@@ -1093,17 +1112,7 @@ class SurveyDataSettingProfiles { case 'refreshDropdown':
self::DisplayLinkDropdown();
break;
-/*
- case 'show_inspectListSpr':
- self::showInspectListSpr();
- break;
- case 'saveInspectListVars':
- self::saveInspectListVars();
- break;
- case 'displayInspectVars':
- self::displayInspectVars();
- break;
-*/
+
case 'removeKategoriesProfile':
self::removeKategoriesProfile();
break;
@@ -1113,6 +1122,9 @@ class SurveyDataSettingProfiles { case 'changeDataIconsSettings':
self::changeDataIconsSettings();
break;
+ case 'changeDataFullscreen':
+ self::changeDataFullscreen();
+ break;
case 'changeUsabilityIconsSettings':
self::changeUsabilityIconsSettings();
break;
@@ -1230,13 +1242,15 @@ class SurveyDataSettingProfiles { }
static function getVariableTypeNote() {
-
+ $prefix='';
+
if (SurveyDataSettingProfiles :: getSetting('showCategories') == 0
|| SurveyDataSettingProfiles :: getSetting('showNumbers') == 0
|| SurveyDataSettingProfiles :: getSetting('showOther') == 0
|| SurveyDataSettingProfiles :: getSetting('showText') == 0) {
echo '<div id="variableTypeNote">Spremenljivke tipa: <strong>';
+
if (self :: getSetting('showCategories') == 0) {
echo $prefix.'kategorije';
$prefix=', ';
@@ -1253,12 +1267,15 @@ class SurveyDataSettingProfiles { echo $prefix.'besedilo';
$prefix=', ';
}
+
echo '</strong> niso prikazane. ';
echo '<span id="link_variableType_profile_setup" class="as_link">Nastavi</span>';
echo ' <span id="link_variableType_profile_remove" class="as_link">Odstrani</span>';
echo '</div>';
- return true;
- } else {
+
+ return true;
+ }
+ else {
return false;
}
}
@@ -1329,6 +1346,19 @@ class SurveyDataSettingProfiles { session_commit();
}
}
+
+ static function changeDataFullscreen(){
+ session_start();
+
+ if (isset($_POST['data_fullscreen'])){
+ if($_POST['data_fullscreen'] == '1') {
+ $_SESSION['sid_'.self::$surveyId]['data_fullscreen'] = true;
+ } else {
+ $_SESSION['sid_'.self::$surveyId]['data_fullscreen'] = false;
+ }
+ session_commit();
+ }
+ }
static function changeUsabilityIconsSettings(){
session_start();
@@ -1399,7 +1429,7 @@ class SurveyDataSettingProfiles { // Shranimo residuale za crosstabe
static function saveResidualProfileSetting() {
global $lang;
-
+ $updatequery = null;
$pid = (isset($_POST['pid'])) ? $_POST['pid'] : -1;
if(isset($_POST['value'])){
|