may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Analize - popravki heatmap, popupi posamezne tabele, multitext

Browse Source
This commit is contained in:
pero1203 2022-10-27 17:36:00 +02:00
parent 59444b0365
commit 1fdebad5ea
4 changed files with 2047 additions and 1828 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

373
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -1502,10 +1502,12 @@ class SurveyAnalysis {
*/ */
static function displaySumsNew($_spid = null) { static function displaySumsNew($_spid = null) {
global $site_path; global $site_path;
# preberemo header # preberemo header
if (self::$headFileName === null ) { if (self::$headFileName === null ) {
// die ('<div>NAPAKA!!! Manjkajo datoteke s podatki. <a href="#" onClick="createCollectData();return false;">Kreiraj datoteke s podatki!</a></div>'); // die ('<div>NAPAKA!!! Manjkajo datoteke s podatki. <a href="#" onClick="createCollectData();return false;">Kreiraj datoteke s podatki!</a></div>');
} else { }
else {
#preberemo HEADERS iz datoteke #preberemo HEADERS iz datoteke
self::$_HEADERS = unserialize(file_get_contents(self::$headFileName)); self::$_HEADERS = unserialize(file_get_contents(self::$headFileName));
@ -1518,18 +1520,20 @@ class SurveyAnalysis {
$vars_count = count(self::$_FILTRED_VARIABLES); $vars_count = count(self::$_FILTRED_VARIABLES);
$line_break = ''; $line_break = '';
foreach (self::$_HEADERS AS $spid => $spremenljivka) { foreach (self::$_HEADERS AS $spid => $spremenljivka) {
# preverjamo ali je meta # preverjamo ali je meta
if (($spremenljivka['tip'] != 'm' if (($spremenljivka['tip'] != 'm' && in_array($spremenljivka['tip'], self::$_FILTRED_TYPES )) && (!isset($_spid) || (isset($_spid) && $_spid == $spid))) {
&& in_array($spremenljivka['tip'], self::$_FILTRED_TYPES ))
&& (!isset($_spid) || (isset($_spid) && $_spid == $spid))) {
# ali imamo sfiltrirano spremenljivko # ali imamo sfiltrirano spremenljivko
if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) { if ($vars_count == 0 || ($vars_count > 0 && isset(self::$_FILTRED_VARIABLES[$spid]) ) ) {
echo $line_break; echo $line_break;
if (self :: $show_spid_div == true) { if (self :: $show_spid_div == true) {
echo '<div id="sum_'.$spid.'" loop="'.self::$_CURRENT_LOOP['cnt'].'" class="div_sum_variable div_analiza_holder">'; echo '<div id="sum_'.$spid.'" loop="'.self::$_CURRENT_LOOP['cnt'].'" class="div_sum_variable div_analiza_holder">';
} }
self::displaySpremenljivkaIcons($spid); //self::displaySpremenljivkaIcons($spid);
# prikazujemo v odvisnosti od kategorije spremenljivke # prikazujemo v odvisnosti od kategorije spremenljivke
switch ($spremenljivka['tip']) { switch ($spremenljivka['tip']) {
@ -1539,7 +1543,6 @@ class SurveyAnalysis {
break; break;
case 2: case 2:
#checkbox če je dihotomna: #checkbox če je dihotomna:
#self::sumVerticalCheckbox($spid,'sums*');
self::sumHorizontalCheckbox($spid,'sums*'); self::sumHorizontalCheckbox($spid,'sums*');
break; break;
case 3: case 3:
@ -1549,15 +1552,6 @@ class SurveyAnalysis {
case 6: case 6:
# multigrid # multigrid
self::sumHorizontal($spid,'sums'); self::sumHorizontal($spid,'sums');
/*
if ($spremenljivka['enota'] != 3) {
# multigrid
self::sumHorizontal($spid,'sums');
} else {
#imamo dvojni mgrid
self::sumDoubleHorizontal($spid,'sums*');
}
*/
break; break;
case 16: case 16:
#multicheckbox če je dihotomna: #multicheckbox če je dihotomna:
@ -1581,17 +1575,6 @@ class SurveyAnalysis {
break; break;
case 20: case 20:
self::sumMultiNumberVertical($spid,'sums*'); self::sumMultiNumberVertical($spid,'sums*');
/*
# Če je v gridu le ene variabla naj bo default prikazan f* in ne SUMA
if ($spremenljivka['grids'][0]['cnt_vars'] == 1) {
# variabla tipa »število« je v sumarniku identična kot v DESCRIPTIVES.
self::sumMultiNumberVertical($spid,'sums');
} else {
# variabla tipa »število« je v sumarniku identična kot v DESCRIPTIVES.
self::sumMultiNumber($spid,'sums');
}
*/
break; break;
case 26: case 26:
# lokacija # lokacija
@ -1610,10 +1593,9 @@ class SurveyAnalysis {
if (self :: $show_spid_div == true) { if (self :: $show_spid_div == true) {
echo '</div>'; // id="sum_'.$keyGrupe.'">'; echo '</div>'; // id="sum_'.$keyGrupe.'">';
} }
$line_break = "<br/>"; $line_break = "<br/>";
} }
} // end if $spremenljivka['tip'] != 'm' } // end if $spremenljivka['tip'] != 'm'
} // end foreach self::$_HEADERS } // end foreach self::$_HEADERS
} // end if else ($_headFileName == null) } // end if else ($_headFileName == null)
@ -4390,7 +4372,7 @@ class SurveyAnalysis {
# naslovna vrstica # naslovna vrstica
$_row = $spremenljivka['grids'][0]; $_row = $spremenljivka['grids'][0];
echo '<tr>'; echo '<tr class="row3">';
if(!$lokacija){ if(!$lokacija){
echo '<td class="cell_var"></td>'; echo '<td class="cell_var"></td>';
@ -4517,11 +4499,9 @@ class SurveyAnalysis {
.$key.', '.$loopid.', '.$anketa.');">'.$_ans.'</a>'; .$key.', '.$loopid.', '.$anketa.');">'.$_ans.'</a>';
} }
if($index == $moreBound){
#more - več #more - več
echo '<br />'; if($index == $moreBound){
echo '&nbsp;'; echo '<div class="srv_heatmap_info_more_'.$sprid.' as_link multigrid_more" onclick="$(\'.more_'.$sprid.', .srv_heatmap_info_more_'.$sprid.', .srv_heatmap_info_more2_'.$sprid.'\').toggleClass(\'displayNone\');">'.$lang['srv_more'].'</div>';
echo '<div class="srv_heatmap_info_more_'.$sprid.' as_link" onclick="$(\'.more_'.$sprid.', .srv_heatmap_info_more_'.$sprid.', .srv_objava_info_more2_'.$sprid.'\').toggle();">'.$lang['srv_more'].'</div>';
#more - več - konec #more - več - konec
} }
echo '</td>'; echo '</td>';
@ -4529,7 +4509,7 @@ class SurveyAnalysis {
echo '</tr>'; echo '</tr>';
} }
else { else {
echo '<tr class="more_'.$sprid.' displayNone" >'; echo '<tr class="more_'.$sprid.' displayNone">';
echo '<td ' echo '<td '
.($_ans != null && $_ans != '' && self::$enableInspect == true ? ' mt_inspect' : '') .($_ans != null && $_ans != '' && self::$enableInspect == true ? ' mt_inspect' : '')
@ -4544,15 +4524,10 @@ class SurveyAnalysis {
'" href="javascript:void(0);" onclick="passMapData('.$sprid.', ' '" href="javascript:void(0);" onclick="passMapData('.$sprid.', '
.$key.', '.$loopid.', '.$anketa.');">'.$_ans.'</a>'; .$key.', '.$loopid.', '.$anketa.');">'.$_ans.'</a>';
} }
else {
echo '&nbsp;';
}
if($index == $_max_i){
#less - manj #less - manj
echo '<br />'; if($index == $_max_i){
echo '&nbsp;'; echo '<div class="srv_heatmap_info_more2_'.$sprid.' as_link multigrid_more displayNone" onclick="$(\'.more_'.$sprid.', .srv_heatmap_info_more_'.$sprid.', .srv_heatmap_info_more2_'.$sprid.' \').toggleClass(\'displayNone\');">'.$lang['srv_less'].'</div>';
echo '<div class="srv_heatmap_info_more2_'.$sprid.' as_link" onclick="$(\'.more_'.$sprid.', .srv_heatmap_info_more_'.$sprid.', .srv_heatmap_info_more2_'.$sprid.' \').toggle();">'.$lang['srv_less'].'</div>';
} }
echo '</td>'; echo '</td>';
@ -4561,7 +4536,7 @@ class SurveyAnalysis {
} }
} }
if ($_all_valid_answers_cnt > $index) { /*if ($_all_valid_answers_cnt > $index) {
$index++; $index++;
$cssBck = ' '.self::$cssColors['0_' . ($index & 1)]; $cssBck = ' '.self::$cssColors['0_' . ($index & 1)];
@ -4576,7 +4551,7 @@ class SurveyAnalysis {
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
} }*/
echo '</table>'; echo '</table>';
@ -6573,6 +6548,7 @@ class SurveyAnalysis {
public static function showspremenljivkaSingleVarPopup($id) { public static function showspremenljivkaSingleVarPopup($id) {
global $lang; global $lang;
global $site_url;
self::$_forceShowEmpty = true; self::$_forceShowEmpty = true;
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
@ -6596,13 +6572,11 @@ class SurveyAnalysis {
echo '<head>'; echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />'; echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
echo '<script type="text/javascript" src="script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="minify/g=jsnew"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="minify/g=css" media="screen" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="minify/g=cssPrint" media="print" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>'; echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
@ -6612,9 +6586,7 @@ class SurveyAnalysis {
echo '<!--[if IE 8]>'; echo '<!--[if IE 8]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<script>'; echo '<script>';
echo 'function chkstate(){'; echo 'function chkstate(){';
echo ' if(document.readyState=="complete"){'; echo ' if(document.readyState=="complete"){';
@ -6638,9 +6610,11 @@ class SurveyAnalysis {
echo "</script>"; echo "</script>";
echo '</head>'; echo '</head>';
echo '<body onBlur="window.close()" style="margin:5px; padding:5px;">'; echo '<body onBlur="window.close()" class="analysis_popup single_var">';
echo '<input type="hidden" name="podstran" id="srv_meta_podstran" value="' . $zaPodstran . '" />'; echo '<input type="hidden" name="podstran" id="srv_meta_podstran" value="' . $zaPodstran . '" />';
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />'; echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
$id = $_POST['id']; $id = $_POST['id'];
$spremenljivka = self::$_HEADERS[$id]; $spremenljivka = self::$_HEADERS[$id];
$_tip = self::getSpremenljivkaLegenda($spremenljivka,'tip'); $_tip = self::getSpremenljivkaLegenda($spremenljivka,'tip');
@ -6660,18 +6634,21 @@ class SurveyAnalysis {
echo '<div id="div_analiza_single_var" class="container"> '; echo '<div id="div_analiza_single_var" class="container"> ';
self:: showPreviewSpremenljivka($id); self:: showPreviewSpremenljivka($id);
echo '</div>'; echo '</div>';
echo '<div id="navigationBottom" class="printHide">'; echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>'; echo ' <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="icons/icons/printer.png" alt="'.$lang['hour_print2'].'" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<div class="clr"></div>';
echo '</div>'; echo '</div>';
echo '</body>'; echo '</body>';
echo '</html>'; echo '</html>';
} }
public static function showSpremenljivkaTextAnswersPopup($id,$seq) { public static function showSpremenljivkaTextAnswersPopup($id,$seq) {
global $lang; global $lang;
global $site_url;
self::$_forceShowEmpty = true; self::$_forceShowEmpty = true;
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
header('Pragma: no-cache'); header('Pragma: no-cache');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
@ -6684,13 +6661,11 @@ class SurveyAnalysis {
echo '<head>'; echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />'; echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
echo '<script type="text/javascript" src="script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="minify/g=jsnew"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="minify/g=css" media="screen" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="minify/g=cssPrint" media="print" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>'; echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
@ -6700,9 +6675,7 @@ class SurveyAnalysis {
echo '<!--[if IE 8]>'; echo '<!--[if IE 8]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<script>'; echo '<script>';
echo 'function chkstate(){'; echo 'function chkstate(){';
echo ' if(document.readyState=="complete"){'; echo ' if(document.readyState=="complete"){';
@ -6722,11 +6695,13 @@ class SurveyAnalysis {
echo '</script>'; echo '</script>';
echo '</head>'; echo '</head>';
echo '<body onBlur="window.close()" style="margin:5px; padding:5px;">'; echo '<body onBlur="window.close()" class="analysis_popup text_answers">';
echo '<input type="hidden" name="podstran" id="srv_meta_podstran" value="' . $zaPodstran . '" />'; echo '<input type="hidden" name="podstran" id="srv_meta_podstran" value="' . $zaPodstran . '" />';
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />'; echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
echo '<div id="div_analiza_single_var" class="container">'; echo '<div id="div_analiza_single_var" class="container">';
$id = $_POST['id']; $id = $_POST['id'];
$seq = $_POST['seq']; $seq = $_POST['seq'];
$zaPodstran = $_POST['zaPodstran']; $zaPodstran = $_POST['zaPodstran'];
@ -6751,11 +6726,11 @@ class SurveyAnalysis {
echo '<br />'; echo '<br />';
} }
echo '</div>'; echo '</div>';
echo '<div id="navigationBottom" class="printHide">'; echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>'; echo ' <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="icons/icons/printer.png" alt="'.$lang['hour_print2'].'" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<div class="clr"></div>';
echo '</div>'; echo '</div>';
echo '</body>'; echo '</body>';
echo '</html>'; echo '</html>';
} }
@ -6790,13 +6765,11 @@ class SurveyAnalysis {
echo '<head>'; echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />'; echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
echo '<script type="text/javascript" src="script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="minify/g=jsnew"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="minify/g=css" media="screen" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="minify/g=cssPrint" media="print" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;} .chart_settings {display: none;} .chart_holder{width: 800px;}';
echo '</style>';
echo '<!--[if lt IE 7]>'; echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
@ -6806,9 +6779,7 @@ class SurveyAnalysis {
echo '<!--[if IE 8]>'; echo '<!--[if IE 8]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<script>'; echo '<script>';
echo 'function chkstate(){'; echo 'function chkstate(){';
echo ' if(document.readyState=="complete"){'; echo ' if(document.readyState=="complete"){';
@ -6828,12 +6799,13 @@ class SurveyAnalysis {
echo '</script>'; echo '</script>';
echo '</head>'; echo '</head>';
#echo '<body onBlur="window.close()" style="margin:5px; padding:5px;">'; echo '<body class="analysis_popup single_var">';
echo '<body style="margin:5px; padding:5px;">';
echo '<input type="hidden" name="podstran" id="srv_meta_podstran" value="' . $zaPodstran . '" />'; echo '<input type="hidden" name="podstran" id="srv_meta_podstran" value="' . $zaPodstran . '" />';
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />'; echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $_REQUEST['anketa'] . '" />';
echo '<div id="div_analiza_single_var" class="container">'; echo '<div id="div_analiza_single_var" class="container">';
$id = $_POST['id']; $id = $_POST['id'];
$zaPodstran = $_POST['zaPodstran']; $zaPodstran = $_POST['zaPodstran'];
@ -6890,49 +6862,16 @@ class SurveyAnalysis {
$export = 'charts'; $export = 'charts';
break; break;
} }
//Izvoz v PDF/RTF
$loop_exp = (isset(self::$_CURRENT_LOOP)) ? self::$_CURRENT_LOOP['cnt'] : 'undefined';
$_url1 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode(
serialize(
array( 'b'=>'export',
'm'=>$export,
'anketa'=>$anketa,
'sprID'=>$id,
'loop'=>$loop_exp)));
$_url2 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode(
serialize(
array( 'b'=>'export',
'm'=>$export.'_rtf',
'anketa'=>$anketa,
'sprID'=>$id,
'loop'=>$loop_exp)));
$_url3 = $site_url.'admin/survey/izvoz.php?dc='.base64_encode(
serialize(
array( 'b'=>'export',
'm'=>$export.'_xls',
'anketa'=>$anketa,
'sprID'=>$id,
'loop'=>$loop_exp)));
echo '<div id="single_export" class="printHide">';
echo '<a href="'.$_url1.'" target="_blank"><span class="faicon pdf"></span></a>';
echo '&nbsp;&nbsp;<a href="'.$_url2.'" target="_blank"><span class="faicon rtf"></span>&nbsp;</a>';
//if($export == 'frequency')
if($zaPodstran != M_ANALYSIS_CHARTS )
{
echo '&nbsp;&nbsp;<a href="'.$_url3.'" target="_blank"><span class="faicon xls"></span>&nbsp;</a>';
}
} }
} }
echo '</div>'; echo '</div>';
echo '<div class="clr"></div>';
echo '<div id="navigationBottom" class="printHide">'; echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>'; echo ' <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="window.print();return false;"><span><img src="icons/icons/printer.png" alt="'.$lang['hour_print2'].'" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<div class="clr"></div>';
echo '</div>'; echo '</div>';
echo '</body>'; echo '</body>';
echo '</html>'; echo '</html>';
} }
@ -7157,6 +7096,7 @@ class SurveyAnalysis {
private static function printAnalizaSingleVar() { private static function printAnalizaSingleVar() {
global $lang; global $lang;
global $site_url;
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
header('Pragma: no-cache'); header('Pragma: no-cache');
@ -7178,13 +7118,11 @@ class SurveyAnalysis {
echo '<head>'; echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />'; echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
echo '<script type="text/javascript" src="script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="minify/g=jsnew"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="minify/g=css" media="screen" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="minify/g=cssPrint" media="print" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>'; echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
@ -7213,8 +7151,10 @@ class SurveyAnalysis {
echo '</script>'; echo '</script>';
echo '</head>'; echo '</head>';
echo '<body onBlur="window.close()" style="margin:5px; padding:5px;">'; echo '<body onBlur="window.close()" class="analysis_popup print_single_var">';
echo '<div class="container"> '; echo '<div class="container"> ';
$id = $_POST['id']; $id = $_POST['id'];
$zaPodstran = $_POST['zaPodstran']; $zaPodstran = $_POST['zaPodstran'];
switch ($zaPodstran) { switch ($zaPodstran) {
@ -7231,12 +7171,13 @@ class SurveyAnalysis {
self::displayFrequency($id); self::displayFrequency($id);
break; break;
} }
echo '</div>'; echo '</div>';
echo '<div id="navigationBottom" class="printHide">'; echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>'; echo ' <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="print_win(); return false;"><span><img src="icons/icons/printer.png" alt="'.$lang['hour_print2'].'" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<br class="clr"/>';
echo '</div>'; echo '</div>';
echo '</body>'; echo '</body>';
echo '</html>'; echo '</html>';
@ -7304,6 +7245,8 @@ class SurveyAnalysis {
function printPreviewSpremenljivka($spremenljivka) { function printPreviewSpremenljivka($spremenljivka) {
global $lang; global $lang;
global $site_url;
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
header('Pragma: no-cache'); header('Pragma: no-cache');
header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
@ -7325,13 +7268,11 @@ class SurveyAnalysis {
echo '<head>'; echo '<head>';
echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'; echo '<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />';
echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />'; echo '<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE8" />';
echo '<script type="text/javascript" src="script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/script/js-lang.php?lang='.($lang_admin==1?'si':'en').'"></script>';
echo '<script type="text/javascript" src="minify/g=jsnew"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="minify/g=css" media="screen" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="minify/g=cssPrint" media="print" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>'; echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
@ -7359,7 +7300,7 @@ class SurveyAnalysis {
echo '}'; echo '}';
echo '</script>'; echo '</script>';
echo '</head>'; echo '</head>';
echo '<body onBlur="window.close()" style="margin:5px; padding:5px;" >'; echo '<body onBlur="window.close()" class="analysis_popup print_preview">';
global $lang, $site_path; global $lang, $site_path;
@ -7412,28 +7353,33 @@ class SurveyAnalysis {
} }
echo '</div>';// id="spremenljivka_preview" echo '</div>';// id="spremenljivka_preview"
echo '<div id="navigationBottom" class="printHide">'; echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="close_win(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>'; echo ' <button class="medium blue" onclick="close_win(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="print_win(); return false;"><span><img src="icons/icons/printer.png" alt="'.$lang['hour_print2'].'" vartical-align="middle" /> '.$lang['hour_print2'].'</span></a></div></span>';
echo '<br class="clr"/>';
echo '</div>'; echo '</div>';
echo '</body>'; echo '</body>';
echo '</html>'; echo '</html>';
} }
static function show_sum_more_table() { static function show_sum_more_table() {
self :: $show_spid_div = false; self :: $show_spid_div = false;
self::$_LOOPS = SurveyZankaProfiles::getFiltersForLoops(); self::$_LOOPS = SurveyZankaProfiles::getFiltersForLoops();
if (count(self::$_LOOPS) == 0 ) { if (count(self::$_LOOPS) == 0 ) {
if ($_POST['podstran'] == M_ANALYSIS_SUMMARY) { if ($_POST['podstran'] == M_ANALYSIS_SUMMARY) {
self :: displaySums($_POST['spid']); self :: displaySums($_POST['spid']);
} else if ($_POST['podstran'] == M_ANALYSIS_SUMMARY_NEW) { }
else if ($_POST['podstran'] == M_ANALYSIS_SUMMARY_NEW) {
self :: displaySumsNew($_POST['spid']); self :: displaySumsNew($_POST['spid']);
} else if ($_POST['podstran'] == M_ANALYSIS_FREQUENCY) { }
else if ($_POST['podstran'] == M_ANALYSIS_FREQUENCY) {
self :: displayFrequency($_POST['spid']); self :: displayFrequency($_POST['spid']);
} }
} else { }
else {
# če mamo zanke # če mamo zanke
$loop_cnt = 0; $loop_cnt = 0;
foreach ( self::$_LOOPS AS $loop) { foreach ( self::$_LOOPS AS $loop) {
@ -7849,9 +7795,7 @@ class SurveyAnalysis {
echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>'; echo '<script type="text/javascript" src="'.$site_url.'admin/survey/minify/g=jsnew"></script>';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=css" media="screen" rel="stylesheet" />';
echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />'; echo '<link type="text/css" href="'.$site_url.'admin/survey/minify/g=cssPrint" media="print" rel="stylesheet" />';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<!--[if lt IE 7]>'; echo '<!--[if lt IE 7]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie6hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
@ -7861,9 +7805,7 @@ class SurveyAnalysis {
echo '<!--[if IE 8]>'; echo '<!--[if IE 8]>';
echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />'; echo '<link rel="stylesheet" href="<?=$site_url?>admin/survey/css/ie8hacks.css" type="text/css" />';
echo '<![endif]-->'; echo '<![endif]-->';
echo '<style>';
echo '.container {margin-bottom:45px;} #navigationBottom {width: 100%; background-color: #f2f2f2; border-top: 1px solid gray; height:25px; padding: 10px 30px 10px 0px !important; position: fixed; bottom: 0; left: 0; right: 0; z-index: 1000;}';
echo '</style>';
echo '<script>'; echo '<script>';
echo 'function chkstate(){'; echo 'function chkstate(){';
echo ' if(document.readyState=="complete"){'; echo ' if(document.readyState=="complete"){';
@ -7883,7 +7825,7 @@ class SurveyAnalysis {
echo '</script>'; echo '</script>';
echo '</head>'; echo '</head>';
echo '<body class="public_link analysis" style="margin:5px; padding:5px;" >'; echo '<body class="public_link analysis" style="margin:5px; padding:5px;">';
echo '<h2>'.$lang['srv_publc_analysis_title_for'].self::$survey['naslov'].'</h2>'; echo '<h2>'.$lang['srv_publc_analysis_title_for'].self::$survey['naslov'].'</h2>';
echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $anketa . '" />'; echo '<input type="hidden" name="anketa_id" id="srv_meta_anketa_id" value="' . $anketa . '" />';
@ -8100,32 +8042,36 @@ class SurveyAnalysis {
self::displaySpremenljivkaIcons($spid); self::displaySpremenljivkaIcons($spid);
# tekst vprašanja # tekst vprašanja
echo '<table class="anl_tbl anl_bt anl_bb tbl_clps">'; //zacetek tabele echo '<table class="anl_tbl anl_bt anl_bb tbl_clps">'; //zacetek tabele
# 1. vrstica - naslovna vrstica # 1. vrstica - naslovna vrstica
echo '<tr>'; echo '<tr class="row1">';
#variabla #variabla
echo '<td class="anl_bl anl_br anl_bb anl_ac anl_bck_freq_1 anl_w110">'; echo '<td class="cell_var">';
echo self::showVariable($spid, $spremenljivka['variable']); echo self::showVariable($spid, $spremenljivka['variable']);
echo '</td>'; echo '</td>';
#odgovori #odgovori
//echo '<td class="anl_br anl_bb anl_al anl_bck_freq_1" colspan="'.(!$lokacija ? (self::$_SHOW_LEGENDA ? 3+$_cols : 1+$_cols) : 3+$_cols).'"><span class="anl_variabla_label">'.$spremenljivka['naslov'].'</span>'; echo '<td class="cell_question" colspan="6">'.$spremenljivka['naslov'].'</span>';
echo '<td class="anl_br anl_bb anl_al anl_bck_freq_1" colspan="6"><span class="anl_variabla_label">'.$spremenljivka['naslov'].'</span>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
//konec 1. vrstice //konec 1. vrstice
//2. vrstica - prikazovanje povezave do heatmap //2. vrstica - prikazovanje povezave do heatmap
echo '<tr>'; echo '<tr class="row2">';
#variabla #variabla
echo '<td class="anl_bl anl_br anl_bb anl_ac anl_bck anl_w110">'; echo '<td>';
//self::showIcons($spid,$spremenljivka,$_from); //za enkrat skrijem ikone za izvoze in druge moznosti //self::showIcons($spid,$spremenljivka,$_from); //za enkrat skrijem ikone za izvoze in druge moznosti
echo '</td>'; echo '</td>';
echo '<td class="anl_br anl_bb anl_ac" colspan="6">'; echo '<td class="cell_subquestion" colspan="6">';
$sprid = explode('_',$spid); $sprid = explode('_',$spid);
$loopid = $sprid[1]; $loopid = $sprid[1];
$sprid = $sprid[0]; $sprid = $sprid[0];
@ -8145,80 +8091,83 @@ class SurveyAnalysis {
//Koordinate //Koordinate
//naslovna vrstica za koordinate //naslovna vrstica za koordinate
echo '<tr>'; echo '<tr class="row1">';
echo '<td class="anl_bl anl_br anl_bck anl_bb anl_ac" colspan="7">'; echo '<td class="cell_question" colspan="7">';
echo '<b>'.$lang['srv_analiza_heatmap_clicked_coords'].'</b>'; echo $lang['srv_analiza_heatmap_clicked_coords'];
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
//naslovna vrstica za koordinate - konec //naslovna vrstica za koordinate - konec
//vrstica s podnaslovi celic //vrstica s podnaslovi celic
echo '<tr>'; echo '<tr class="row2">';
echo '<td class="anl_variabla_line anl_bl anl_br anl_bb anl_bck anl_ac">'; echo '<td class="cell_value">';
echo $lang['coordinates']; echo $lang['coordinates'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_bl anl_br anl_bb anl_bck anl_ac anl_w70">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_opisne_valid_heatmap']; echo $lang['srv_analiza_opisne_valid_heatmap'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac anl_w70">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_num_units_valid_heatmap']; echo $lang['srv_analiza_num_units_valid_heatmap'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac anl_w70">'; echo '<td class="cell_value">';
echo $lang['srv_means_label']; echo $lang['srv_means_label'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac anl_w70">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_opisne_odklon']; echo $lang['srv_analiza_opisne_odklon'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac anl_w70">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_opisne_min']; echo $lang['srv_analiza_opisne_min'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac anl_w70">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_opisne_max']; echo $lang['srv_analiza_opisne_max'];
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
//vrstica s podnaslovi celic - konec //vrstica s podnaslovi celic - konec
//vrstica za x //vrstica za x
echo '<tr>'; echo '<tr>';
//1. stolpcev z imenom koordinate //1. stolpcev z imenom koordinate
echo '<td class="anl_bl anl_br anl_bb anl_ac">'; echo '<td class="cell_value">';
echo 'x'; echo 'x';
echo '</td>'; echo '</td>';
//1. stolpcev z imenom koordinate - konec //1. stolpcev z imenom koordinate - konec
//2. stolpec - Veljavni //2. stolpec - Veljavni
$validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers); $validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers);
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$validHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$validHeatmapRegion.'</td>';
//2. stolpec - Veljavni - konec //2. stolpec - Veljavni - konec
//3. stolpec - Ustrezni //3. stolpec - Ustrezni
$ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki $ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$ustrezniHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$ustrezniHeatmapRegion.'</td>';
//3. stolpec - Ustrezni - konec //3. stolpec - Ustrezni - konec
//4. stolpec - Povprecje //4. stolpec - Povprecje
$povprecjeHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $povprecjeHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$povprecjeHeatmapClicksX.'</td>'; echo '<td class="cell_value">'.$povprecjeHeatmapClicksX.'</td>';
//4. stolpec - Povprecje - konec //4. stolpec - Povprecje - konec
//5. stolpec - Standardni odklon //5. stolpec - Standardni odklon
$stdevHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $stdevHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$stdevHeatmapClicksX.'</td>'; echo '<td class="cell_value">'.$stdevHeatmapClicksX.'</td>';
//5. stolpec - Standardni odklon - konec //5. stolpec - Standardni odklon - konec
//6. stolpec - Minimum //6. stolpec - Minimum
$minHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $minHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$minHeatmapClicksX.'</td>'; echo '<td class="cell_value">'.$minHeatmapClicksX.'</td>';
//6. stolpec - Minimum - konec //6. stolpec - Minimum - konec
//7. stolpec - Max //7. stolpec - Max
$maxHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $maxHeatmapClicksX = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'x', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$maxHeatmapClicksX.'</td>'; echo '<td class="cell_value">'.$maxHeatmapClicksX.'</td>';
//7. stolpec - Max - konec //7. stolpec - Max - konec
echo '</tr>'; echo '</tr>';
@ -8227,37 +8176,37 @@ class SurveyAnalysis {
//vrstica za y //vrstica za y
echo '<tr>'; echo '<tr>';
//1. stolpcev z imenom koordinate //1. stolpcev z imenom koordinate
echo '<td class="anl_bl anl_br anl_bb anl_ac">'; echo '<td class="cell_value">';
echo 'y'; echo 'y';
echo '</td>'; echo '</td>';
//1. stolpcev z imenom koordinate - konec //1. stolpcev z imenom koordinate - konec
//2. stolpec - Veljavni //2. stolpec - Veljavni
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$validHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$validHeatmapRegion.'</td>';
//2. stolpec - Veljavni - konec //2. stolpec - Veljavni - konec
//3. stolpec - Ustrezni //3. stolpec - Ustrezni
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$ustrezniHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$ustrezniHeatmapRegion.'</td>';
//3. stolpec - Ustrezni - konec //3. stolpec - Ustrezni - konec
//4. stolpec - Povprecje //4. stolpec - Povprecje
$povprecjeHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $povprecjeHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'povprecje'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$povprecjeHeatmapClicksY.'</td>'; echo '<td class="cell_value">'.$povprecjeHeatmapClicksY.'</td>';
//4. stolpec - Povprecje - konec //4. stolpec - Povprecje - konec
//5. stolpec - Standardni odklon //5. stolpec - Standardni odklon
$stdevHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $stdevHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'stdev'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$stdevHeatmapClicksY.'</td>'; echo '<td class="cell_value">'.$stdevHeatmapClicksY.'</td>';
//5. stolpec - Standardni odklon - konec //5. stolpec - Standardni odklon - konec
//6. stolpec - Minimum //6. stolpec - Minimum
$minHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $minHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'min'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$minHeatmapClicksY.'</td>'; echo '<td class="cell_value">'.$minHeatmapClicksY.'</td>';
//6. stolpec - Minimum - konec //6. stolpec - Minimum - konec
//7. stolpec - Max //7. stolpec - Max
$maxHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),''); $maxHeatmapClicksY = self::formatNumber(self::heatmapClicksCalc($spremenljivka['grids'], $spid, $_valid_answers, 'y', $validHeatmapRegion, 'max'),SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$maxHeatmapClicksY.'</td>'; echo '<td class="cell_value">'.$maxHeatmapClicksY.'</td>';
//7. stolpec - Max - konec //7. stolpec - Max - konec
echo '</tr>'; echo '</tr>';
@ -8269,59 +8218,65 @@ class SurveyAnalysis {
$RegionPresent = self::HeatmapRegionPresence($spremenljivka['grids'], $spid, $_valid_answers); $RegionPresent = self::HeatmapRegionPresence($spremenljivka['grids'], $spid, $_valid_answers);
//preveri, ali je prisotno kaksno obmocje, nadaljuj izris tabele - konec //preveri, ali je prisotno kaksno obmocje, nadaljuj izris tabele - konec
if($RegionPresent){ //ce imamo obmocja //ce imamo obmocja
if($RegionPresent){
//3. vrstica - naslovna za obmocja //3. vrstica - naslovna za obmocja
echo '<tr>'; echo '<tr class="row1">';
echo '<td class="anl_bl anl_br anl_bck anl_bb anl_ac" colspan="7">'; echo '<td class="cell_question" colspan="7">';
echo '<b>'.$lang['srv_analiza_heatmap_clicked_regions'].'</b>'; echo '<b>'.$lang['srv_analiza_heatmap_clicked_regions'].'</b>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
//konec - 3. vrstice //konec - 3. vrstice
$_answersOther = array(); $_answersOther = array();
$_grids_count = count($spremenljivka['grids']); $_grids_count = count($spremenljivka['grids']);
$_css_bck = 'anl_bck_desc_2 anl_ac anl_bt_dot ';
$last = 0; $last = 0;
if ($_grids_count > 0) { if ($_grids_count > 0) {
$_row = $spremenljivka['grids'][0]; $_row = $spremenljivka['grids'][0];
$indeks = 0; $indeks = 0;
//$veljavnaSkupnaFreq = 0;
if (count($_row['variables'])>0) if (count($_row['variables'])>0)
foreach ($_row['variables'] AS $rid => $_col ){ foreach ($_row['variables'] AS $rid => $_col ){
$_sequence = $_col['sequence']; # id kolone z podatki $_sequence = $_col['sequence']; # id kolone z podatki
if ($_col['other'] != true) { if ($_col['other'] != true) {
echo '<tr>';
if($indeks == 0) //4. vrstica, naslovna vrstica //4. vrstica, naslovna vrstica
{ echo '<tr class="row2">';
echo '<td class="anl_variabla_line anl_bl anl_br anl_bb anl_bck anl_ac" colspan="2">';
if($indeks == 0){
echo '<td class="cell_value" colspan="2">';
echo $lang['srv_hot_spot_regions_menu']; echo $lang['srv_hot_spot_regions_menu'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_opisne_frequency_heatmap']; echo $lang['srv_analiza_opisne_frequency_heatmap'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_opisne_valid_heatmap']; echo $lang['srv_analiza_opisne_valid_heatmap'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac">'; echo '<td class="cell_value">';
echo '% - '.$lang['srv_analiza_opisne_valid_heatmap']; echo '% - '.$lang['srv_analiza_opisne_valid_heatmap'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac">'; echo '<td class="cell_value">';
echo $lang['srv_analiza_num_units_valid_heatmap']; echo $lang['srv_analiza_num_units_valid_heatmap'];
echo '</td>'; echo '</td>';
echo '<td class="anl_variabla_line anl_br anl_bb anl_bck anl_ac">'; echo '<td class="cell_value">';
echo '% - '.$lang['srv_analiza_num_units_valid_heatmap']; echo '% - '.$lang['srv_analiza_num_units_valid_heatmap'];
echo '</td>'; echo '</td>';
}else //od 5. vrstice dalje, kjer so po vrsticah obmocja in njihovi podatki }
{ //od 5. vrstice dalje, kjer so po vrsticah obmocja in njihovi podatki
else{
//1. stolpcev z imenom obmocja //1. stolpcev z imenom obmocja
echo '<td class="anl_bl anl_br anl_bb anl_ac" colspan="2">'; echo '<td class="cell_value" colspan="2">';
echo $_col['naslov']; echo $_col['naslov'];
echo '</td>'; echo '</td>';
//1. stolpcev z imenom obmocja - konec //1. stolpcev z imenom obmocja - konec
@ -8329,29 +8284,29 @@ class SurveyAnalysis {
//2. stolpec - Frekvenca //2. stolpec - Frekvenca
$freqHeatmapRegion = self::freqHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers, $indeks); $freqHeatmapRegion = self::freqHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers, $indeks);
$veljavnaSkupnaFreq = $veljavnaSkupnaFreq + $freqHeatmapRegion; $veljavnaSkupnaFreq = $veljavnaSkupnaFreq + $freqHeatmapRegion;
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$freqHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$freqHeatmapRegion.'</td>';
//2. stolpec - Frekvenca - konec //2. stolpec - Frekvenca - konec
//3. stolpec - Veljavni //3. stolpec - Veljavni
//$validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers); //$validHeatmapRegion = self::validHeatmapRegion($spremenljivka['grids'], $spid, $_valid_answers);
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$validHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$validHeatmapRegion.'</td>';
//3. stolpec - Veljavni - konec //3. stolpec - Veljavni - konec
//4. stolpec - % Veljavni //4. stolpec - % Veljavni
$_procentValidHeatmapRegion = ($validHeatmapRegion > 0 ) ? 100*$freqHeatmapRegion / $validHeatmapRegion : 0; $_procentValidHeatmapRegion = ($validHeatmapRegion > 0 ) ? 100*$freqHeatmapRegion / $validHeatmapRegion : 0;
$_procentValidHeatmapRegion = self::formatNumber($_procentValidHeatmapRegion, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); $_procentValidHeatmapRegion = self::formatNumber($_procentValidHeatmapRegion, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$_procentValidHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$_procentValidHeatmapRegion.'</td>';
//4. stolpec - % Veljavni - konec //4. stolpec - % Veljavni - konec
//5. stolpec - Ustrezni //5. stolpec - Ustrezni
$ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki $ustrezniHeatmapRegion = self::ustrezniHeatmapRegion($spid, $_valid_answers, $_sequence); //vsi mozni kliki
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$ustrezniHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$ustrezniHeatmapRegion.'</td>';
//5. stolpec - Ustrezni - konec //5. stolpec - Ustrezni - konec
//6. stolpec - % Ustrezni //6. stolpec - % Ustrezni
$_procentUstrezniHeatmapRegion = ($ustrezniHeatmapRegion > 0 ) ? 100*$freqHeatmapRegion / $ustrezniHeatmapRegion : 0; $_procentUstrezniHeatmapRegion = ($ustrezniHeatmapRegion > 0 ) ? 100*$freqHeatmapRegion / $ustrezniHeatmapRegion : 0;
$_procentUstrezniHeatmapRegion = self::formatNumber($_procentUstrezniHeatmapRegion, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%'); $_procentUstrezniHeatmapRegion = self::formatNumber($_procentUstrezniHeatmapRegion, SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_PERCENT'),'%');
echo '<td class="anl_bl anl_br anl_bb anl_ac">'.$_procentUstrezniHeatmapRegion.'</td>'; echo '<td class="cell_value">'.$_procentUstrezniHeatmapRegion.'</td>';
//6. stolpec - % Ustrezni - konec //6. stolpec - % Ustrezni - konec
} }
@ -8359,8 +8314,9 @@ class SurveyAnalysis {
echo '</tr>'; echo '</tr>';
//*********** Izris veljavnih in manjkajocih vrednosti //*********** Izris veljavnih in manjkajocih vrednosti
if($indeks != 0) //ce ni naslovna vrsticam je potrebno dodati se dodatne poglede veljavnih in manjkajocih vrednosti //ce ni naslovna vrsticam je potrebno dodati se dodatne poglede veljavnih in manjkajocih vrednosti
{ if($indeks != 0){
echo '<tr>'; echo '<tr>';
$counter = 0; $counter = 0;
$options['isTextAnswer'] = false; $options['isTextAnswer'] = false;
@ -8379,6 +8335,7 @@ class SurveyAnalysis {
#izpišemo še skupno sumo #izpišemo še skupno sumo
$counter = self::outputSumaHeatmap($counter,$_sequence,$spid,$options, $ustrezniHeatmapRegion); $counter = self::outputSumaHeatmap($counter,$_sequence,$spid,$options, $ustrezniHeatmapRegion);
echo '</tr>'; echo '</tr>';
$veljavnaSkupnaFreq = 0; $veljavnaSkupnaFreq = 0;
} }
//*********** Izris veljavnih in manjkajocih vrednosti - konec //*********** Izris veljavnih in manjkajocih vrednosti - konec
@ -8393,7 +8350,7 @@ class SurveyAnalysis {
echo '</table>'; echo '</table>';
# izpišemo še tekstovne odgovore za polja drugo # izpišemo še tekstovne odgovore za polja drugo
if (count($_answersOther) > 0 && self::$_FILTRED_OTHER) { if (is_countable($_answersOther) && count($_answersOther) > 0 && self::$_FILTRED_OTHER) {
foreach ($_answersOther AS $oAnswers) { foreach ($_answersOther AS $oAnswers) {
echo '<div class="div_other_text">'; echo '<div class="div_other_text">';
self::outputOtherAnswers($oAnswers); self::outputOtherAnswers($oAnswers);

3299
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

7
resources/sass/admin_new/pages/survey_analysis/basic.scss
View File

@ -6,7 +6,8 @@
.report_element_data, .report_element_data,
#arch_body_div, #arch_body_div,
.public_link.analysis #analiza_data, .public_link.analysis #analiza_data,
.public_link.creport #analiza_data{ .public_link.creport #analiza_data,
.analysis_popup{
.div_analiza_holder { .div_analiza_holder {
display: flex; display: flex;
@ -249,6 +250,10 @@
border-bottom: 1px $gray dashed; border-bottom: 1px $gray dashed;
} }
} }
.multigrid_more{
margin-top: 8px;
}
} }
// 1. header vrstica // 1. header vrstica

26
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -134,3 +134,29 @@
} }
} }
// Okno, ki se odpre
.analysis_popup{
padding: 8px;
.container{
.div_analiza_holder{
margin-bottom: 0 !important;
}
.faicon.dots,
.options{
display: none;
}
}
#navigationBottom{
display: flex;
justify-content: flex-end;
margin-top: 32px;
}
}