summaryrefslogtreecommitdiffstats
path: root/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
diff options
context:
space:
mode:
Diffstat (limited to 'admin/survey/classes/surveyAnalysis/class.SurveyMeans.php')
-rw-r--r--admin/survey/classes/surveyAnalysis/class.SurveyMeans.php368
1 files changed, 211 insertions, 157 deletions
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
index f2155cf..9e3230d 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyMeans.php
@@ -8,7 +8,7 @@
*
*/
-define("EXPORT_FOLDER", "admin/survey/SurveyData");
+if(!defined("EXPORT_FOLDER"))define("EXPORT_FOLDER", "admin/survey/SurveyData");
class SurveyMeans{
@@ -32,19 +32,29 @@ class SurveyMeans{
public $doValues = true; # checkbox Prikaži vrednosti
- private $sessionData; # podatki ki so bili prej v sessionu - za nastavitve, ki se prenasajo v izvoze...
+ private $sessionData = null; # podatki ki so bili prej v sessionu - za nastavitve, ki se prenasajo v izvoze...
+ protected $crossNavVsEno = null;
+
+ protected $currentMissingProfile = null;
+
+ protected $setUpJSAnaliza = null;
public function __construct($sid) {
+ global $global_user_id;
+
if ((int)$sid > 0) {
$this->sid = $sid;
# polovimo vrsto tabel (aktivne / neaktivne)
SurveyInfo :: getInstance()->SurveyInit($this->sid);
- if (SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1) {
- $this->db_table = '_active';
- }
+ $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);
@@ -169,6 +179,7 @@ class SurveyMeans{
# izrišemo desne linke do posameznih nastavitev
+ $SSH = new SurveyStaticHtml($this->sid);
$SSH -> displayAnalizaRightOptions(M_ANALYSIS_MEANS);
}
@@ -234,38 +245,36 @@ class SurveyMeans{
function displayDropdowns() {
global $lang;
+
$variables1 = $this->getVariableList(1);
$variables2 = $this->getVariableList(2);
- echo '<div id="meansLeftDropdowns" >';
- if ((int)$this->variabla1['0']['seq'] > 0) {
- echo '<span class="pointer space_means_new" >&nbsp;</span>';
- }
- echo $lang['srv_means_label1'];
- echo '<br />';
+
+ echo '<div id="meansLeftHolder">';
+
+ echo '<span class="title">'.$lang['srv_means_label1'].'</span>';
+
# 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 '<span class="pointer" id="means_add_new" onclick="means_add_new_variable(\'1\');"><span class="faicon add small icon-as_link" title=""></span></span>';
- }
-
+
+ echo '<div id="meansLeftDropdowns">';
+
foreach($this->variabla1 AS $_key => $variabla1) {
- echo $_br;
- echo '<span id="v1_'.$_key.'">';
- echo '<select name="means_variable_1" id="means_variable_1" onchange="change_means(); return false;" autocomplete="off">';
+ echo '<div id="v1_'.$_key.'" class="variabla_line">';
+
+ echo '<select name="means_variable_1" id="means_variable_1" class="dropdown large" onchange="change_means(); return false;" autocomplete="off">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) {
echo '<option value="0" selected="selected" >'. $lang['srv_means_izberi_prvo'].'</option>';
}
foreach ($variables1 as $variable) {
- echo '<option value="'.$variable['sequence'].'" spr_id="'.$variable['spr_id'].'" '
+ echo '<option value="'.(isset($variable['sequence'])?$variable['sequence']:'').'" spr_id="'.(isset($variable['spr_id'])?$variable['spr_id']:'').'" '
. ( isset($variable['grd_id']) ? ' grd_id="'.$variable['grd_id'].'" ' : '')
. (( (int)$variable['canChoose'] == 1) ? '' : ' disabled="disabled" ')
- . ( ($variabla1['seq'] > 0 &&$variabla1['seq'] == $variable['sequence']) ? ' selected="selected" ' : '')
+ . ( ($variabla1['seq'] > 0 &&isset($variable['sequence'])&&$variabla1['seq'] == $variable['sequence']) ? ' selected="selected" ' : '')
. '> '
. ( (int)$variable['sub'] == 0 ? '' : ( (int)$variable['sub'] == 1 ? '&nbsp;&nbsp;' : '&nbsp;&nbsp;&nbsp;&nbsp;' ))
. $variable['variableNaslov'].'</option>';
@@ -273,38 +282,39 @@ class SurveyMeans{
}
echo '</select>';
+
if (count($this->variabla1) > 1) {
- echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
- } else {
- #echo '<span class="space_means_new">&nbsp;</span>';
- }
+ echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle" title=""></span></span>';
+ }
+
+ echo '</div>';
+ }
- $_br = '<br/><span class="space_means_new">&nbsp;</span>';
- echo '</span>';
+ echo '</div>';
+
+ // Gumb za dodajanje spremenljivke
+ if ((int)$this->variabla1['0']['seq'] > 0) {
+ echo '<button class="blue small" id="means_add_new" onclick="means_add_new_variable(\'1\');">'.$lang['srv_multicrosstabs_add'].'</span>';
}
- $_br = null;
}
echo '</div>';
- echo '<div id="meansRightDropdowns">';
- if ((int)$this->variabla1['0']['seq'] > 0) {
- echo '<span class="pointer space_means_new" >&nbsp;</span>';
- }
- echo $lang['srv_means_label2'];
- echo '<br />';
-
+
+ echo '<div id="meansRightHolder">';
+
+ echo '<span class="title">'.$lang['srv_means_label2'].'</span>';
# za vsako novo spremenljivko 2 nardimo svoj select
if (count($this->variabla2) > 0) {
- if ((int)$this->variabla1['0']['seq'] > 0) {
- echo '<span class="pointer" id="means_add_new" onclick="means_add_new_variable(\'2\');"><span class="faicon add small icon-as_link" title="'.'"></span></span>';
- }
-
+
+ echo '<div id="meansRightDropdowns">';
+
foreach($this->variabla2 AS $_key => $variabla2) {
- echo $_br;
- echo '<span id="v2_'.$_key.'">';
- echo '<select name="means_variable_2" id="means_variable_2" onchange="change_means(); return false;" autocomplete="off"'
+
+ echo '<div id="v2_'.$_key.'" class="variabla_line">';
+
+ echo '<select name="means_variable_2" id="means_variable_2" class="dropdown large" onchange="change_means(); return false;" autocomplete="off"'
. ((int)$this->variabla1['0']['seq'] > 0 ? '' : ' disabled="disabled" ')
.'>';
@@ -319,39 +329,55 @@ class SurveyMeans{
}
foreach ($variables2 as $variable) {
- echo '<option value="'.$variable['sequence'].'" spr_id="'.$variable['spr_id'].'" '
+ echo '<option value="'.(isset($variable['sequence'])?$variable['sequence']:'').'" spr_id="'.(isset($variable['spr_id'])?$variable['spr_id']:'').'" '
. ( isset($variable['grd_id']) ? ' grd_id="'.$variable['grd_id'].'" ' : '')
. (( (int)$variable['canChoose'] == 1) ? '' : ' disabled="disabled" ')
- . ( $variabla2['seq'] > 0 && $variabla2['seq'] == $variable['sequence'] ? ' selected="selected" ' : '')
+ . ( $variabla2['seq'] > 0 && isset($variable['sequence']) && $variabla2['seq'] == $variable['sequence'] ? ' selected="selected" ' : '')
. '> '
. ( (int)$variable['sub'] == 0 ? '' : ( (int)$variable['sub'] == 1 ? '&nbsp;&nbsp;' : '&nbsp;&nbsp;&nbsp;&nbsp;' ))
. $variable['variableNaslov'] .'</option>';
}
echo '</select>';
+
if (count($this->variabla2) > 1) {
echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
- } else {
- echo '<span class="space_means_new">&nbsp;</span>';
- }
+ }
+
+ echo '</div>';
+ }
+
+ echo '</div>';
- $_br = '<br/><span class="space_means_new">&nbsp;</span>';
- echo '</span>';
+ // Gumb za dodajanje spremenljivke
+ if ((int)$this->variabla1['0']['seq'] > 0) {
+ echo '<button class="blue small" id="means_add_new" onclick="means_add_new_variable(\'2\');">'.$lang['srv_multicrosstabs_add'].'</button>';
}
}
echo '</div>';
- echo '<span id="meansSubSetting" class="floatLeft spaceLeft">';
- if (count($this->variabla2) > 1) {
- echo '<label><input id="chkMeansSeperate" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansSeperateTables']==true?' checked="checked"':'' ).'> '.$lang['srv_means_setting_1'].'</label>';
-
- echo '<br /><span id="spanMeansJoinPercentage"'.($this->sessionData['means']['meansSeperateTables']!=true?'':' class="displayNone"').'><label><input id="chkMeansJoinPercentage" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansJoinPercentage']==true?' checked="checked"':'' ).'> '.$lang['srv_means_setting_2'].'</label></span>';
- }
- echo '<br /><label><input id="showChart" type="checkbox" onchange="showTableChart(\'mean\');" '.($this->sessionData['mean_charts']['showChart']==true?' checked="checked"':'' ).'> '.$lang['srv_show_charts'].'</label>';
- echo '</span>';
+
+ echo '<div id="meansSubSetting">';
- echo '<br class="clr"/>';
+ echo '<span class="title">'.$lang['settings'].':</span>';
+
+ if (count($this->variabla2) > 1) {
+
+ echo '<div class="setting_line">';
+ echo ' <input id="chkMeansSeperate" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansSeperateTables']==true?' checked="checked"':'' ).'><label for="chkMeansSeperate">'.$lang['srv_means_setting_1'].'</label>';
+ echo '</div>';
+
+ echo '<div class="setting_line">';
+ echo ' <span id="spanMeansJoinPercentage"'.($this->sessionData['means']['meansSeperateTables']!=true?'':' class="displayNone"').'><input id="chkMeansJoinPercentage" type="checkbox" onchange="changeMeansSubSetting();" '.($this->sessionData['means']['meansJoinPercentage']==true?' checked="checked"':'' ).'><label for="chkMeansJoinPercentage">'.$lang['srv_means_setting_2'].'</label></span>';
+ echo '</div>';
+ }
+
+ echo '<div class="setting_line">';
+ echo ' <input id="showChart" type="checkbox" onchange="showTableChart(\'mean\');" '.((isset($this->sessionData['mean_charts']['showChart'])&&$this->sessionData['mean_charts']['showChart']==true)?' checked="checked"':'' ).'><label for="showChart">'.$lang['srv_show_charts'].'</label>';
+ echo '</div>';
+ echo '</div>';
+
// Ikone za izvoz (so tukaj da se refreshajo ob ajax klicu)
$this->displayExport();
}
@@ -360,7 +386,6 @@ class SurveyMeans{
global $lang;
global $admin_type;
- $br='';
$means = array();
# če ne uporabljamo privzetega časovnega profila izpišemo opozorilo
@@ -370,12 +395,13 @@ class SurveyMeans{
SurveyConditionProfiles:: getConditionString();
# če imamo filter spremenljivk ga izpišemo
- SurveyVariablesProfiles:: getProfileString($doNewLine , true);
+ SurveyVariablesProfiles:: getProfileString();
# če imamo rekodiranje
$SR = new SurveyRecoding($this->sid);
$SR -> getProfileString();
+
if ($this->getSelectedVariables(1) !== null && $this->getSelectedVariables(2) !== null) {
$variables1 = $this->getSelectedVariables(2);
$variables2 = $this->getSelectedVariables(1);
@@ -383,7 +409,7 @@ class SurveyMeans{
$c2=0;
# odvisno ok checkboxa prikazujemo druge variable v isti tabeli ali v svoji
- if ($this->sessionData['means']['meansSeperateTables'] == true ) {
+ if (isset($this->sessionData['means']['meansSeperateTables'])&&$this->sessionData['means']['meansSeperateTables'] == true ) {
#prikazujemo ločeno
if (is_array($variables2) && count($variables2) > 0) {
foreach ($variables2 AS $v_second) {
@@ -420,21 +446,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='<br />';
- // Zvezdica za vkljucitev v porocilo
+ echo '<div class="means_table_holder">';
+
+ // 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);
+ if(isset($this->sessionData['mean_charts']['showChart']) && $this->sessionData['mean_charts']['showChart'] && (!isset($_GET['m'])||$_GET['m'] != 'analysis_creport')){
+ $tableChart = new SurveyTableChart($this->sid, $this, 'mean', $counter);
$tableChart->display();
}
+
+ echo '</div>';
$counter++;
}
@@ -469,14 +499,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 '<script>';
+
+
+ echo '<script>';
+
# nastavimopravilne linke
echo '$("#secondNavigation_links a#meansDoPdf").attr("href", "'.$href_pdf.'");';
echo '$("#secondNavigation_links a#meansDoRtf").attr("href", "'.$href_rtf.'");';
echo '$("#secondNavigation_links a#meansDoXls").attr("href", "'.$href_xls.'");';
+
# prikažemo linke
echo '$("#hover_export_icon").removeClass("hidden");';
echo '$("#secondNavigation_links a").removeClass("hidden");';
+
echo '</script>';
}
}
@@ -563,14 +598,14 @@ class SurveyMeans{
$this->variablesList = array();
# zloopamo skozi header in dodamo variable (potrebujemo posamezne sekvence)
foreach ($this->_HEADERS AS $skey => $spremenljivka) {
- if ((int)$spremenljivka['hide_system'] == 1 && in_array($spremenljivka['variable'],array('email','ime','priimek','telefon','naziv','drugo'))) {
+ if (isset($spremenljivka['hide_system'])&&(int)$spremenljivka['hide_system'] == 1 && in_array($spremenljivka['variable'],array('email','ime','priimek','telefon','naziv','drugo'))) {
continue;
}
- $tip = $spremenljivka['tip'];
+ $tip = isset($spremenljivka['tip'])?$spremenljivka['tip']:null;
- $skala = (int)$spremenljivka['skala'];
+ $skala = isset($spremenljivka['skala'])?(int)$spremenljivka['skala']:0;
# pri drugi, analizirani variabli morajo biti numerične ali ordinalne, v ostalem pa nič)
# skala - 0 Ordinalna
# skala - 1 Nominalna
@@ -669,7 +704,7 @@ class SurveyMeans{
# imamo multicheckbox
foreach($spremenljivka['grids'] AS $gid => $grid) {
$sub = 0;
- if ($grid['variable'] != '') {
+ if (isset($grid['variable'])&&$grid['variable'] != '') {
$sub++;
$this->variablesList[$dropdown][] = array(
'tip'=>$tip,
@@ -685,7 +720,7 @@ class SurveyMeans{
# imamo več gridov - tabele
foreach($spremenljivka['grids'] AS $gid => $grid) {
$sub = 0;
- if ($grid['variable'] != '') {
+ if (isset($grid['variable'])&&$grid['variable'] != '') {
$sub++;
$this->variablesList[$dropdown][] = array(
'tip'=>$tip,
@@ -770,11 +805,11 @@ class SurveyMeans{
if ($this->dataFileName != '' && file_exists($this->dataFileName)) {
- $spr1 = $this->_HEADERS[$v_first['spr']];
- $spr2 = $this->_HEADERS[$v_second['spr']];
+ $spr1 = isset($this->_HEADERS[$v_first['spr']])?$this->_HEADERS[$v_first['spr']]:null;
+ $spr2 = isset($this->_HEADERS[$v_second['spr']])?$this->_HEADERS[$v_second['spr']]:null;
- $grid1 = $spr1['grids'][$v_first['grd']];
- $grid2 = $spr2['grids'][$v_second['grd']];
+ $grid1 = isset($spr1['grids'][$v_first['grd']])?$spr1['grids'][$v_first['grd']]:array();
+ $grid2 = isset($spr2['grids'][$v_second['grd']])?$spr2['grids'][$v_second['grd']]:array();
$sequence1 = $v_first['seq'];
$sequence2 = $v_second['seq'];
@@ -785,7 +820,7 @@ class SurveyMeans{
$spr_1_checkbox = false;
$spr_2_checkbox = false;
- if ($spr1['tip'] == 2 || $spr1['tip'] == 16) {
+ if (isset($spr1['tip']) && ($spr1['tip'] == 2 || $spr1['tip'] == 16)) {
$spr_1_checkbox = true;
if ($spr1['tip'] == 2) {
$sekvences1 = explode('_',$spr1['sequences']);
@@ -800,10 +835,10 @@ class SurveyMeans{
$sekvences1[] = $sequence1;
}
- if ($spr2['tip'] == 2 || $spr2['tip'] == 16) {
+ if (isset($spr1['tip']) && ($spr2['tip'] == 2 || $spr2['tip'] == 16)) {
$spr_2_checkbox = true;
if ($spr2['tip'] == 2 ) {
- $sekvences2 = explode('_',$this->_HEADERS[$v_second['spr']]['sequences']);
+ if(isset($this->_HEADERS[$v_second['spr']]['sequences'])) $sekvences2 = explode('_',$this->_HEADERS[$v_second['spr']]['sequences']);
}
if ($spr2['tip'] == 16) {
foreach ($grid2['variables'] AS $_variables) {
@@ -817,17 +852,17 @@ class SurveyMeans{
# pogoji so že dodani v _CURRENT_STATUS_FILTER
# dodamo filter za loop-e
- if (isset($this->_CURRENT_LOOP['filter']) && $this->_CURRENT_LOOP['filter'] != '') {
+ /* if (isset($this->_CURRENT_LOOP['filter']) && $this->_CURRENT_LOOP['filter'] != '') {
$status_filter = $this->_CURRENT_STATUS_FILTER.' && '.$this->_CURRENT_LOOP['filter'];
- } else {
+ } else { */
$status_filter = $this->_CURRENT_STATUS_FILTER;
- }
+ //}
# dodamo status filter za vse sekvence checkbox-a da so == 1
- if ($additional_status_filter != null) {
+ /* if ($additional_status_filter != null) {
$status_filter .= $additional_status_filter;
- }
+ }*/
# odstranimo vse zapise, kjer katerakoli od variabel vsebuje missing
$_allMissing_answers = SurveyMissingValues::GetMissingValuesForSurvey(array(1,2,3));
@@ -836,7 +871,7 @@ class SurveyMeans{
$tmp_file = $folder.'tmp_means_'.$this->sid.'.tmp';
$file_handler = fopen($tmp_file,"w");
- fwrite($file_handler,"<?php\n");
+ fwrite($file_handler,"<?php\n\$meansArray=array();\n");
fclose($file_handler);
if (count($sekvences1)>0)
foreach ($sekvences1 AS $sequence1) {
@@ -917,6 +952,7 @@ class SurveyMeans{
}
}
}
+
# inicializacija
$_all_options = array();
$sumaVrstica = array();
@@ -924,7 +960,7 @@ class SurveyMeans{
$sumaMeans = 0;
# poiščemo pripadajočo spremenljivko
- $var_options = $this->_HEADERS[$v_second['spr']]['options'];
+ $var_options = isset($this->_HEADERS[$v_second['spr']]['options'])?$this->_HEADERS[$v_second['spr']]['options']:array();
# najprej poiščemo (združimo) vse opcije ki so definirane kot opcije spremenljivke in vse ki so v meansih
@@ -953,7 +989,7 @@ class SurveyMeans{
# missingov ne dodajamo še zdaj, da ohranimo pravilen vrstni red
foreach ($_var1 AS $_kvar2=>$_var2) {
if (!isset($_allMissing_answers[$_kvar1]) || (isset($_allMissing_answers[$_kvar1]) && isset($_pageMissing_answers[$_kvar1]))) {
- $sumaVrstica[$_kvar1] += $_var2;
+ $sumaVrstica[$_kvar1] = isset($sumaVrstica[$_kvar1])?$sumaVrstica[$_kvar1] += $_var2 : $_var2;
}
}
# missingov ne dodajamo še zdaj, da ohranimo pravilen vrstni red
@@ -1042,7 +1078,6 @@ class SurveyMeans{
}
}
-
$meansArr['v1'] = $v_first; # prva variabla
$meansArr['v2'] = $v_second; # druga variabla
@@ -1066,75 +1101,72 @@ class SurveyMeans{
# ali prikazujemo vrednosti variable pri spremenljivkah
$show_variables_values = $this->doValues;
- $showSingleUnits = $this->sessionData['means']['meansJoinPercentage']==true && $this->sessionData['means']['meansSeperateTables'] == false;
+ $showSingleUnits = isset($this->sessionData['means']['meansJoinPercentage'])&&$this->sessionData['means']['meansJoinPercentage']==true && $this->sessionData['means']['meansSeperateTables'] == false;
+
# izrišemo tabelo
- echo '<table class="anl_tbl_crosstab fullWidth" style="margin-top:10px;">';
- echo '<colgroup>';
- echo '<col style="width:auto; min-width:30px;" />';
- echo '<col style="width:auto; min-width:30px; " />';
- for ($i = 0; $i < $cols; $i++) {
- echo '<col style="width:auto; min-width:30px;" />';
- if ($showSingleUnits == false) {
- echo '<col style="width:auto; min-width:30px;" />';
- }
- }
- if ($showSingleUnits == true) {
- echo '<col style="width:auto; min-width:30px;" />';
- }
- echo '</colgroup>';
+ echo '<table class="table_means">';
+
+
+ echo '<tr class="row1">';
- echo '<tr>';
- #echo '<td>xx&nbsp;</td>';
# ime variable
# teksti labele:
$label2 = $this->getSpremenljivkaTitle($_means[0]['v2']);
if ($showSingleUnits == false) {
$span = ' colspan="2"';
}
- echo '<td class="anl_bt anl_bl anl_ac rsdl_bck_title ctbCll" rowspan="2">';
+ echo '<td class="cell_question" rowspan="2">';
echo $label2;
echo '</td>';
for ($i = 0; $i < $cols; $i++) {
- echo '<td class="anl_bt anl_bl anl_br anl_ac rsdl_bck_title ctbCll"'.$span.'>';
+ echo '<td class="cell_question" '.$span.'>';
$label1 = $this->getSpremenljivkaTitle($_means[$i]['v1']);
echo $label1;
echo '</td>';
}
if ($showSingleUnits == true) {
- echo '<td class="anl_bl ">&nbsp;</td>';
+ echo '<td class="anl_bl">&nbsp;</td>';
}
echo '</tr>';
- echo '<tr>';
+
+
+ echo '<tr class="row2">';
for ($i = 0; $i < $cols; $i++) {
+
#Povprečje
- echo '<td class="anl_bt anl_bl anl_br anl_ac rsdl_bck_variable1 ctbCll" >';
+ echo '<td class="cell_value">';
echo $lang['srv_means_label'];
echo '</td>';
+
#enote
if ($showSingleUnits == false) {
- echo '<td class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">'.$lang['srv_means_label4'].'</td>';
+ echo '<td class="cell_value">'.$lang['srv_means_label4'].'</td>';
}
}
+
if ($showSingleUnits == true) {
- echo '<td class="anl_bl anl_bt anl_br anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">'.$lang['srv_means_label4'].'</td>';
+ echo '<td class="cell_value">'.$lang['srv_means_label4'].'</td>';
}
echo '</tr>';
+
if (count($_means[0]['options']) > 0) {
-
+ $max_units=0;
foreach ($_means[0]['options'] as $ckey2 =>$crossVariabla2) {
$units_per_row = 0;
+
echo '<tr>';
- echo '<td class="anl_bt anl_bl anl_ac rsdl_bck_variable1 ctbCll">';
+
+ echo '<td class="cell_question">';
echo $crossVariabla2['naslov'];
# če ni tekstovni odgovor dodamo key
if ($crossVariabla2['type'] !== 't' ) {
if ($show_variables_values == true) {
- if ($crossVariabla2['vr_id'] == null) {
+ if (!isset($crossVariabla2['vr_id'])||$crossVariabla2['vr_id'] == null) {
echo '&nbsp;( '.$ckey2.' )';
} else {
echo '&nbsp;( '.$crossVariabla2['vr_id'].' )';
@@ -1142,48 +1174,61 @@ class SurveyMeans{
}
}
echo '</td>';
+
# celice z vsebino
for ($i = 0; $i < $cols; $i++) {
- echo '<td class="ct_in_cell anl_br'.'" k1="'.$ckey1.'" k2="'.$ckey2.'" n1="'.$crossVariabla1['naslov'].'" n2="'.$crossVariabla2['naslov'].'" v1="'.$crossVariabla1['vr_id'].'" v2="'.$crossVariabla2['vr_id'].'">';
- echo $this->formatNumber($_means[$i]['result'][$ckey2], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'));
+ echo '<td class="cell_value" k1="'./* $ckey1. */'" k2="'.$ckey2.'" n1="'./* $crossVariabla1['naslov']. */'" n2="'.$crossVariabla2['naslov'].'" v1="'./* $crossVariabla1['vr_id']. */'" v2="'.(isset($crossVariabla2['vr_id'])?$crossVariabla2['vr_id']:'').'">';
+ echo $this->formatNumber(isset($_means[$i]['result'][$ckey2])?$_means[$i]['result'][$ckey2]:null, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'));
echo '</td>';
+
if ($showSingleUnits == false) {
- echo '<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">';
- echo (int)$_means[$i]['sumaVrstica'][$ckey2];
+ echo '<td class="cell_value">';
+ echo (isset($_means[$i]['sumaVrstica'][$ckey2])?(int)$_means[$i]['sumaVrstica'][$ckey2]:0);
echo '</td>';
- } else {
- $units_per_row = max($units_per_row,(int)$_means[$i]['sumaVrstica'][$ckey2]);
+ }
+ else {
+ $units_per_row = max($units_per_row,(isset($_means[$i]['sumaVrstica'][$ckey2])?(int)$_means[$i]['sumaVrstica'][$ckey2]:0));
}
}
+
if ($showSingleUnits == true) {
- echo '<td class="anl_ac anl_bl anl_bt anl_br rsdl_bck0 crostabSuma">';
+ echo '<td class="cell_value">';
echo $units_per_row;
echo '</tr>';
}
+
echo '</tr>';
+
$max_units += $units_per_row;
}
}
+
+
echo '<tr>';
- echo '<td class="anl_bb anl_bt anl_bl anl_ac red anl_ita anl_bck_text_0 rsdl_bck_variable1 ctbCll">'.$lang['srv_means_label3'].'</td>';
+
+ echo '<td class="cell_value">'.$lang['srv_means_label3'].'</td>';
+
for ($i = 0; $i < $cols; $i++) {
- echo '<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">';
+ echo '<td class="cell_value">';
echo $this->formatNumber($_means[$i]['sumaMeans'], SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_RESIDUAL'));
echo '</td>';
+
if ($showSingleUnits == false) {
- echo '<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">';
+ echo '<td class="cell_value">';
echo (int)$_means[$i]['sumaSkupna'];
echo '</td>';
}
}
+
if ($showSingleUnits == true) {
- echo '<td class="anl_ac anl_bt anl_bl anl_br anl_bb rsdl_bck0 crostabSuma">';
+ echo '<td class="cell_value">';
echo $max_units;
- echo '</tr>';
+ echo '</td>';
}
echo '</tr>';
+
echo '</table>';
}
@@ -1230,20 +1275,20 @@ class SurveyMeans{
$which = $_POST['which'];
$variables = $this->getVariableList($which);
$multiple = true;
-
-
+
+
if ($which == '1') {
- echo '<br/>';
- echo '<span class="space_means_new">&nbsp;</span>';
- echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" onchange="change_means(); return false;" autocomplete="off"'
- .'>';
- # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
- if ( $variabla1['seq'] == null || $variabla1['seq'] == 0 ) {
+ echo '<div class="variabla_line">';
+
+ echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" class="dropdown large" onchange="change_means(); return false;" autocomplete="off">';
+
+ # ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
+ if ( !isset($this->variabla1['seq'])||$this->variabla1['seq'] == null || $this->variabla1['seq'] == 0 ) {
echo '<option value="0" selected="selected" >'. $lang['srv_analiza_crosstab_izberi_more'].'</option>';
}
foreach ($variables as $variable) {
- echo '<option value="'.$variable['sequence'].'" spr_id="'.$variable['spr_id'].'" '
+ echo '<option value="'.(isset($variable['sequence'])?$variable['sequence']:'').'" spr_id="'.(isset($variable['spr_id'])?$variable['spr_id']:'').'" '
. ( isset($variable['grd_id']) ? ' grd_id="'.$variable['grd_id'].'" ' : '')
. (( (int)$variable['canChoose'] == 1) ? '' : ' disabled="disabled" ')
. '> '
@@ -1251,20 +1296,23 @@ class SurveyMeans{
. $variable['variableNaslov'] . '</option>';
}
+
echo '</select>';
- echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
-
- } else {
- # which = 2
- echo '<br/>';
- echo '<span class="space_means_new">&nbsp;</span>';
- echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" onchange="change_means(); return false;" autocomplete="off"'
- .'>';
+
+ echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle" title=""></span></span>';
+
+ echo '</div>';
+ }
+ else {
+ echo '<div class="variabla_line">';
+
+ echo '<select name="means_variable_'.$which.'" id="means_variable_'.$which.'" class="dropdown large" onchange="change_means(); return false;" autocomplete="off">';
# ce prva variabla ni izbrana, dodamo tekst za izbiro prve variable
if ((int)$this->variabla1['0']['seq'] > 0) {
echo '<option value="0" selected="selected" >'. $lang['srv_analiza_crosstab_najprej_prvo'].'</option>';
- } else {
+ }
+ else {
# če druga variabla ni izbrana dodamo tekst za izbiro druge variable
echo '<option value="0" selected="selected">'. $lang['srv_analiza_crosstab_izberi_more'].'</option>';
}
@@ -1279,7 +1327,10 @@ class SurveyMeans{
}
echo '</select>';
- echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle icon-orange_link" title=""></span></span>';
+
+ echo '<span class="pointer" id="means_remove" onclick="means_remove_variable(this);"><span class="faicon delete_circle" title=""></span></span>';
+
+ echo '</div>';
}
}
@@ -1291,7 +1342,7 @@ class SurveyMeans{
$sekvenca = $v_first['seq'];
$spremenljivka = $this->_HEADERS[$spremenljivka_id];
- $grid = $spremenljivka['grids'][$grid_id];
+ $grid = isset($spremenljivka['grids'][$grid_id])?$spremenljivka['grids'][$grid_id]:array();
# za multicheckboxe popravimo naslov, na podtip
@@ -1303,9 +1354,9 @@ class SurveyMeans{
$labela .= '<span class="anl_variabla">';
$labela .= '<a href="/" title="'.$lang['srv_predogled_spremenljivka'].'" onclick="showspremenljivkaSingleVarPopup(\''.$spremenljivka_id.'\'); return false;">';
$labela .= strip_tags($spremenljivka['naslov']);
- if ($show_variables_values == true) {
+ /* if ($show_variables_values == true) {
$labela .= '&nbsp;('.strip_tags($spremenljivka['variable']).')';
- }
+ } */
$labela .= '</a>';
$labela .= '</span>';
@@ -1313,14 +1364,17 @@ class SurveyMeans{
if (strip_tags($grid['naslov']) != $lang['srv_new_text']) {
$labela .= '<br/>'.strip_tags($grid['naslov']);
}
+
$labela .= '&nbsp;('.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 .= '<br/>'.strip_tags($variable['naslov']);
}
- if ($show_variables_values == true) {
+
+ /* if ($show_variables_values == true) {
$labela .= '&nbsp;('.strip_tags($variable['variable']).')';
- }
+ } */
}
}
@@ -1331,9 +1385,9 @@ class SurveyMeans{
$labela = '<span class="anl_variabla">';
$labela .= '<a href="/" title="'.$lang['srv_predogled_spremenljivka'].'" onclick="showspremenljivkaSingleVarPopup(\''.$spremenljivka_id.'\'); return false;">';
$labela .= strip_tags($spremenljivka['naslov']);
- if ($show_variables_values == true) {
+ /* if ($show_variables_values == true) {
$labela .= '&nbsp;('.strip_tags($spremenljivka['variable']).')';
- }
+ } */
$labela .= '</a>';
$labela .= '</span>'.NEW_LINE;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 17:40:21 +0200