diff --git a/admin/survey/classes/class.SurveyStatistic.php b/admin/survey/classes/class.SurveyStatistic.php index 71fc59805..63adaa268 100644 --- a/admin/survey/classes/class.SurveyStatistic.php +++ b/admin/survey/classes/class.SurveyStatistic.php @@ -727,34 +727,39 @@ class SurveyStatistic { $_sql_string = "SELECT DATE_FORMAT(dashboard_update_time,'%d.%m.%Y %H:%i:%s') FROM srv_data_files WHERE sid = '".$this->surveyId."'"; $_sql_qry = sisplet_query($_sql_string); list($dashboard_update_time) = mysqli_fetch_row($_sql_qry); - echo ''.$lang['srv_dashboard_updated'].$dashboard_update_time.''; - - #preberemo podatke o datoteki - echo $SDF->getDataFileInfo(); - + + echo '
';
- echo ' '."\n";
- $this -> DisplayInfoView();
+ echo ' ';
+ $this->DisplayInfoView();
echo ' ';
- echo ' | ';
- echo '
';
- echo ' '."\n";
- $this -> DisplayInfoView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' '."\n";
- $this -> DisplayStatusView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' '."\n";
- $this -> DisplayAnswerStateView();
- echo ' ';
- echo ' | ';
- echo '
';
- echo ' ';
- $this -> DisplayReferalsView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' ';
- echo ''.$lang['srv_statistic_timeline_title'].''.Help :: display('srv_statistic_timeline_title');
- $this -> DisplayFilters();
- echo ' ';
- echo ''; - echo ' '."\n";
- $this -> DisplayDateView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' ';
- $this -> DisplayPagesStateView();
- echo ' ';
- echo ' | ';
- echo '
'; + echo ' | ||||
'; echo $lang['srv_info_name'].':'; echo ' | '; echo htmlentities(SurveyInfo::getSurveyTitle(), ENT_QUOTES, "UTF-8"); echo ' | '; echo '|||
'; echo $lang['srv_info_note'].':'; @@ -944,7 +934,8 @@ class SurveyStatistic { echo ' | '; echo $lang['srv_vrsta_survey_type_'.(SurveyInfo::getSurveyType()>2 ? 2 : SurveyInfo::getSurveyType())] . ($enabled_advanced != null ? ' ('.$enabled_advanced.')' : '' ); echo ' | |||
'; echo $lang['srv_info_questions']. ':'; echo ' | '; @@ -954,13 +945,15 @@ class SurveyStatistic { echo ' | '; echo SurveyInfo::getSurveyVariableCount(); echo ' | ||
'; echo $lang['srv_info_pages']. ':'; echo ' | '; echo SurveyInfo::getSurveyGroupCount(); echo ' | |||
'; echo $lang['srv_analiza_stUporabnikov']. ':'; echo ' | '; @@ -970,13 +963,15 @@ class SurveyStatistic { echo ' | '; echo SurveyInfo::getSurveyApropriateAnswersCount(); echo ' | ||
'; echo $lang['srv_info_language']. ':'; echo ' | '; echo SurveyInfo::getRespondentLanguage(); echo ' | |||
'; echo $lang['srv_info_creator']. ':'; echo ' | '; @@ -986,7 +981,8 @@ class SurveyStatistic { if (SurveyInfo::getSurveyInsertTime() && SurveyInfo::getSurveyInsertTime() != "00:00:00") echo SurveyInfo::getDateTimeSeperator() . $this->dateFormat(SurveyInfo::getSurveyInsertTime(),TIME_FORMAT_SHORT); echo ' | |||
'; echo $lang['srv_info_modify']. ':'; echo ' | '; @@ -1012,26 +1008,29 @@ class SurveyStatistic { echo ' | |||
'; echo $lang['srv_displaydata_status']. ':'; echo ' | '; if (SurveyInfo::getSurveyColumn('active') == 1) { - echo ''.$lang['srv_anketa_active2'].''; - } else { + echo ''.$lang['srv_anketa_active2'].''; + } + else { # preverimo ali je bila anketa že aktivirana if (!isset($_last_active['starts'])) { # anketa še sploh ni bila aktivirana - echo ''.$lang['srv_survey_non_active_notActivated'].''; - } else { + echo ''.$lang['srv_survey_non_active_notActivated'].''; + } + else { # anketa je že bila aktivirna ampak je sedaj neaktivna - echo ''.$lang['srv_survey_non_active'].''; + echo ''.$lang['srv_survey_non_active'].''; } } - echo ' | |||
'; @@ -1050,7 +1049,6 @@ class SurveyStatistic { echo ' | ||||
'; echo $lang['srv_info_first_entry']. ':'; - echo ' | '; + echo ' | '; echo $this->dateFormat($prvi_vnos_date,DATE_FORMAT_SHORT); echo $prvi_vnos_time != null ? (SurveyInfo::$dateTimeSeperator .$this->dateFormat($prvi_vnos_time,TIME_FORMAT_SHORT)) : ''; - echo ' | '; + echo ''; + echo ' | |
'; echo $lang['srv_info_last_entry']. ':'; - echo ' | '; + echo ' | '; echo $this->dateFormat($zadnji_vnos_date,DATE_FORMAT_SHORT); echo $zadnji_vnos_time != null ? (SurveyInfo::$dateTimeSeperator .$this->dateFormat($zadnji_vnos_time,TIME_FORMAT_SHORT)) : ''; echo' | ||
'; - echo $lang['srv_stat_edit'] . ':'; - echo ' | '; - echo '' . $lang['srv_stat_edit_survey'] . ','; - echo ' '.$lang['comments'].''; - echo ' |
'.$lang['srv_statistic_metric'].' | '; + echo ''.$lang['srv_statistic_answer_state_frequency'].' | '; + echo '
'. $lang['srv_userstatus_'.$status] . ' ('.$status.') | '; + echo ''. $this->userByStatus['valid'][$status].' | '; + echo '
'.$lang['srv_statistic_redirection_sum_valid'].' | '; + echo ''.($this->cntUserByStatus['valid']).' | '; + echo '
' . $lang['srv_userstatus_'.$status] . ' ('.$status.') | '; + echo '' . $this->userByStatus['nonvalid'][$status] + . ( ( $index <= 2 && $this->userByStatus['valid'][$status] > 0 ) + ? ' '.$lang['srv_statistic_detail'].'' + : '').' | '; + + echo '
'.$lang['srv_statistic_redirection_sum_nonvalid'].' | '; + echo ''.($this->cntUserByStatus['nonvalid']).' | '; + echo '
'.$lang['srv_statistic_redirection_sum_view'].' | '; + echo ''.($view_count).' | '; + echo '
'.$lang['srv_statistic_redirection_sum_surveyed'].' | '; + echo ''.($this->cntUserByStatus['valid']+$this->cntUserByStatus['nonvalid']).' | '; + echo '
('.$lang['srv_statistic_redirection_test'].') | '; + echo ''.((int)$this->testDataCount).' | '; + echo ''.$lang['srv_statistic_nonsurveyed_title'].' | '; + echo '
'.$lang['srv_statistic_email_status_'.$status].' ('.$status.') | '; + echo ''.$this->userByStatus['invitation'][$status].' | '; + echo '
'.$lang['srv_statistic_sum2'].' | '; + echo ''.($this->cntUserByStatus['invitation']).' | '; + echo '
'.$lang['srv_statistic_sum_all'].' | '; + echo ''.($this->cntUserByStatus['valid']+$this->cntUserByStatus['nonvalid']+$this->cntUserByStatus['invitation']).' | '; + echo '
'.$lang['srv_statistic_answer_state_status'].' | '.$lang['srv_statistic_answer_state_frequency'].' | '.$lang['srv_statistic_answer_state_percent'].' |
---|
'.$lang['srv_statistic_answer_state_status'].' | '; + echo ''.$lang['srv_statistic_answer_state_frequency'].' | '; + echo ''.$lang['srv_statistic_answer_state_percent'].' | '; + echo '
'.$lang['srv_userstatus_'.$key].' | '; + + echo '||
---|---|---|
'.$lang['srv_userstatus_'.$key].' | '; + #frekvenca echo ''.($this->realUsersByStatus[$key]['cnt'] > 0 ? $this->realUsersByStatus[$key]['cnt'] : '0').' | '; - #procenti - ; + + #procenti echo ''; - #echo ( (float)$this->realUsersByStatus[$key]['percent'] > 1.0) echo ( $base_found == false) ? '--' : $this->formatNumber($this->realUsersByStatus[$key]['percent']*100,NUM_DIGIT_PERCENT,'%'); echo ' | '; - echo '
'.$lang['srv_statistic_answer_state_usability'].' ('.$sur->bottom_usable_limit.'%/'.$sur->top_usable_limit.'%) | './*$lang['srv_statistic_answer_state_frequency'].*/' | './*$lang['srv_statistic_answer_state_percent'].*/' | |
---|---|---|---|
'.$lang['srv_usableResp_usable_unit'].' | '; + echo '|||
'.$lang['srv_statistic_answer_state_usability'].' ('.$sur->bottom_usable_limit.'%/'.$sur->top_usable_limit.'%) | '; + echo ''; + echo ' | ||
'.$lang['srv_usableResp_usable_unit'].' | '; echo ''.$usability['usable'].' | '; if($usability['all'] > 0) echo ''.$this->formatNumber($usability['usable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').' | '; @@ -1223,7 +1366,8 @@ class SurveyStatistic { echo ''.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').' | '; echo '
'.$lang['srv_usableResp_partusable_unit'].' | '; + echo '|||
'.$lang['srv_usableResp_partusable_unit'].' | '; echo ''.$usability['partusable'].' | '; if($usability['all'] > 0) echo ''.$this->formatNumber($usability['partusable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').' | '; @@ -1231,7 +1375,7 @@ class SurveyStatistic { echo ''.$this->formatNumber(0, NUM_DIGIT_PERCENT, '%').' | '; echo '
'.$lang['srv_usableResp_unusable_unit'].' | '; + echo '|||
'.$lang['srv_usableResp_unusable_unit'].' | '; echo ''.$usability['unusable'].' | '; if($usability['all'] > 0) echo ''.$this->formatNumber($usability['unusable']/$usability['all']*100, NUM_DIGIT_PERCENT, '%').' | '; @@ -1240,10 +1384,9 @@ class SurveyStatistic { echo '
'.$lang['srv_statistic_answer_state_breakoff'].' | './*$lang['srv_statistic_answer_state_frequency'].*/' | './*$lang['srv_statistic_answer_state_percent'].*/' |
---|---|---|
'.$lang['srv_statistic_answer_state_breakoff'].' | '; + echo ''; + echo ' | |
'.$lang['srv_statistic_answer_state_breakoff_1'].' | '; + echo '||
'.$lang['srv_statistic_answer_state_breakoff_1'].' | '; echo ''.$introBreakoff.' | '; echo ''.$this->formatNumber($introBreakoffPercent*100, NUM_DIGIT_PERCENT, '%').' | '; echo '
'.$lang['srv_statistic_answer_state_breakoff_2'].' | '; + echo '||
'.$lang['srv_statistic_answer_state_breakoff_2'].' | '; echo ''.$qBreakoff.' | '; echo ''.$this->formatNumber($qBreakoffPercent*100, NUM_DIGIT_PERCENT, '%').' (neto '.$this->formatNumber($qBreakoffNeto*100, NUM_DIGIT_PERCENT, '%').') | '; echo '
'.$lang['srv_statistic_answer_state_breakoff_3'].' | '; + echo '||
'.$lang['srv_statistic_answer_state_breakoff_3'].' | '; echo ''.$totalBreakoff.' | '; echo ''.$this->formatNumber($totalBreakoffPercent*100, NUM_DIGIT_PERCENT, '%').' | '; echo '
' . $lang['srv_statistic_redirection_site'] . ' | '."\n"; - echo ''.$lang['srv_statistic_redirection_click'].' | '."\n"; - echo '
---|
'.$lang['srv_statistic_redirection_site'].' | '; + echo ''.$lang['srv_statistic_redirection_click'].' | '; + echo '
' . $lang['srv_statistic_redirection_email'] . ' | '."\n"; + echo '|
---|---|
' . $lang['srv_statistic_redirection_email'] . ' | '; + $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $key . ' | '."\n"; + echo '|
' . $key . ' | '; + $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_statistic_redirection_direct'] . ' | '."\n"; + + echo '|
' . $lang['srv_statistic_redirection_direct'] . ' | '; + $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_statistic_redirection_email'] . ' | '."\n"; + + echo '|
' . $lang['srv_statistic_redirection_email'] . ' | '; + $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_statistic_redirection_sum_clicked'] . ' | '."\n"; - echo ''.$value_sum.' | '."\n"; - echo '
'."\n"; - echo ' | |
'.$lang['srv_statistic_redirection_sum_clicked'].' | '; + echo ''.$value_sum.' | '; + echo '
'; + echo ' | |
' . $lang['srv_statistic_redirection_email_'.$key] . ' | '."\n"; - $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_statistic_redirection_sum_nonvalid'] . ' | '."\n"; - echo ''.$value_sum_nonvalid.' | '."\n"; - echo '
'."\n"; - echo ' | |
' . $lang['srv_statistic_redirection_sum'] . ' | '."\n"; - echo ''.($value_sum+$value_sum_nonvalid).' | '."\n"; - echo '
' . $lang['srv_statistic_redirection_sum'] . ' | '; + echo ''.($value_sum+$value_sum_nonvalid).' | '; + echo '
'.$lang['srv_count_ip_list'].': '.count($this->ip_list).'
'.$lang['srv_detail_ip_list'].':
'.$lang['srv_statistic_detail'].'
'; -*/ + # skrita div aza podrobnosti echo ''; echo ''; @@ -1603,13 +1653,13 @@ class SurveyStatistic { /** Funkcija za prikaz klikov po straneh * */ - function DisplayPagesStateView() { + function DisplayPagesStateView() { global $lang; # ali lovimo samo strani ki niso bile preskočene $grupa_jump = "AND ug.preskocena = 0 "; - echo ''.$lang['srv_statistic_pages_state_title'].''.Help :: display('srv_statistic_pages_state_title'); + echo '' . $lang['srv_statistic_answer_state_status'] . ' | '."\n"; - echo ''.$lang['srv_statistic_redirection_click'].' | '."\n"; - echo '
---|
'.$lang['srv_statistic_answer_state_status'].' | '; + echo ''.$lang['srv_statistic_redirection_click'].' | '; + echo '
' . $lang['srv_userstatus_3'] . ' | '."\n"; + echo '|
---|---|
' . $lang['srv_userstatus_3'] . ' | '; $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_userstatus_4'] . ' | '."\n"; + echo '|
' . $lang['srv_userstatus_4'] . ' | '; $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_userstatus_5'] . ' | '."\n"; + echo '|
' . $lang['srv_userstatus_5'] . ' | '; $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang[''] . ' | '."\n"; - echo ''.$lang[' '].' | '."\n"; - echo '
'; + echo ' | '; + echo ' |
' . $page['naslov'] . ' | '."\n"; - echo '' . $lang['srv_stran'].' '.$page['vrstni_red']. ' | '."\n"; + echo '
' . $lang['srv_stran'].' '.$page['vrstni_red']. ' | '; $width = ($maxValue && $value) ? (round($value / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang[''] . ' | '."\n"; - echo ''.$lang[' '].' | '."\n"; - echo '
'; + echo ' | '; + echo ' |
' . $lang['srv_userstatus_6'] . ' | '."\n"; + echo '|
' . $lang['srv_userstatus_6'] . ' | '; $width = ($maxValue && $value6) ? (round($value6/ $maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_userstatus_6l'].'' . ' | '."\n"; + echo '|
' . $lang['srv_userstatus_6l'].'' . ' | '; $width = ($maxValue && $lurkerjev) ? (round($lurkerjev / $maxValue * 100, 0)) : "0"; - echo '|
' . $lang[''] . ' | '."\n"; - echo ''.$lang[' '].' | '."\n"; - echo '
'; + echo ' | '; + echo ' |
' . $lang['srv_userstatus_all'] . ' | '."\n"; + echo '|
' . $lang['srv_userstatus_all'] . ' | '; $width = ($maxValue && $valueall) ? (round($valueall / $maxValue * 100, 0)) : "0"; - echo '
' . $label . ' | '."\n"; + echo '|
' . $label . ' | '; + $width = ($this->maxValue && $value) ? (round($value / $this->maxValue * 100, 0)) : "0"; - echo '|
' . $lang['srv_statistic_redirection_sum'] . ' | '."\n"; - echo ''.$cnt.' | '."\n"; - echo '
---|---|
'.$lang['srv_statistic_redirection_sum'].' | '; + echo ''.$cnt.' | '; + echo ''.$lang['srv_no_data'].' | '."\n";
+ echo ''.$lang['srv_no_data'].' | ';
}
- echo '
';
- echo ' '."\n";
- $this -> DisplayInfoView();
- echo ' ';
- echo ' | ';
- echo '
';
- echo ' '."\n";
- $this -> DisplayInfoView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' '."\n";
- $this -> DisplayStatusView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' '."\n";
- $this -> DisplayAnswerStateView();
- echo ' ';
- echo ' | ';
- echo '
';
- echo ' ';
- $this -> DisplayReferalsView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' ';
- echo ''.$lang['srv_statistic_timeline_title'].''.Help :: display('srv_statistic_timeline_title');
- echo '';
- echo ' ';
- echo ''; - - echo ' '."\n";
- $this -> DisplayDateView();
- echo ' ';
- echo ' | ';
-
- echo '';
- echo ' ';
- $this -> DisplayPagesStateView();
- echo ' ';
- echo ' | ';
-
- echo '
'.$lang['srv_statistic_lang'].' | '.$lang['srv_statistic_answer_state_frequency'].' | '.$lang['srv_statistic_answer_state_percent'].' |
---|---|---|
'.$lang['srv_statistic_lang'].' | '; + echo ''.$lang['srv_statistic_answer_state_frequency'].' | '; + echo ''.$lang['srv_statistic_answer_state_percent'].' | '; + echo '
'.$lang_array[$key].' | '; + echo '||
'.$lang_array[$key].' | '; #frekvenca echo ''.(int)$cnt.' | '; #procenti @@ -2456,10 +2431,13 @@ class SurveyStatistic { echo ''; echo '|
'.$lang['srv_statistic_sum'].' | '; - #frekvenca + + echo '||
'.$lang['srv_statistic_sum'].' | '; + + #frekvenca echo ''.(int)$allCnt.' | '; - #procenti + + #procenti echo ''; $percent = 100; echo $this->formatNumber((int)$percent,NUM_DIGIT_PERCENT,'%'); @@ -2471,8 +2449,8 @@ class SurveyStatistic { echo ''; echo ' | '; echo '
'; + + echo ' | |||||
---|---|---|---|---|---|
'; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - - echo ''; - echo ' | '; + echo ''; + + echo ' | '; echo ''; echo ''; echo $spremenljivka['naslov']; @@ -798,60 +800,71 @@ class SurveyBreak echo ' - '.$doubleGridTitle['subtitle']; } echo ''; - echo ''; + echo ' | '; + echo '|||
'; + echo ' | '; echo $variable['naslov']; echo '('.$variable['variable'].')'; - echo ''; + echo ' | '; } } } + echo '||||
Povprečje'.$lang['']; - echo ' | '; - echo 'Št. enot'.$lang['']; - echo ' | '; + echo 'Povprečje | '; + echo 'Št. enot | '; } } } echo '||
'; + + echo ' | |||||
'; if ($forSpremenljivka['tip'] == 2) { echo $cbxLabel; - } else { + } + else { echo $forSpremenljivka['options'][$oKey]; } 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 ' | '; echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,''); echo ' | '; + # enote - echo ''; + echo ' | '; echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; echo ' | '; $totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']); @@ -861,39 +874,45 @@ class SurveyBreak } } } + echo '|
'; + + echo ' | '; echo 'Skupaj'; 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 ''; + echo ' | '; $totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0; echo $this->formatNumber($totalMean ,$this->num_digit_average,''); echo ' | '; + # enote - echo ''; + echo ' | '; echo (int)$totalFreq[$sequence]; echo ' | '; } - } } } echo '
'; + + echo ' | |||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
'; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - - echo ''; - echo ' | '; + echo ''; + + echo ' | '; echo ''; echo ''; echo $spremenljivka['naslov']; echo '('.$spremenljivka['variable'].')'; echo ''; echo ''; - echo ''; + echo ' | '; echo '|||||||||||||||||||||||||||||||||||||
'; + echo ' | '; echo $variable['naslov']; echo '('.$variable['variable'].')'; - echo ''; + echo ' | '; } } + echo '||||||||||||||||||||||||||||||||||||||
Povprečje'.$lang['']; - echo ' | '; - echo 'Št. enot'.$lang['']; - echo ' | '; + echo 'Povprečje | '; + echo 'Št. enot | '; } } + echo '||||||||||||||||||||||||||||||||||||
'; + echo ' | '; echo $forSpremenljivka['options'][$oKey]; 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 ' | '; echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,''); - #echo $this->formatNumber($means[$fkey][$sequence],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); echo ' | '; + # enote - echo ''; + echo ' | '; echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; - #echo (int)$frequencys[$fkey][$sequence]['validCnt']; 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']; } @@ -1083,12 +1104,14 @@ class SurveyBreak if ((int)$this->break_percent) { echo '||||||||||||||||||||||||||||||||||
'; - #echo (int)$frequencys[$fkey][$sequence]['validCnt']; + + echo ' | '; $percent = 0; if ($frequencys[$fkey][$sequence]['validCnt'] > 0 ) { $percent = 100; @@ -1110,21 +1133,24 @@ class SurveyBreak #dodamo še skupno sumo in povprečje echo ' | ||||||||||||||||||||||||||||||||||||||
'; - echo $lang[''].'Skupaj'; + echo ' | '; + echo 'Skupaj'; echo ' | '; + foreach ($spremenljivka['grids'] AS $gkey => $grid) { foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + echo ' | '; $totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0; echo $this->formatNumber($totalMean ,$this->num_digit_average,''); echo ' | '; + # enote - echo ''; + echo ' | '; echo (int)$totalFreq[$sequence]; echo ' | '; } @@ -1144,7 +1170,6 @@ class SurveyBreak $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 @@ -1178,21 +1203,22 @@ class SurveyBreak echo ''; - echo '
'; + echo ' | '; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - echo ''; + echo ' | '; - echo ''; + echo ' | '; echo ''; echo ''; echo $spremenljivka['naslov']. ' - '; @@ -1200,30 +1226,28 @@ class SurveyBreak echo '('.$grid['variable'].')'; echo ''; echo ''; - echo ''; + echo ' | '; echo'||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
'; + echo ' | '; echo $variable['naslov']; echo '('.$variable['variable'].')'; - echo ''; + echo ' | '; } echo '||||||||||||||
Povprečje'.$lang['']; - echo ' | '; - echo 'Št. enot'.$lang['']; - echo ' | '; + echo 'Povprečje | '; + echo 'Št. enot | '; } echo '||||||||||||
'; + + echo ' | |||||||||||||||
'; if ($forSpremenljivka['tip'] == 2) { echo $cbxLabel; - } else { + } + else { echo $forSpremenljivka['options'][$oKey]; } - #echo ' ('.$oKey.')'; echo ' | '; + foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; + #povprečje - echo ''; + echo ' | '; echo $this->formatNumber($means[$fkey][$oKey][$sequence],$this->num_digit_average,''); echo ' | '; + # enote - echo ''; + echo ' | '; echo (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; echo ' | '; + $totalMeans[$sequence] += ($means[$fkey][$oKey][$sequence]*(int)$frequencys[$fkey][$oKey][$sequence]['validCnt']); $totalFreq[$sequence]+= (int)$frequencys[$fkey][$oKey][$sequence]['validCnt']; @@ -1271,19 +1303,22 @@ class SurveyBreak #dodamo še skupno sumo in povprečje echo '|||||||||||
'; + echo ' | '; echo 'Skupaj'; echo ' | '; + foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; if ($variable['other'] != 1) { + #povprečja - echo ''; + echo ' | '; $totalMean = $totalFreq[$sequence] > 0 ? $totalMeans[$sequence] / $totalFreq[$sequence] : 0; echo $this->formatNumber($totalMean ,$this->num_digit_average,''); echo ' | '; + # enote - echo ''; + echo ' | '; echo (int)$totalFreq[$sequence]; echo ' | '; } @@ -1372,20 +1407,22 @@ class SurveyBreak echo ''; - echo '
'; + echo ' | |||
---|---|---|---|
'; echo ''; echo ''; echo $forSpremenljivka['naslov']; echo '('.$forSpremenljivka['variable'].')'; echo ''; echo ''; - echo ''; + echo ' | '; - echo ''; + echo ' | '; echo ''; echo ''; echo $spremenljivka['naslov']. ' - '; @@ -1393,37 +1430,49 @@ class SurveyBreak echo '('.$grid['variable'].')'; echo ''; echo ''; - echo ''; + echo ' | '; + echo'|
'; + echo ' | '; echo $variable['naslov']; echo '('.$variable['variable'].')'; echo '('.$variable['sequence'].')'; - echo ''; + echo ' | '; } + echo '||
'; + + echo ' | '; if ($forSpremenljivka['tip'] == 2) { echo $cbxLabel; - } else { + } + else { echo $forSpremenljivka['options'][$oKey]; } echo ' | '; + foreach ($grid['variables'] AS $vkey => $variable) { $sequence = $variable['sequence']; #povprečje - echo ''; + echo ' | '; if (count($texts[$forSequence][$oKey][$sequence]) > 0) { $cnt=1; $count = count($texts[$forSequence][$oKey][$sequence]); @@ -1435,11 +1484,9 @@ class SurveyBreak } } - - #echo $this->formatNumber($texts[$oKey][$sequence],$this->num_digit_average,''); - echo ' | '; - + echo ''; } + echo '