From 6948c83d76d8e845d0f553626236283f19ce1352 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 28 Jan 2022 12:41:43 +0100 Subject: [PATCH] Redesign - analize - dokoncane opisne in frekvence --- .../surveyAnalysis/class.SurveyAnalysis.php | 1211 +++++++++-------- admin/survey/script/script_analiza.js | 69 +- public/css/admin_new.css | 125 +- .../pages/survey_analysis/basic.scss | 151 +- .../pages/survey_analysis/icons.scss | 4 +- .../{custom_report.scss => page_break.scss} | 0 .../{charts.scss => page_charts.scss} | 0 .../{freq.scss => page_crosstab.scss} | 0 .../{sums.scss => page_custom_report.scss} | 0 .../pages/survey_analysis/page_desc.scss | 11 + .../pages/survey_analysis/page_freq.scss | 0 .../pages/survey_analysis/page_means.scss | 0 .../survey_analysis/page_multicrosstab.scss | 0 .../pages/survey_analysis/page_sums.scss | 0 .../pages/survey_analysis/page_ttest.scss | 0 .../survey_analysis/survey_analysis.scss | 15 +- 16 files changed, 902 insertions(+), 684 deletions(-) rename resources/sass/admin_new/pages/survey_analysis/{custom_report.scss => page_break.scss} (100%) rename resources/sass/admin_new/pages/survey_analysis/{charts.scss => page_charts.scss} (100%) rename resources/sass/admin_new/pages/survey_analysis/{freq.scss => page_crosstab.scss} (100%) rename resources/sass/admin_new/pages/survey_analysis/{sums.scss => page_custom_report.scss} (100%) create mode 100644 resources/sass/admin_new/pages/survey_analysis/page_desc.scss create mode 100644 resources/sass/admin_new/pages/survey_analysis/page_freq.scss create mode 100644 resources/sass/admin_new/pages/survey_analysis/page_means.scss create mode 100644 resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss create mode 100644 resources/sass/admin_new/pages/survey_analysis/page_sums.scss create mode 100644 resources/sass/admin_new/pages/survey_analysis/page_ttest.scss diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php index dc453e12c..0634229dc 100644 --- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php +++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php @@ -612,20 +612,20 @@ class SurveyAnalysis { echo ''; - echo ' '.''; - echo '' . $lang['srv_analiza_opisne_variable'] .''.''; - echo '' . $lang['srv_analiza_opisne_variable_text'] .''.''; + echo ' '.''; + echo '' . $lang['srv_analiza_opisne_variable'] .''.''; + echo '' . $lang['srv_analiza_opisne_variable_text'] .''.''; if (self::$_SHOW_LEGENDA) { - echo '' . $lang['srv_analiza_opisne_variable_type'] .''.''; - echo '' . $lang['srv_analiza_opisne_variable_expression'] .''.''; - echo '' . $lang['srv_analiza_opisne_variable_skala'] .''.''; + echo '' . $lang['srv_analiza_opisne_variable_type'] .''.''; + echo '' . $lang['srv_analiza_opisne_variable_expression'] .''.''; + echo '' . $lang['srv_analiza_opisne_variable_skala'] .''.''; } - echo '' . $lang['srv_analiza_opisne_m'] .''.''; - echo '' . $lang['srv_analiza_num_units'] .''.''; - echo '' . $lang['srv_analiza_opisne_povprecje_odstotek'] .''.''; - echo '' . $lang['srv_analiza_opisne_odklon'] .''.''; - echo '' . $lang['srv_analiza_opisne_min'] .''.''; - echo '' . $lang['srv_analiza_opisne_max'] .''.''; + echo '' . $lang['srv_analiza_opisne_m'] .''.''; + echo '' . $lang['srv_analiza_num_units'] .''.''; + echo '' . $lang['srv_analiza_opisne_povprecje_odstotek'] .''.''; + echo '' . $lang['srv_analiza_opisne_odklon'] .''.''; + echo '' . $lang['srv_analiza_opisne_min'] .''.''; + echo '' . $lang['srv_analiza_opisne_max'] .''.''; echo ''; @@ -728,13 +728,13 @@ class SurveyAnalysis { if ($variable['var_cnt'] == 0 && in_array($spremenljivka['tip'],array(16,19,20) ) ) { echo ''; - echo ' '; + echo ' '; - echo ''; + echo ''; echo $grid['variable']; echo ''; - echo ''; + echo ''; echo $grid['naslov']; echo ''; @@ -744,15 +744,15 @@ class SurveyAnalysis { echo ''; - echo ''; + echo ''; echo ' '; echo ''; - echo ''; + echo ''; echo $variable['variable']; echo ''; - echo ''; + echo ''; echo $variable['naslov']; echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : ''; echo ''; @@ -766,17 +766,17 @@ class SurveyAnalysis { $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.' '.''; - echo ''.$_tip.''; - echo '' .$_oblika. ''; + echo ''.' '.''; + echo ''.$_tip.''; + echo '' .$_oblika. ''; } #veljavno - echo ''.(int)$_desc['validCnt'].''; + echo ''.(int)$_desc['validCnt'].''; #ustrezno - echo ''.(int)$_desc['allCnt'].''; - echo ''; + echo ''.(int)$_desc['allCnt'].''; + echo ''; if ( isset($_desc['avg']) && (int)$objectSkala->getSkala() !== 1 ) { @@ -785,13 +785,13 @@ class SurveyAnalysis { echo self::formatNumber($_desc['avg']*100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),' %'); } echo ''; - echo ''; + echo ''; if (isset($_desc['div']) && (int)$objectSkala->getSkala() !== 1) { echo self::formatNumber($_desc['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); } echo ''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; echo ''; } @@ -816,15 +816,15 @@ class SurveyAnalysis { echo ''; - echo ''; + echo ''; self::showIcons($spid,$spremenljivka,'desc'); echo ''; - echo ''; + echo ''; self::showVariable($spid,$spremenljivka['variable']); echo ''; - echo ''; + echo ''; echo ($spremenljivka['naslov']) . ''; if (self::$_SHOW_LEGENDA) { @@ -835,32 +835,32 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.self::getSpremenljivkaLegenda($spremenljivka,'tip').''; - echo ''.(!$show_enota ? $_tip : ' ').''; - echo ''.(!$show_enota ? $_oblika : ' '). ''; + echo ''.self::getSpremenljivkaLegenda($spremenljivka,'tip').''; + echo ''.(!$show_enota ? $_tip : ' ').''; + echo ''.(!$show_enota ? $_oblika : ' '). ''; } #veljavno - echo ''.(!$show_enota ? (int)$_desc['validCnt'] : ' ') .''; + echo ''.(!$show_enota ? (int)$_desc['validCnt'] : ' ') .''; #ustrezno - echo ''.(!$show_enota ? (int)$_desc['allCnt'] : ' ').''; + echo ''.(!$show_enota ? (int)$_desc['allCnt'] : ' ').''; - echo ''; + echo ''; if (isset($_desc['avg']) && (int)$objectSkala->getSkala() !== 1) { echo self::formatNumber($_desc['avg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); } echo ''; - echo ''; + echo ''; if (isset($_desc['div']) && (int)$objectSkala->getSkala() !== 1) { echo self::formatNumber($_desc['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),''); } echo ''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').''; - echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; + echo ''.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').''; echo ''; } @@ -870,60 +870,68 @@ class SurveyAnalysis { */ static function displayFrequency($_spid = null) { global $site_path, $lang; + # preberemo header if (self::$headFileName !== null ) { + #preberemo HEADERS iz datoteke self::$_HEADERS = unserialize(file_get_contents(self::$headFileName)); - # odstranimo sistemske variable tipa email, ime, priimek, geslo - self::removeSystemVariables(); - - # polovimo frekvence - self::getFrequencys(); - $vars_count = count(self::$_FILTRED_VARIABLES); - $line_break = ''; - foreach (self::$_HEADERS AS $spid => $spremenljivka) { - # preverjamo ali je meta - if (($spremenljivka['tip'] != 'm' - && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES )) - && (!isset($_spid) || (isset($_spid) && $_spid == $spid))) { - # ali imamo sfiltrirano spremenljivko - if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) { - # prikazujemo v odvisnosti od kategorije spremenljivke - switch ($spremenljivka['tip']) { - case 1: # radio - prikjaže navpično - case 2: #checkbox če je dihotomna: - case 3: # dropdown - prikjaže navpično - case 6: # multigrid - case 4: # text - case 7:# variabla tipa »število« - case 8: # datum - case 16: #multicheckbox če je dihotomna: - case 17: #razvrščanje če je ordinalna - case 18: # vsota - case 19: # multitext - case 20: # multi number - case 21: # besedilo* - case 22: # kalkulacija - case 25: # kvota - case 26: # lokacija - self::frequencyVertical($spid); - break; - case 5: - # nagovor - self::sumNagovor($spid,'freq'); - break; - - } + # odstranimo sistemske variable tipa email, ime, priimek, geslo + self::removeSystemVariables(); + + # polovimo frekvence + self::getFrequencys(); - } + $vars_count = count(self::$_FILTRED_VARIABLES); + $line_break = ''; + + foreach (self::$_HEADERS AS $spid => $spremenljivka) { - } // end if $spremenljivka['tip'] != 'm' - } // end foreach self::$_HEADERS + # preverjamo ali je meta + if (($spremenljivka['tip'] != 'm' + && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES )) + && (!isset($_spid) || (isset($_spid) && $_spid == $spid))) { - // Izrisemo ikone na dnu - if ( (!isset($_spid) || $_spid == null) && (count(self::$_LOOPS) == 0 || self::$_CURRENT_LOOP['cnt'] == count(self::$_LOOPS)) && ($_GET['m'] != 'analysis_creport') ) - self::displayBottomSettings('freq'); + # ali imamo sfiltrirano spremenljivko + if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) { + + # prikazujemo v odvisnosti od kategorije spremenljivke + switch ($spremenljivka['tip']) { + + case 1: # radio - prikjaže navpično + case 2: #checkbox če je dihotomna: + case 3: # dropdown - prikjaže navpično + case 6: # multigrid + case 4: # text + case 7:# variabla tipa »število« + case 8: # datum + case 16: #multicheckbox če je dihotomna: + case 17: #razvrščanje če je ordinalna + case 18: # vsota + case 19: # multitext + case 20: # multi number + case 21: # besedilo* + case 22: # kalkulacija + case 25: # kvota + case 26: # lokacija + self::frequencyVertical($spid); + break; + + case 5: + # nagovor + self::sumNagovor($spid,'freq'); + break; + } + } + + } // end if $spremenljivka['tip'] != 'm' + + } // end foreach self::$_HEADERS + + // Izrisemo ikone na dnu + if ( (!isset($_spid) || $_spid == null) && (count(self::$_LOOPS) == 0 || self::$_CURRENT_LOOP['cnt'] == count(self::$_LOOPS)) && ($_GET['m'] != 'analysis_creport') ) + self::displayBottomSettings('freq'); } // end if else ($_headFileName == null) } @@ -990,22 +998,23 @@ class SurveyAnalysis { # koliko zapisov prikažemo naenkrat $num_show_records = self::getNumRecords(); echo '
'; - self::displaySpremenljivkaIcons($spid); + + self::displaySpremenljivkaIcons($spid); # tekst vprašanja - echo ''; + echo '
'; # naslovna vrstica echo ''; #variabla - echo ''; #odgovori - echo ''; #variabla - echo ''; #odgovori - echo ''; + echo ''; + if (self::$_SHOW_LEGENDA && $inline_legenda){ - echo ''; - echo ''; + echo ''; + echo ''; } - echo ''; - echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; + echo ''; } - echo ''; + echo ''; echo ''; // konec naslovne vrstice // zeleno vrstico prikažemo samo skupaj z legendo - if (self::$_SHOW_LEGENDA && $inline_legenda && in_array($spremenljivka['tip'],array(1,4,8)) ) { - $css_bck = 'anl_bck_0_0 '; - echo ''; - echo ''; - echo ''; + if (self::$_SHOW_LEGENDA && $inline_legenda && in_array($spremenljivka['tip'], array(1,4,8)) ) { - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + + echo ''; + echo ''; + + echo ''; + echo ''; + + echo ''; + echo ''; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ''; + echo ''; } - echo ''; + echo ''; + echo ''; } + + $_answersOther = array(); # dodamo opcijo kje izrisujemo legendo - $options=array('inline_legenda' => $inline_legenda, 'isTextAnswer' => false, 'isOtherAnswer' => false, 'num_show_records' => $num_show_records); + $options = array( + 'inline_legenda' => $inline_legenda, + 'isTextAnswer' => false, + 'isOtherAnswer' => false, + 'num_show_records' => $num_show_records + ); # izpišemo vlejavne odgovore $_current_grid = null; - if (count($spremenljivka['grids']) > 0) + if (count($spremenljivka['grids']) > 0){ + foreach ($spremenljivka['grids'] AS $gid => $grid) { - $_variables_count = count($grid['variables']); - - # indikator da smo na prvi variabli - $first_variable = true; - - # dodamo še kontrolo za prikaz mgridov in mcheckov za več kot 20 vrednosti - if ((!is_array($gidsCanShow) && !isset($gidsCanShow[$gid])) - || (is_array($gidsCanShow) && isset($gidsCanShow[$gid]) && $gidsCanShow[$gid]== true)) - # dodamo dodatne vrstice z albelami grida - if ($_variables_count > 0 ) - foreach ($grid['variables'] AS $vid => $variable ){ - $_sequence = $variable['sequence']; # id kolone z podatki - $only_valid += (int)self::$_FREQUENCYS[$_sequence]['validCnt']; + $_variables_count = count($grid['variables']); + + # indikator da smo na prvi variabli + $first_variable = true; + + # dodamo še kontrolo za prikaz mgridov in mcheckov za več kot 20 vrednosti + if ((!is_array($gidsCanShow) && !isset($gidsCanShow[$gid])) + || (is_array($gidsCanShow) && isset($gidsCanShow[$gid]) && $gidsCanShow[$gid]== true)){ - if (($variable['text'] != true && $variable['other'] != true) - || (in_array($spremenljivka['tip'],array(4,8,21,22,25,26,27)))){ - # dodamo ime podvariable - //if ($_variables_count > 1 && in_array($spremenljivka['tip'],array(2,6,7,16,17,18,19,20,21))) { - if ($inline_legenda) { - # ali rišemo dvojno črto med grupami - if ( $_current_grid != $gid && $_current_grid !== null && $spremenljivka['tip'] != 6&& $spremenljivka['tip'] != 16) { - $options['doubleTop'] = true; - } else { - $options['doubleTop'] = false; - } - if ($first_variable == true && $spremenljivka['tip'] == 16) { - if ($_current_grid !== null) { - $options['doubleTop'] = true; - } - self::outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$options); - $options['doubleTop'] = false; - } - $_current_grid = $gid; - self::outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$options); - } - $counter = 0; - $_kumulativa = 0; - - - #po potrebi posortiramo podatke - if ($spremenljivka['tip'] == 7 && is_array(self::$_FREQUENCYS[$_sequence]['valid'])) { - ksort(self::$_FREQUENCYS[$_sequence]['valid']); - } - //self::$_FREQUENCYS[$_sequence] - if (count(self::$_FREQUENCYS[$_sequence]['valid'])> 0 ) { - # tekstovne odgovore posortiramo kronološko - if ($spremenljivka['tip'] == 21 || $spremenljivka['tip'] == 4) { - $_valid_answers = self :: sortTextValidAnswers($spid,$variable,self::$_FREQUENCYS[$_sequence]['valid']); - } else { - $_valid_answers = self::$_FREQUENCYS[$_sequence]['valid']; - } - foreach ($_valid_answers AS $vkey => $vAnswer) { - if ($counter < $num_show_records) { - if ($vAnswer['cnt'] > 0 || true) { # izpisujemo samo tiste ki nisno 0 - if (in_array($spremenljivka['tip'],array(4,7,8,19,20,21,26,27))) { // text, number, datum, mtext, mnumber, text*, lokacija,heatmap - $options['isTextAnswer'] = true; - } else { - $options['isTextAnswer'] = false; - } - $counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,$options); - } - } - } - # izpišemo sumo veljavnih - $counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options); - } - if (count(self::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) { - foreach (self::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) { - if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0 - $counter = self::outputInvalidAnswerVertical($counter,$ikey,$iAnswer,$_sequence,$spid,$options); - } - } - # izpišemo sumo veljavnih - $counter = self::outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$options); - } - #izpišemo še skupno sumo - $counter = self::outputSumaVertical($counter,$_sequence,$spid,$options); - } else { - $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); - } - $first_variable = false; - } - } + # dodamo dodatne vrstice z albelami grida + if ($_variables_count > 0 ){ + foreach ($grid['variables'] AS $vid => $variable ){ + + $_sequence = $variable['sequence']; # id kolone z podatki + $only_valid += (int)self::$_FREQUENCYS[$_sequence]['validCnt']; + + if (($variable['text'] != true && $variable['other'] != true) + || (in_array($spremenljivka['tip'],array(4,8,21,22,25,26,27)))){ + + # dodamo ime podvariable + if ($inline_legenda) { + + # ali rišemo dvojno črto med grupami + if ( $_current_grid != $gid && $_current_grid !== null && $spremenljivka['tip'] != 6&& $spremenljivka['tip'] != 16) { + $options['doubleTop'] = true; + } + else { + $options['doubleTop'] = false; + } + + if ($first_variable == true && $spremenljivka['tip'] == 16) { + if ($_current_grid !== null) { + $options['doubleTop'] = true; + } + + self::outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$options); + $options['doubleTop'] = false; + } + + $_current_grid = $gid; + self::outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$options); + } + + $counter = 0; + $_kumulativa = 0; + + + # po potrebi posortiramo podatke + if ($spremenljivka['tip'] == 7 && is_array(self::$_FREQUENCYS[$_sequence]['valid'])) { + ksort(self::$_FREQUENCYS[$_sequence]['valid']); + } + + if (count(self::$_FREQUENCYS[$_sequence]['valid'])> 0 ) { + # tekstovne odgovore posortiramo kronološko + if ($spremenljivka['tip'] == 21 || $spremenljivka['tip'] == 4) { + $_valid_answers = self :: sortTextValidAnswers($spid,$variable,self::$_FREQUENCYS[$_sequence]['valid']); + } + else { + $_valid_answers = self::$_FREQUENCYS[$_sequence]['valid']; + } + + foreach ($_valid_answers AS $vkey => $vAnswer) { + if ($counter < $num_show_records) { + if ($vAnswer['cnt'] > 0 || true) { # izpisujemo samo tiste ki nisno 0 + if (in_array($spremenljivka['tip'],array(4,7,8,19,20,21,26,27))) { // text, number, datum, mtext, mnumber, text*, lokacija,heatmap + $options['isTextAnswer'] = true; + } else { + $options['isTextAnswer'] = false; + } + $counter = self::outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_kumulativa,$options); + } + } + } + + # izpišemo sumo veljavnih + $counter = self::outputSumaValidAnswerVertical($counter,$_sequence,$spid,$options); + } + if (count(self::$_FREQUENCYS[$_sequence]['invalid'])> 0 ) { + foreach (self::$_FREQUENCYS[$_sequence]['invalid'] AS $ikey => $iAnswer) { + if ($iAnswer['cnt'] > 0 ) { # izpisujemo samo tiste ki nisno 0 + $counter = self::outputInvalidAnswerVertical($counter,$ikey,$iAnswer,$_sequence,$spid,$options); + } + } + # izpišemo sumo veljavnih + $counter = self::outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$options); + } + #izpišemo še skupno sumo + $counter = self::outputSumaVertical($counter,$_sequence,$spid,$options); + } + else { + $_answersOther[] = array('spid'=>$spid,'gid'=>$gid,'vid'=>$vid,'sequence'=>$_sequence); + } + + $first_variable = false; + } + } + } + } + } echo '
'; + echo ''; self::showVariable($spid,$spremenljivka['variable']); echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; if($spremenljivka['tip'] == 2){ echo ' ('.$lang['srv_info_checkbox'].')'; } @@ -1031,137 +1040,166 @@ class SurveyAnalysis { echo '
'; + echo ''; self::showIcons($spid,$spremenljivka,'freq'); echo ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_frekvence_titleAnswers'] . ''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''.$lang['srv_analiza_opisne_variable_expression'].''.$lang['srv_analiza_opisne_variable_skala'].''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleFrekvenca'] .''. $lang['srv_analiza_frekvence_titleOdstotek'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleVeljavni'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .''. $lang['srv_analiza_frekvence_titleKumulativa'] .'
  '.$_tip.''.$_oblika.'  
  '.$_tip.''.$_oblika.'      
'; @@ -1178,69 +1216,81 @@ class SurveyAnalysis { static function outputSubGridVertical($spremenljivka,$variable,$grid,$spid,$_options = array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor 'isOtherAnswer' => false, # ali je odgovor Drugo 'inline_legenda' => true, # ali je legenda inline ali v headerju 'doubleTop' =>false, # ali imamo novo grupa in nardimo dvojni rob ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - $css_bck = 'anl_bck_freq_2 '; - echo ''; - echo ''; + echo ''; + + echo ''; echo $grid['variable']; - #echo $variable['variable']; echo ''; - echo ''; - // echo $grid['naslov'] . ' - ' .$variable['naslov']; + + echo ''; echo $grid['naslov']; - #echo $variable['naslov']; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - if ($variable['other'] != '1' && $variable['text'] != '1') { + + if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.$_tip.''; - echo ''.$_oblika.''; + + echo ''.$_tip.''; + echo ''.$_oblika.''; } - echo ' '; - echo ' '; + + echo ' '; + echo ' '; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ' '; + echo ' '; } - echo ' '; + echo ' '; + echo ''; } static function outputSubVariablaVertical($spremenljivka,$variable,$grid,$spid,$_options = array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor 'isOtherAnswer' => false, # ali je odgovor Drugo 'inline_legenda' => true, # ali je legenda inline ali v headerju 'doubleTop' =>false, # ali imamo novo grupa in nardimo dvojni rob ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - $css_bck = 'anl_bck_freq_2 '; - echo ''; - echo ''; + + echo ''; + + echo ''; echo $variable['variable']; echo ''; - echo ''; - // echo $grid['naslov'] . ' - ' .$variable['naslov']; + + echo ''; echo $variable['naslov']; echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : ''; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); @@ -1249,15 +1299,17 @@ class SurveyAnalysis { $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.$_tip.''; - echo ''.$_oblika.''; + echo ''.$_tip.''; + echo ''.$_oblika.''; } - echo ' '; - echo ' '; + + echo ' '; + echo ' '; if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo ' '; + echo ' '; } - echo ' '; + echo ' '; + echo ''; } @@ -1764,13 +1816,15 @@ class SurveyAnalysis { echo ' '; echo ''; - echo ''; + echo ''; + echo ' '; echo ''.$lang['srv_analiza_opisne_povprecje'].''; echo ''. self::formatNumber($avg,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').''; echo ''.$lang['srv_analiza_opisne_odklon'].''; echo ''.self::formatNumber($div,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'').''; - echo ''; + + echo ''; } echo ''; @@ -3936,7 +3990,9 @@ class SurveyAnalysis { } if ($spremenljivka['tip'] == 18) { $css_back = 'anl_bck_text_1 anl_bt'; - echo ''; + + echo ''; + echo ''; echo $lang['srv_anl_suma1']; echo ''; @@ -3958,8 +4014,10 @@ class SurveyAnalysis { echo ' '; echo ' '; echo ' '; + echo ''; } + echo ''; # izpišemo še tekstovne odgovore za polja drugo @@ -4542,45 +4600,55 @@ class SurveyAnalysis { * @param $_options */ static function outputGridLabelVertical($gid,$grid,$vid,$variable,$spid,$_options=array()) { - echo ''; - echo ''; + + echo ''; + + echo ''; echo $variable['variable']; echo ''; - echo ''; - //echo ($grid['naslov'] != '' ? $grid['naslov']. ' - ' : '').$variable['naslov']; + + echo ''; echo $variable['naslov']; echo ''; + if (self::$_SHOW_LEGENDA) { $spremenljivka = self::$_HEADERS[$spid]; + if ($variable['other'] != '1' && $variable['text'] != '1') { $_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje'); $_oblika = self::getSpremenljivkaLegenda($spremenljivka,'skala'); - } else { + } + else { global $lang; + $_tip = $lang['srv_analiza_vrsta_bese']; $_oblika = $lang['srv_analiza_oblika_nomi']; } - echo ''.$_tip.''; - echo ''.$_oblika.''; + echo ''.$_tip.''; + echo ''.$_oblika.''; } - echo ' '; + + echo ' '; if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ' '; + echo ' '; } - echo ' '; - echo ' '; + echo ' '; + echo ' '; + echo ''; + $counter++; + return $counter; } static function outputValidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,&$_kumulativa,$_options=array()) { global $lang; - # opcije - + + # opcije $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor 'isOtherAnswer' => false, # ali je odgovor Drugo 'inline_legenda' => true, # ali je legenda inline ali v headerju @@ -4589,7 +4657,6 @@ class SurveyAnalysis { foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - $cssBck = ' '.self::$cssColors['0_' . ($counter & 1)]; $_valid = (self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; @@ -4597,39 +4664,50 @@ class SurveyAnalysis { # če smo v arhivih dodamovse odgovore vendar so nekateri skriti if ($counter >= $options['num_show_records'] && self::$isArchive) { - $cssHide=' class="displayNone"'; - } - echo ' 0 ? ' vkey="'.$vkey.'"' : '').$cssHide.'>'; - echo ' '; - echo ''; - echo '
'.$vkey.'
'; - echo (($options['isTextAnswer'] == false && (string)$vkey != $vAnswer['text']) ? ' ('.$vAnswer['text'] .')' : ''); - echo ''; - if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { - echo ' '; - echo ' '; + $cssHide = 'displayNone'; } - echo ''; + + echo ' 0 ? ' vkey="'.$vkey.'"' : ''). 'class="row_var '.$cssHide.'">'; + + echo ' '; + + echo ''; + echo ' '.$vkey.'
'; + echo (($options['isTextAnswer'] == false && (string)$vkey != $vAnswer['text']) ? ' ('.$vAnswer['text'] .')' : ''); + echo ''; + + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { + echo ' '; + echo ' '; + } + + echo ''; echo (int)$vAnswer['cnt']; echo ''; - echo ''; + + echo ''; echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; + echo ''; echo self::formatNumber($_valid, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; } - echo ''; - echo self::formatNumber($_kumulativa, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); + echo ''; + echo self::formatNumber($_kumulativa, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + echo ''; + # če mamo več if ( $counter+1 == $options['num_show_records'] && $options['num_show_records'] < count(self::$_FREQUENCYS[$_sequence]['valid'])) { + if (self::$isArchive == false ) { + echo ''; echo ' '; echo ''; @@ -4654,46 +4732,55 @@ class SurveyAnalysis { } echo ''.''; echo ''; - } else { - #v arhivie dodamo vse odgovore vendar so skriti - echo ''; - echo ' '; - echo ''; - echo '
'.$lang['srv_anl_all'].'
'; - echo '
'.$lang['srv_anl_all'].'
'; + } + else { + + # v arhivie dodamo vse odgovore vendar so skriti + echo ''; + + echo ' '; + + echo ''; + echo '
'.$lang['srv_anl_all'].'
'; + echo '
'.$lang['srv_anl_all'].'
'; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true ) { - echo ' '; - echo ' '; + echo ' '; + echo ' '; } - echo ''.''; - echo ''.''; + + echo ' '; + echo ' '; if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''.''; + echo ' '; } - echo ''.''; + echo ' '; + echo ''; } } $counter++; + return $counter; } + // Zadnja osnovna vrstica - suma z razipranjem missingov static function outputSumaValidAnswerVertical($counter,$_sequence,$spid,$_options=array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - // $cssBck = ' '.self::$cssColors['0_' . ($counter & 1)]; $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; - $cssBck = ' '.self::$cssColors['text_1']; - $_brez_MV = ((int)self::$missingProfileData['display_mv_type'] === 0 ) ? TRUE : FALSE; $_hide_minus = ((int)self::$missingProfileData['display_mv_type'] === 2 ) ? TRUE : FALSE; $value =((int)self::$missingProfileData['display_mv_type'] === 0 ) ? 0 : 1; @@ -4705,198 +4792,206 @@ class SurveyAnalysis { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - echo ''.$lang['srv_anl_valid']; + echo ''; - echo '  '; - echo '  '; + echo ''; + echo ' '.$lang['srv_anl_valid'].''; echo ''; - echo ''.$lang['srv_anl_suma1'].''; + echo ''.$lang['srv_anl_suma1'].''; - if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ' '; - echo ' '; + echo '/'; + echo '/'; } - echo ''; + echo ''; echo self::$_FREQUENCYS[$_sequence]['validCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['validCnt'] : 0; echo ''; - $_percent = self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 - ? 100 * self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] - : 0; - echo '' . self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ''; - if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { - echo '' . self::formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ''; - } - echo ' '; - echo ''; - // $counter++; - return $counter; + $_percent = self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 + ? 100 * self::$_FREQUENCYS[$_sequence]['validCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] + : 0; + echo '' . self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ''; + if (self::$_HEADERS[$spid]['show_valid_percent'] == true) { + echo '' . self::formatNumber(100, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ''; + } + echo '/'; + + echo ''; + + return $counter; } + // Vrstica s posamezno missing vrednostjo static function outputInvalidAnswerVertical($counter,$vkey,$vAnswer,$_sequence,$spid,$_options=array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - //$cssBck = ' '.self::$cssColors['text_' . ($counter & 1)]; - $cssBck = ' '.self::$cssColors['0_' . ($counter & 1)]; $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; $_invalid = (self::$_FREQUENCYS[$_sequence]['invalidCnt'] > 0 ) ? 100*$vAnswer['cnt'] / self::$_FREQUENCYS[$_sequence]['invalidCnt'] : 0; $_sufix = (self::$podstran == M_ANALYSIS_SUMMARY_NEW ? '_NEW' : ''); - # da deluje razpiranje manjkajočih tudi kadar imamo skupine + + # da deluje razpiranje manjkajočih tudi kadar imamo skupine if (isset(self::$_CURRENT_LOOP['cnt'])) { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } $_Z_MV = ((int)self::$missingProfileData['display_mv_type'] === 2) ? TRUE : FALSE; - echo ''; - echo ' '; - echo ''; - echo '
'.'' . $vkey . '' . ' (' . $vAnswer['text'].')'.'
'; - echo '
'.self::formatNumber($_invalid, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%').'
'; - echo '
'.$vAnswer['cnt'].'
'; + + echo ''; + + echo ' '; + + echo ''; + echo '
'.'' . $vkey . '' . ' (' . $vAnswer['text'].')'.'
'; + //echo '
'.self::formatNumber($_invalid, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%').'
'; + //echo '
'.$vAnswer['cnt'].'
'; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ' '; - echo ' '; + echo '/'; + echo '/'; } - echo ''; + + echo ''; echo (int)$vAnswer['cnt']; echo ''; - echo ''; + + echo ''; echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; - echo ' '; - echo ''; + echo '/'; } - echo ''; - echo ' '; - echo ''; + + echo '/'; + echo ''; + $counter++; + return $counter; } + // Zadnja vrstica manjkajocih vrednosti - suma manjkajocih static function outputSumaInvalidAnswerVertical($counter,$_sequence,$spid,$_options = array()) { global $lang; + # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - //$cssBck = ' '.self::$cssColors['text_' . ($counter & 1)]; - $cssBck = ' '.self::$cssColors['text_1']; + $_percent = (self::$_FREQUENCYS[$_sequence]['allCnt'] > 0 ) ? 100*self::$_FREQUENCYS[$_sequence]['invalidCnt'] / self::$_FREQUENCYS[$_sequence]['allCnt'] : 0; $_brez_MV = ((int)self::$missingProfileData['display_mv_type'] === 0) ? TRUE : FALSE; $_hide_minus = ((int)self::$missingProfileData['display_mv_type'] === 1 || (int)self::$missingProfileData['display_mv_type'] === 0) ? TRUE : FALSE; $_sufix = (self::$podstran == M_ANALYSIS_SUMMARY_NEW ? '_NEW' : ''); - # da deluje razpiranje manjkajočih tudi kadar imamo skupine + + # da deluje razpiranje manjkajočih tudi kadar imamo skupine if (isset(self::$_CURRENT_LOOP['cnt'])) { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - echo ''; + echo ''; + + echo ''; echo $lang['srv_anl_missing']; echo ''; - echo ''; - echo $lang['srv_analiza_manjkajocevrednosti']; - // podrobno za missinge - echo '  '; - echo ' ' ; - //echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - echo '  '; - echo ' ' ; - // echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - echo '
100.0%
'; - echo '
'.self::$_FREQUENCYS[$_sequence]['invalidCnt'].'
'; + echo ''; + echo $lang['srv_analiza_manjkajocevrednosti']; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ' '; - echo ' '; + echo ' '; + echo ' '; } - echo ''; + echo ''; $answer['cnt'] = self::$_FREQUENCYS[$_sequence]['invalidCnt'] > 0 ? self::$_FREQUENCYS[$_sequence]['invalidCnt'] : 0; echo (int)$answer['cnt']; echo ''; - echo ''; + + echo ''; echo self::formatNumber($_percent, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%'); echo ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ''; - echo ' '; - echo ''; + echo '/'; } - echo ' '; + echo '/'; + echo ''; + $counter++; + return $counter; } + // Cisto zadnja vrstica - suma vseh (manjkajoce + navadne) static function outputSumaVertical($counter,$_sequence,$spid, $_options = array()) { global $lang; - # opcije - $options = array( 'isTextAnswer' => false, # ali je tekstovni odgovor - 'isOtherAnswer' => false, # ali je odgovor Drugo - 'inline_legenda' => true, # ali je legenda inline ali v headerju + # opcije + $options = array( + 'isTextAnswer' => false, # ali je tekstovni odgovor + 'isOtherAnswer' => false, # ali je odgovor Drugo + 'inline_legenda' => true, # ali je legenda inline ali v headerju ); + foreach ($_options as $_oKey => $_option) { $options[$_oKey] = $_option; } - // $cssBck = ' '.self::$cssColors['0_' .($counter & 1)]; - $cssBck = ' anl_bck_text_0'; $_brez_MV = ((int)self::$missingProfileData['display_mv_type'] === 0) ? TRUE : FALSE; $_sufix = (self::$podstran == M_ANALYSIS_SUMMARY_NEW ? '_NEW' : ''); + # da deluje razpiranje manjkajočih tudi kadar imamo skupine if (isset(self::$_CURRENT_LOOP['cnt'])) { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; - //echo ' '; // $lang['srv_anl_appropriate'] - //echo ''.$lang['srv_anl_suma2'].''; - echo ''.$lang['srv_anl_suma2'].''; - echo ' '; + echo ''; + + echo ''.$lang['srv_anl_suma2'].''; + + echo ''; if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { - echo ' '; - echo ' '; + echo '/'; + echo '/'; } - echo '' . (self::$_FREQUENCYS[$_sequence]['allCnt'] ? self::$_FREQUENCYS[$_sequence]['allCnt'] : 0) . ''; - echo '' . self::formatNumber('100', SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ''; - if (self::$_HEADERS[$spid]['show_valid_percent']) { - echo ' '; - } - echo ' '; - echo ''; + echo '' . (self::$_FREQUENCYS[$_sequence]['allCnt'] ? self::$_FREQUENCYS[$_sequence]['allCnt'] : 0) . ''; + echo '' . self::formatNumber('100', SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'), '%') . ''; + if (self::$_HEADERS[$spid]['show_valid_percent']) { + echo '/'; + } + echo '/'; + + echo ''; } @@ -5024,31 +5119,16 @@ class SurveyAnalysis { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; + echo ''; echo ''; echo $lang['srv_anl_missing']; echo ''; echo ''; - echo $lang['srv_analiza_manjkajocevrednosti']; - - // podrobno za missinge - echo '  '; - echo ' ' ; - //echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - echo '  '; - echo ' ' ; - // echo $lang['srv_analiza_missingSpremenljivke'] ; - echo ' '; - echo ''; - - echo '
100.0%
'; - //echo '
'.self::$_FREQUENCYS[$_sequence]['invalidCnt'].'
'; - echo '
'.$manjkajoci.'
'; + echo $lang['srv_analiza_manjkajocevrednosti']; echo ''; + if (self::$_SHOW_LEGENDA && $options['isOtherAnswer'] == false && $options['inline_legenda'] == true) { echo ' '; echo ' '; @@ -5087,7 +5167,7 @@ class SurveyAnalysis { $_sufix = '_loop'.self::$_CURRENT_LOOP['cnt'].$_sufix; } - echo ''; + echo ''; echo ''.$lang['srv_anl_suma2'].''; echo ' '; @@ -7400,11 +7480,16 @@ class SurveyAnalysis { static function displaySpremenljivkaIcons($spid) { if (self::$isArchive == false){ + + echo '
'; + echo '
'.self::displayQuickIcons($spid).'
'; // Javna povezava nima js preklopov if(self::$printPreview == false) self::displayQuickScale($spid); + + echo '
'; } } @@ -7416,11 +7501,13 @@ class SurveyAnalysis { # pokličemo objekt SpremenljivkaSkala $objectSkala = new SpremenljivkaSkala($spr_id); + echo '
'; + if ($objectSkala->canChangeSkala()) { - echo '
'; + if ($objectSkala->is(SpremenljivkaSkala::ORD)) { echo ''; - echo ''; + echo ''; echo $lang['srv_skala_'.SpremenljivkaSkala::ORD]; echo ''; echo ' / '; @@ -7429,25 +7516,26 @@ class SurveyAnalysis { echo ''; echo ''; } + if ($objectSkala->is(SpremenljivkaSkala::NOM)) { echo ''; echo ''; echo $lang['srv_skala_'.SpremenljivkaSkala::ORD]; echo ''; echo ' / '; - echo ''; + echo ''; echo $lang['srv_skala_'.SpremenljivkaSkala::NOM]; echo ''; echo ''; } - echo '
'; - } else { - echo '
'; + } + else { echo ''; echo $lang['srv_skala_'.$objectSkala->getSkala()]; echo ''; - echo '
'; } + + echo '
'; } static function displayPublicAnalysis($properties = array()) { @@ -7596,62 +7684,62 @@ class SurveyAnalysis { if (self :: $show_spid_div == true) { echo '
'; - //self::displaySpremenljivkaIcons($spid); } - //echo '
'; - echo '
'; - # tekst vprašanja - echo ''; - # naslovna vrstica - echo ''; - #variabla - echo ''; - echo ''; - echo ''; - #variabla + echo '
'; + + # tekst vprašanja + echo '
'; - //echo self::showVariable($spid, $spremenljivka['variable']); - echo $spremenljivka['variable'].' - '.$spremenljivka['naslov']; - echo '
'; - // konec naslovne vrstice + # naslovna vrstica + echo ''; - $_answersOther = array(); - $_grids_count = count($spremenljivka['grids']); - if ($_grids_count > 0) { + #variabla + echo ''; - $_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot '; - $last = 0; - //anl_bck_desc_2 anl_bl anl_br anl_variabla_sub - foreach ($spremenljivka['grids'] AS $gid => $grid) { - - $_variables_count = count($grid['variables']); - echo ''; - echo ''; + echo ''; + // konec naslovne vrstice - echo ''; - } - } - echo '
'; + echo $spremenljivka['variable'].' - '.$spremenljivka['naslov']; + echo '
'; - if($heatmap){ - //echo $grid['naslov'].'
';//ni potrebno, ker je ze v glavi? - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; - SurveyUserSession::Init($anketa); - - $heatmapId = 'heatmap'.$sprid; - //echo $heatmapId; - - echo ''; - //echo 'Smiley face'; - echo 'Heatmap'; - echo ''; - } - echo '
'; + echo ''; + #variabla + + $_answersOther = array(); + $_grids_count = count($spremenljivka['grids']); + if ($_grids_count > 0) { + + $_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot '; + $last = 0; + //anl_bck_desc_2 anl_bl anl_br anl_variabla_sub + foreach ($spremenljivka['grids'] AS $gid => $grid) { + + $_variables_count = count($grid['variables']); + echo ''; + echo ''; + if($heatmap){ + //echo $grid['naslov'].'
';//ni potrebno, ker je ze v glavi? + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; + SurveyUserSession::Init($anketa); + + $heatmapId = 'heatmap'.$sprid; + + echo ''; + echo 'Heatmap'; + echo ''; + } + echo ''; + + + echo ''; + } + } + echo ''; echo '
'; # izpišemo še tekstovne odgovore za polja drugo @@ -7748,160 +7836,161 @@ class SurveyAnalysis { echo ''; //zacetek tabele # 1. vrstica - naslovna vrstica echo ''; - #variabla - echo ''; - #odgovori - //echo ''; + #odgovori + //echo ''; + echo ''; echo ''; //konec 1. vrstice + //2. vrstica - prikazovanje povezave do heatmap echo ''; - #variabla - echo ''; - echo ''; + #variabla + echo ''; + + echo ''; echo ''; //konec - 2. vrstice + //Koordinate //naslovna vrstica za koordinate echo ''; - echo ''; + echo ''; echo ''; //naslovna vrstica za koordinate - konec //vrstica s podnaslovi celic echo ''; - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo ''; - - echo ''; + echo ''; + + echo ''; + + echo ''; + + echo ''; + + echo ''; + + echo ''; + + echo ''; echo ''; //vrstica s podnaslovi celic - konec //vrstica za x echo ''; - //1. stolpcev z imenom koordinate - echo ''; - //1. stolpcev z imenom koordinate - konec - - //2. stolpec - Veljavni - $validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers); - echo ''; - //2. stolpec - Veljavni - konec - - //3. stolpec - Ustrezni - $ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki - echo ''; - //3. stolpec - Ustrezni - konec - - //4. stolpec - Povprecje - $povprecjeHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //4. stolpec - Povprecje - konec + //1. stolpcev z imenom koordinate + echo ''; + //1. stolpcev z imenom koordinate - konec + + //2. stolpec - Veljavni + $validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers); + echo ''; + //2. stolpec - Veljavni - konec + + //3. stolpec - Ustrezni + $ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki + echo ''; + //3. stolpec - Ustrezni - konec + + //4. stolpec - Povprecje + $povprecjeHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //4. stolpec - Povprecje - konec - //5. stolpec - Standardni odklon - $stdevHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //5. stolpec - Standardni odklon - konec + //5. stolpec - Standardni odklon + $stdevHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //5. stolpec - Standardni odklon - konec - //6. stolpec - Minimum - $minHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //6. stolpec - Minimum - konec - - //7. stolpec - Max - $maxHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //7. stolpec - Max - konec + //6. stolpec - Minimum + $minHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //6. stolpec - Minimum - konec + + //7. stolpec - Max + $maxHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //7. stolpec - Max - konec echo ''; //vrstica za x - konec //vrstica za y echo ''; - //1. stolpcev z imenom koordinate - echo ''; - //1. stolpcev z imenom koordinate - konec - - //2. stolpec - Veljavni - echo ''; - //2. stolpec - Veljavni - konec - - //3. stolpec - Ustrezni - echo ''; - //3. stolpec - Ustrezni - konec + //1. stolpcev z imenom koordinate + echo ''; + //1. stolpcev z imenom koordinate - konec + + //2. stolpec - Veljavni + echo ''; + //2. stolpec - Veljavni - konec + + //3. stolpec - Ustrezni + echo ''; + //3. stolpec - Ustrezni - konec - //4. stolpec - Povprecje - $povprecjeHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //4. stolpec - Povprecje - konec - - //5. stolpec - Standardni odklon - $stdevHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //5. stolpec - Standardni odklon - konec + //4. stolpec - Povprecje + $povprecjeHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //4. stolpec - Povprecje - konec + + //5. stolpec - Standardni odklon + $stdevHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //5. stolpec - Standardni odklon - konec - //6. stolpec - Minimum - $minHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //6. stolpec - Minimum - konec - - //7. stolpec - Max - $maxHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); - echo ''; - //7. stolpec - Max - konec + //6. stolpec - Minimum + $minHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //6. stolpec - Minimum - konec + + //7. stolpec - Max + $maxHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); + echo ''; + //7. stolpec - Max - konec echo ''; //vrstica za y - konec diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js index a01c75267..ae1b2c283 100644 --- a/admin/survey/script/script_analiza.js +++ b/admin/survey/script/script_analiza.js @@ -543,7 +543,7 @@ function hideAnalizaSingleVarPopup() { } function show_single_missing(id, what) { - // + if (what == 0) { $('tr[name=missing_detail_'+id+']').each(function() {$(this).removeClass('displayNone');}); $("#single_missing_0"+id).hide(); @@ -553,7 +553,8 @@ function show_single_missing(id, what) { $("#single_missing_percent_"+id).hide(); $("#single_missing_title_"+id).hide(); - } else { + } + else { $('tr[name=missing_detail_'+id+']').each(function() {$(this).addClass('displayNone');}); $("#single_missing_0"+id).show(); $("#single_missing_1"+id).hide(); @@ -561,7 +562,6 @@ function show_single_missing(id, what) { $("#single_missing_suma_freq_"+id).hide(); $("#single_missing_percent_"+id).show(); $("#single_missing_title_"+id).show(); - } } @@ -687,27 +687,6 @@ function renameFilterProfile() { }); } -/*function showHideRenameFilterProfile(showhide) { - if (showhide=='true') { - //$("#filterProfileCoverDiv").show(); - $("#renameFilterProfileDiv").show(); - } - else { - //$("#filterProfileCoverDiv").hide(); - $("#renameFilterProfileDiv").hide(); - } -} -function showHideDeleteFilterProfile(showhide) { - if (showhide=='true') { - //$("#filterProfileCoverDiv").show(); - $("#deleteFilterProfileDiv").show(); - } - else { - //$("#filterProfileCoverDiv").hide(); - $("#deleteFilterProfileDiv").hide(); - } -}*/ - function toggle_click_missing(what) { var variabla = $(what).attr('id').substr(14); // odrezemo prvih 14 znakov : click_missing_ @@ -718,26 +697,28 @@ function toggle_click_missing(what) { } if (state == 0) { - // odstranimo spodnjo polno črto, ostane rdeca crtkana - $("#anl_click_missing_tr_"+variabla).removeClass('anl_bb'); - $("#anl_click_missing_tr_"+variabla).addClass('anl_dash_red_bb'); - // nič od missingov še ni vidno. prikažemo osnovne missinge in skupo sumo - $("#click_missing_1_"+variabla).show(); - $("#click_missing_suma_"+variabla).show(); - $(what).attr('value',1); - // skrijemo osnovni link za vklop manjkajocih (manjkajoci) - $("#click_missing_"+variabla).hide(); - $("#single_missing_title_"+variabla).show(); - } else if (state == 1 || state == 2 || state == ""){ - // dodamo spodnjo polno črto, skrijemo rdeco crtkana - $("#anl_click_missing_tr_"+variabla).addClass('anl_bb'); - $("#anl_click_missing_tr_"+variabla).removeClass('anl_dash_red_bb'); - // nič od missingov še ni vidno. prikažemo osnovne missinge in skupo sumo - $("#click_missing_1_"+variabla).hide(); - $("#click_missing_suma_"+variabla).hide(); - $(what).attr('value',0); - $("#click_missing_"+variabla).show(); - $("#single_missing_title_"+variabla).hide(); + + // Odpremo missinge in skupno sumo + $('tr[name=missing_detail_'+variabla+']').each(function() { + $(this).removeClass('displayNone'); + }); + + $(what).attr('value', 1); + + // Zamenjamo puscico + $(what).find('.arrow2_d').removeClass('arrow2_d').addClass('arrow2_u'); + } + else if (state == 1 || state == 2 || state == ""){ + + // Zapremo missinge + $('tr[name=missing_detail_'+variabla+']').each(function() { + $(this).addClass('displayNone'); + }); + + $(what).attr('value', 0); + + // Zamenjamo puscico + $(what).find('.arrow2_u').removeClass('arrow2_u').addClass('arrow2_d'); } } diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 16c0cf2f9..33eeddbcb 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -15141,24 +15141,31 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data .div_analiza_holder { - margin: 32px 0 16px 0; + display: flex; + flex-direction: column; + margin: 0 0 64px 0; } -#div_analiza_data .div_analiza_holder .div_analiza_icons { +#div_analiza_data .div_analiza_holder .analiza_table_top_settings { + display: flex; + align-items: center; + justify-content: space-between; + height: auto; + margin-bottom: 8px; + font-size: 16px; +} +#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons { opacity: 0; filter: alpha(opacity=0); - float: left; - z-index: 75; - position: relative; - margin-top: -20px; - padding-bottom: 3px; } -#div_analiza_data .div_analiza_holder .div_analiza_scale { +#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_icons .faicon:before { + font-size: 20px; +} +#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale { opacity: 0; filter: alpha(opacity=0); - float: right; - position: relative; - margin-top: -20px; - padding-bottom: 3px; +} +#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale a { + text-decoration: none; } #div_analiza_data .div_analiza_holder .div_other_text { margin-top: 32px; @@ -15185,28 +15192,33 @@ textarea#addusers, textarea#addusers_note { font-size: 14px; line-height: 18px; } -#div_analiza_data table tr th.col_icons, -#div_analiza_data table tr td.col_icons { +#div_analiza_data table tr th.cell_icons, +#div_analiza_data table tr td.cell_icons { width: 110px; text-align: center; } -#div_analiza_data table tr th.col_var, -#div_analiza_data table tr td.col_var { +#div_analiza_data table tr th.cell_var, +#div_analiza_data table tr td.cell_var { width: 110px; - text-align: left; + text-align: center; } -#div_analiza_data table tr th.col_question, -#div_analiza_data table tr td.col_question { +#div_analiza_data table tr th.cell_var a, +#div_analiza_data table tr td.cell_var a { + color: #333333; + text-decoration: none; +} +#div_analiza_data table tr th.cell_question, +#div_analiza_data table tr td.cell_question { width: auto; text-align: left; } -#div_analiza_data table tr th.col_info, -#div_analiza_data table tr td.col_info { +#div_analiza_data table tr th.cell_info, +#div_analiza_data table tr td.cell_info { width: 110px; text-align: left; } -#div_analiza_data table tr th.col_value, -#div_analiza_data table tr td.col_value { +#div_analiza_data table tr th.cell_value, +#div_analiza_data table tr td.cell_value { width: 110px; text-align: right; } @@ -15216,11 +15228,6 @@ textarea#addusers, textarea#addusers_note { line-height: 8px; border: 0 !important; } -#div_analiza_data table tr th .anl_variabla a, -#div_analiza_data table tr td .anl_variabla a { - color: #333333; - text-decoration: none; -} #div_analiza_data table tr.row1 th, #div_analiza_data table tr.row1 td { font-size: 16px; @@ -15228,6 +15235,12 @@ textarea#addusers, textarea#addusers_note { line-height: 20px; background-color: #F8F8F8; } +#div_analiza_data table tr.row1 th span, +#div_analiza_data table tr.row1 td span { + font-size: 16px; + font-weight: 600; + line-height: 20px; +} #div_analiza_data table tr.row2 th, #div_analiza_data table tr.row2 td { font-size: 15px; @@ -15235,9 +15248,11 @@ textarea#addusers, textarea#addusers_note { line-height: 19px; background-color: #F8F8F8; } -#div_analiza_data table tr.row2 th.anl_w70, -#div_analiza_data table tr.row2 td.anl_w70 { - text-align: center; +#div_analiza_data table tr.row2 th span, +#div_analiza_data table tr.row2 td span { + font-size: 15px; + font-weight: 600; + line-height: 19px; } #div_analiza_data table tr.row3 th, #div_analiza_data table tr.row3 td, #div_analiza_data table tr.row4 th, @@ -15246,13 +15261,46 @@ textarea#addusers, textarea#addusers_note { } #div_analiza_data table tr.row_question td { font-weight: 600; + background-color: #F2F2F2; } -#div_analiza_data table tr.sum td { +#div_analiza_data table tr.row_missing td { background: rgba(255, 199, 0, 0.05); } -#div_analiza_data table tr.sum.all td { +#div_analiza_data table tr.row_missing.row_sum td { + background: rgba(255, 199, 0, 0.05); +} +#div_analiza_data table tr.row_sum td { + background: rgba(255, 199, 0, 0.05); +} +#div_analiza_data table tr.row_sum td.cell_missing { + text-align: center; +} +#div_analiza_data table tr.row_sum td.cell_missing span { + cursor: pointer; + color: #1E88E5; + transition: 0.2s; +} +#div_analiza_data table tr.row_sum td.cell_missing span:hover { + color: #0059ab; +} +#div_analiza_data table tr.row_sum td.cell_missing span:hover .faicon:before { + color: #0059ab; +} +#div_analiza_data table tr.row_sum td.cell_missing span .faicon { + margin-right: 8px; +} +#div_analiza_data table tr.row_sum td.cell_missing span .faicon:before { + font-size: 12px; +} +#div_analiza_data table tr.row_sum_all td { background: rgba(255, 199, 0, 0.1); } +#div_analiza_data table tr.row_sum_all td.cell_var { + border-right: 0; +} +#div_analiza_data table tr.row_sum_all td.cell_question { + border-left: 0; +} .analysis_bottom_settings { display: flex; @@ -15644,10 +15692,17 @@ iframe#ifmcontentstoprint { margin-right: 0; } .analysis_icons_holder > a .faicon:before { - font-size: 16px; + font-size: 14px; } .analysis_icons_holder > a .faicon.an_freq:before, .analysis_icons_holder > a .faicon.an_freqx:before, .analysis_icons_holder > a .faicon.an_stat:before, .analysis_icons_holder > a .faicon.an_sigma:before, .analysis_icons_holder > a .faicon.an_sigmax:before { - font-size: 22px; + font-size: 20px; +} + +#div_analiza_data table.table_desc tr td.cell_var { + text-align: left; +} +#div_analiza_data table.table_desc tr.row_question td { + background-color: #FFFFFF; } /*editing chart labels in popup*/ diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss index 529f67a5f..7afd05db1 100644 --- a/resources/sass/admin_new/pages/survey_analysis/basic.scss +++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss @@ -1,27 +1,38 @@ #div_analiza_data { .div_analiza_holder { - margin: 32px 0 16px 0; + display: flex; + flex-direction: column; - .div_analiza_icons { - opacity: 0; - filter: alpha(opacity=0); + margin: 0 0 64px 0; - float: left; - z-index: 75; - position: relative; - margin-top: -20px; - padding-bottom: 3px; - } + .analiza_table_top_settings{ + display: flex; + align-items: center; + justify-content: space-between; - .div_analiza_scale { - opacity: 0; - filter: alpha(opacity=0); + height: auto; + margin-bottom: 8px; - float: right; - position: relative; - margin-top: -20px; - padding-bottom: 3px; + font-size: 16px; + + .div_analiza_icons { + opacity: 0; + filter: alpha(opacity=0); + + .faicon:before{ + font-size: 20px; + } + } + + .div_analiza_scale { + opacity: 0; + filter: alpha(opacity=0); + + a{ + text-decoration: none; + } + } } .div_other_text{ @@ -58,35 +69,40 @@ } // Stolpec z ikonami - &.col_icons{ + &.cell_icons{ width: 110px; text-align: center; } // Stolpec z variablo - &.col_var{ + &.cell_var{ width: 110px; - text-align: left; + text-align: center; + + a{ + color: $black; + text-decoration: none; + } } // Stolpec z vprasanjem - &.col_question{ + &.cell_question{ width: auto; text-align: left; } // Stolpec z legendo - &.col_info{ + &.cell_info{ width: 110px; text-align: left; } // Stolpec z vrednostjo - &.col_value{ + &.cell_value{ width: 110px; text-align: right; @@ -98,16 +114,9 @@ line-height: 8px; border: 0 !important; } - - // Variabla - .anl_variabla{ - a{ - color: $black; - text-decoration: none; - } - } } + // 1. header vrstica &.row1{ th, td{ @@ -116,9 +125,16 @@ line-height: 20px; background-color: $light-gray; + + span{ + font-size: 16px; + font-weight: 600; + line-height: 20px; + } } } + // 2. header vrstica &.row2{ th, td{ @@ -128,13 +144,15 @@ background-color: $light-gray; - // Stolpec z vrednostmi - &.anl_w70{ - text-align: center; + span{ + font-size: 15px; + font-weight: 600; + line-height: 19px; } } } + // 3. in 4. opcijska header vrstica &.row3, &.row4{ th, @@ -143,32 +161,91 @@ } } + // Vrstica z vprasanjem &.row_question{ td{ font-weight: 600; + + background-color: $light-gray2; } } + // Vrstica z gridom &.row_grid{ } + // Vrstica z variablo in vrednostmi &.row_var{ } - &.sum{ - + // Vrstica z missingi + &.row_missing{ + td{ background: rgba(255, 199, 0, 0.05); } } - &.sum.all{ + // Vrstica s sumo za missinge + &.row_missing.row_sum{ + + td{ + background: rgba(255, 199, 0, 0.05); + } + } + + // Vrstica s sumo + &.row_sum{ + + td{ + background: rgba(255, 199, 0, 0.05); + + &.cell_missing{ + text-align: center; + + span{ + cursor: pointer; + color: $blue; + + transition: 0.2s; + + &:hover{ + color: $dark-blue; + + .faicon:before{ + color: $dark-blue; + } + } + + .faicon{ + margin-right: 8px; + + &:before{ + font-size: 12px; + } + } + } + + } + } + } + + // Vrstica s al + &.row_sum_all{ td{ background: rgba(255, 199, 0, 0.1); + + &.cell_var{ + border-right: 0; + } + + &.cell_question{ + border-left: 0; + } } } } diff --git a/resources/sass/admin_new/pages/survey_analysis/icons.scss b/resources/sass/admin_new/pages/survey_analysis/icons.scss index 83642787b..7338fdace 100644 --- a/resources/sass/admin_new/pages/survey_analysis/icons.scss +++ b/resources/sass/admin_new/pages/survey_analysis/icons.scss @@ -15,7 +15,7 @@ .faicon{ &:before{ - font-size: 16px; + font-size: 14px; } &.an_freq, @@ -24,7 +24,7 @@ &.an_sigma, &.an_sigmax{ &:before{ - font-size: 22px; + font-size: 20px; } } } diff --git a/resources/sass/admin_new/pages/survey_analysis/custom_report.scss b/resources/sass/admin_new/pages/survey_analysis/page_break.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_analysis/custom_report.scss rename to resources/sass/admin_new/pages/survey_analysis/page_break.scss diff --git a/resources/sass/admin_new/pages/survey_analysis/charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_analysis/charts.scss rename to resources/sass/admin_new/pages/survey_analysis/page_charts.scss diff --git a/resources/sass/admin_new/pages/survey_analysis/freq.scss b/resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_analysis/freq.scss rename to resources/sass/admin_new/pages/survey_analysis/page_crosstab.scss diff --git a/resources/sass/admin_new/pages/survey_analysis/sums.scss b/resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss similarity index 100% rename from resources/sass/admin_new/pages/survey_analysis/sums.scss rename to resources/sass/admin_new/pages/survey_analysis/page_custom_report.scss diff --git a/resources/sass/admin_new/pages/survey_analysis/page_desc.scss b/resources/sass/admin_new/pages/survey_analysis/page_desc.scss new file mode 100644 index 000000000..f3f03f92c --- /dev/null +++ b/resources/sass/admin_new/pages/survey_analysis/page_desc.scss @@ -0,0 +1,11 @@ + +#div_analiza_data table.table_desc{ + + tr td.cell_var{ + text-align: left; + } + + tr.row_question td{ + background-color: $white; + } +} diff --git a/resources/sass/admin_new/pages/survey_analysis/page_freq.scss b/resources/sass/admin_new/pages/survey_analysis/page_freq.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_analysis/page_means.scss b/resources/sass/admin_new/pages/survey_analysis/page_means.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss b/resources/sass/admin_new/pages/survey_analysis/page_multicrosstab.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_analysis/page_sums.scss b/resources/sass/admin_new/pages/survey_analysis/page_sums.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss b/resources/sass/admin_new/pages/survey_analysis/page_ttest.scss new file mode 100644 index 000000000..e69de29bb diff --git a/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss b/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss index 5342e7821..e849f2c53 100644 --- a/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss +++ b/resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss @@ -2,9 +2,14 @@ @import "preview"; @import "icons"; -@import "sums"; -@import "freq"; +@import "page_sums"; +@import "page_freq"; +@import "page_desc"; +@import "page_crosstab"; +@import "page_multicrosstab"; +@import "page_ttest"; +@import "page_means"; +@import "page_break"; -@import "charts"; - -@import "custom_report"; \ No newline at end of file +@import "page_charts"; +@import "page_custom_report"; \ No newline at end of file
'; - echo self::showVariable($spid, $spremenljivka['variable']); - echo ''.$spremenljivka['naslov'].''; - echo ''.$spremenljivka['naslov'].''; + #variabla + echo ''; + echo self::showVariable($spid, $spremenljivka['variable']); + echo ''.$spremenljivka['naslov'].''; + echo ''.$spremenljivka['naslov'].''; - echo '
'; - //self::showIcons($spid,$spremenljivka,$_from); //za enkrat skrijem ikone za izvoze in druge moznosti - echo ''; - //echo $grid['naslov'].'
';//ni potrebno, ker je ze v glavi? - $sprid = explode('_',$spid); - $loopid = $sprid[1]; - $sprid = $sprid[0]; - SurveyUserSession::Init($anketa); - - $heatmapId = 'heatmap'.$sprid; - //echo $heatmapId; - //SurveyChart::displayExportIcons($sprid); - echo ''; - //echo 'Smiley face'; - echo 'Heatmap '; - echo ''; - echo '		'; + //self::showIcons($spid,$spremenljivka,$_from); //za enkrat skrijem ikone za izvoze in druge moznosti + echo ''; + $sprid = explode('_',$spid); + $loopid = $sprid[1]; + $sprid = $sprid[0]; + SurveyUserSession::Init($anketa); + + $heatmapId = 'heatmap'.$sprid; + + echo ''; + echo 'Heatmap '; + echo ''; + + echo '
'; - echo ''.$lang['srv_analiza_heatmap_clicked_coords'].''; - echo ''; + echo ''.$lang['srv_analiza_heatmap_clicked_coords'].''; + echo '
'; - echo $lang['coordinates']; - echo ''; - echo $lang['srv_analiza_opisne_valid_heatmap']; - echo ''; - echo $lang['srv_analiza_num_units_valid_heatmap']; - echo ''; - echo $lang['srv_means_label']; - echo ''; - echo $lang['srv_analiza_opisne_odklon']; - echo ''; - echo $lang['srv_analiza_opisne_min']; - echo ''; - echo $lang['srv_analiza_opisne_max']; - echo ''; + echo $lang['coordinates']; + echo ''; + echo $lang['srv_analiza_opisne_valid_heatmap']; + echo ''; + echo $lang['srv_analiza_num_units_valid_heatmap']; + echo ''; + echo $lang['srv_means_label']; + echo ''; + echo $lang['srv_analiza_opisne_odklon']; + echo ''; + echo $lang['srv_analiza_opisne_min']; + echo ''; + echo $lang['srv_analiza_opisne_max']; + echo '
'; - echo 'x'; - echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''.$povprecjeHeatmapClicksX.''; + echo 'x'; + echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''.$povprecjeHeatmapClicksX.''.$stdevHeatmapClicksX.''.$stdevHeatmapClicksX.''.$minHeatmapClicksX.''.$maxHeatmapClicksX.''.$minHeatmapClicksX.''.$maxHeatmapClicksX.'
'; - echo 'y'; - echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''; + echo 'y'; + echo ''.$validHeatmapRegion.''.$ustrezniHeatmapRegion.''.$povprecjeHeatmapClicksY.''.$stdevHeatmapClicksY.''.$povprecjeHeatmapClicksY.''.$stdevHeatmapClicksY.''.$minHeatmapClicksY.''.$maxHeatmapClicksY.''.$minHeatmapClicksY.''.$maxHeatmapClicksY.'