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

Redesign - analize - opisne

Browse Source
This commit is contained in:
pero1203 2022-01-27 11:57:12 +01:00
parent 4a5f788897
commit 9bcb371ad8
6 changed files with 1724 additions and 1532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -608,24 +608,24 @@ class SurveyAnalysis {
}
echo '<table class="anl_tbl anl_ba" >';
echo '<table class="table_desc" >';
echo '<tr class="row1">';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w90">&nbsp;<span>'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb anl_w110">' . $lang['srv_analiza_opisne_variable'] .'<span>'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_variable_text'] .'<span>'.'</span></td>';
echo '<td class="col_icons anl_w90">&nbsp;<span>'.'</span></td>';
echo '<td class="col_var anl_w110">' . $lang['srv_analiza_opisne_variable'] .'<span>'.'</span></td>';
echo '<td class="col_question">' . $lang['srv_analiza_opisne_variable_text'] .'<span>'.'</span></td>';
if (self::$_SHOW_LEGENDA) {
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_variable_type'] .'<span >'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_variable_expression'] .'<span >'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_variable_skala'] .'<span >'.'</span></td>';
echo '<td class="col_info">' . $lang['srv_analiza_opisne_variable_type'] .'<span >'.'</span></td>';
echo '<td class="col_info">' . $lang['srv_analiza_opisne_variable_expression'] .'<span >'.'</span></td>';
echo '<td class="col_info">' . $lang['srv_analiza_opisne_variable_skala'] .'<span >'.'</span></td>';
}
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_m'] .'<span >'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_num_units'] .'<span >'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_povprecje_odstotek'] .'<span >'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb">' . $lang['srv_analiza_opisne_odklon'] .'<span >'.'</span></td>';
echo '<td class="anl_br anl_ac anl_bck anl_variabla_line anl_bb" >' . $lang['srv_analiza_opisne_min'] .'<span >'.'</span></td>';
echo '<td class=" anl_ac anl_bck anl_variabla_line anl_bb" >' . $lang['srv_analiza_opisne_max'] .'<span >'.'</span></td>';
echo '<td class="col_value">' . $lang['srv_analiza_opisne_m'] .'<span >'.'</span></td>';
echo '<td class="col_value">' . $lang['srv_analiza_num_units'] .'<span >'.'</span></td>';
echo '<td class="col_value">' . $lang['srv_analiza_opisne_povprecje_odstotek'] .'<span >'.'</span></td>';
echo '<td class="col_value">' . $lang['srv_analiza_opisne_odklon'] .'<span >'.'</span></td>';
echo '<td class="col_value" >' . $lang['srv_analiza_opisne_min'] .'<span >'.'</span></td>';
echo '<td class="col_value" >' . $lang['srv_analiza_opisne_max'] .'<span >'.'</span></td>';
echo '</tr>';
@ -691,6 +691,7 @@ class SurveyAnalysis {
} //else: if (!$show_enota)
} // end if $spremenljivka['tip'] != 'm'
} // end foreach self::$_HEADERS
echo '</table >';
// Izrisemo ikone na dnu
@ -712,7 +713,9 @@ class SurveyAnalysis {
$cssBack = $variable['other'] != 1 ? ' anl_bck_desc_2' : ' anl_bck_desc_3';
$cssMove = $variable['other'] != 1 ? ' anl_tin' : ' anl_tin1';
$cssBack .= (int)$grid['new_grid'] == 1 ? ' anl_bt ' : ' anl_bt_dot ';
$_sequence = $variable['sequence']; # id kolone z podatki
if ($_sequence != null) {
$_desc = self::$_DESCRIPTIVES[$_sequence];
}
@ -720,43 +723,40 @@ class SurveyAnalysis {
# pokličemo objekt SpremenljivkaSkala
$objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']);
# če smo na začetku grida dodamo podatke podvprašanja
if ($variable['var_cnt'] == 0 && in_array($spremenljivka['tip'],array(16,19,20) ) ) {
echo '<tr>';
echo '<td class="anl_bck anl_ac anl_br link_no_decoration">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_variabla_sub anl_double_bt anl_bb">';
echo '<tr class="row_grid">';
echo '<td class="col_icons">&nbsp;</td>';
echo '<td class="col_var">';
echo $grid['variable'];
echo '</td>';
echo '<td class="anl_al anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb" colspan="'.(self::$_SHOW_LEGENDA ? '10' : '7').'">';
echo '<td class="col_question" colspan="'.(self::$_SHOW_LEGENDA ? '10' : '7').'">';
echo $grid['naslov'];
echo '</td>';
/*
if (self::$_SHOW_LEGENDA) {
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
}
echo '<td class="anl_ac ss=anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td cla"anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
echo '<td class="anl_ac anl_br link_no_decoration anl_bck_desc_1 anl_double_bt anl_bb">&nbsp;</td>';
*/
echo '</tr>';
}
echo '<tr>';
echo '<td class="anl_bck anl_ac anl_br link_no_decoration">';
echo '<tr class="row_var">';
echo '<td class="col_icons">';
echo '&nbsp;';
echo '</td>';
echo '<td class="'.$cssBack.' anl_ac anl_br link_no_decoration anl_variabla_sub">';
echo '<td class="'.$cssBack.' col_var">';
echo $variable['variable'];
echo '</td>';
echo '<td class="' . $cssBack . $cssMove . ' anl_br">';
//echo $grid['naslov'] . ' - ' .$variable['naslov'];
echo '<td class="' . $cssBack . $cssMove . ' col_question">';
echo $variable['naslov'];
echo ($spremenljivka['enota'] == 1) ? ' - '.$variable['naslov2'] : '';
echo '</td>';
if (self::$_SHOW_LEGENDA) {
if ($variable['other'] != '1' && $variable['text'] != '1') {
$_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje');
@ -765,16 +765,18 @@ class SurveyAnalysis {
$_tip = $lang['srv_analiza_vrsta_bese'];
$_oblika = $lang['srv_analiza_oblika_nomi'];
}
echo '<td class="' . $cssBack . ' anl_ac anl_br" title="'.$_tip.'">'.'&nbsp;'.'</td>';
echo '<td class="' . $cssBack . ' anl_ac anl_br" title="'.$_tip.'">'.$_tip.'</td>';
echo '<td class="' . $cssBack . ' anl_ac anl_br" title="'.$_oblika.'">' .$_oblika. '</td>';
echo '<td class="' . $cssBack . ' col_info" title="'.$_tip.'">'.'&nbsp;'.'</td>';
echo '<td class="' . $cssBack . ' col_info" title="'.$_tip.'">'.$_tip.'</td>';
echo '<td class="' . $cssBack . ' col_info" title="'.$_oblika.'">' .$_oblika. '</td>';
}
#veljavno
echo '<td class="' . $cssBack . ' anl_br anl_ac">'.(int)$_desc['validCnt'].'</td>';
echo '<td class="' . $cssBack . ' col_value">'.(int)$_desc['validCnt'].'</td>';
#ustrezno
echo '<td class="' . $cssBack . ' anl_br anl_ac">'.(int)$_desc['allCnt'].'</td>';
echo '<td class="' . $cssBack . ' anl_br anl_ac">';
echo '<td class="' . $cssBack . ' col_value">'.(int)$_desc['allCnt'].'</td>';
echo '<td class="' . $cssBack . ' col_value">';
if ( isset($_desc['avg']) && (int)$objectSkala->getSkala() !== 1 ) {
@ -783,17 +785,17 @@ class SurveyAnalysis {
echo self::formatNumber($_desc['avg']*100,SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'&nbsp;%');
}
echo '</td>';
echo '<td class="' . $cssBack . ' anl_br anl_ac">';
echo '<td class="' . $cssBack . ' col_value">';
if (isset($_desc['div']) && (int)$objectSkala->getSkala() !== 1) {
echo self::formatNumber($_desc['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),'');
}
echo '</td>';
echo '<td class="' . $cssBack . ' anl_br anl_ac">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').'</td>';
echo '<td class="' . $cssBack . ' anl_ac">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').'</td>';
echo '<td class="' . $cssBack . ' col_value">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').'</td>';
echo '<td class="' . $cssBack . ' col_value">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').'</td>';
echo '</tr>';
}
/** Izriše vrstico z opisnimi
*
* @param unknown_type $spremenljivka
@ -801,7 +803,9 @@ class SurveyAnalysis {
*/
static function displayDescriptivesSpremenljivkaRow($spid,$spremenljivka,$show_enota,$_sequence = null) {
global $lang;
$cssBack = " anl_bck_desc_1";
if ($_sequence != null) {
$_desc = self::$_DESCRIPTIVES[$_sequence];
}
@ -809,15 +813,20 @@ class SurveyAnalysis {
# pokličemo objekt SpremenljivkaSkala
$objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']);
echo '<tr>';
echo '<td class="anl_bck anl_ac anl_br anl_bt link_no_decoration">';
echo '<tr class="row_question">';
echo '<td class="col_icons">';
self::showIcons($spid,$spremenljivka,'desc');
echo '</td>';
echo '<td class="'.$cssBack.' anl_ac anl_br anl_bt">';
echo '<td class="'.$cssBack.' col_var">';
self::showVariable($spid,$spremenljivka['variable']);
echo '</td>';
echo '<td class="' . $cssBack . ' anl_br anl_bt">';
echo '<td class="' . $cssBack . ' col_question">';
echo ($spremenljivka['naslov']) . '</td>';
if (self::$_SHOW_LEGENDA) {
if ($variable['other'] != '1' && $variable['text'] != '1') {
$_tip = self::getSpremenljivkaLegenda($spremenljivka,'izrazanje');
@ -826,33 +835,36 @@ class SurveyAnalysis {
$_tip = $lang['srv_analiza_vrsta_bese'];
$_oblika = $lang['srv_analiza_oblika_nomi'];
}
echo '<td class="' . $cssBack . ' anl_ac anl_br anl_bt" title="'.$_tip.'">'.
self::getSpremenljivkaLegenda($spremenljivka,'tip')
.'</td>';
echo '<td class="' . $cssBack . ' anl_ac anl_br anl_bt" title="'.$_tip.'">'.(!$show_enota ? $_tip : '&nbsp').'</td>';
echo '<td class="' . $cssBack . ' anl_ac anl_br anl_bt" title="'.$_oblika.'">'.(!$show_enota ? $_oblika : '&nbsp;'). '</td>';
echo '<td class="' . $cssBack . ' col_info" title="'.$_tip.'">'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</td>';
echo '<td class="' . $cssBack . ' col_info" title="'.$_tip.'">'.(!$show_enota ? $_tip : '&nbsp').'</td>';
echo '<td class="' . $cssBack . ' col_info" title="'.$_oblika.'">'.(!$show_enota ? $_oblika : '&nbsp;'). '</td>';
}
#veljavno
echo '<td class="' . $cssBack . ' anl_br anl_ac anl_bt">'.(!$show_enota ? (int)$_desc['validCnt'] : '&nbsp;') .'</td>';
#ustrezno
echo '<td class="' . $cssBack . ' anl_br anl_ac anl_bt">'.(!$show_enota ? (int)$_desc['allCnt'] : '&nbsp;').'</td>';
echo '<td class="' . $cssBack . ' anl_br anl_ac anl_bt">';
#veljavno
echo '<td class="' . $cssBack . ' col_value">'.(!$show_enota ? (int)$_desc['validCnt'] : '&nbsp;') .'</td>';
#ustrezno
echo '<td class="' . $cssBack . ' col_value">'.(!$show_enota ? (int)$_desc['allCnt'] : '&nbsp;').'</td>';
echo '<td class="' . $cssBack . ' col_value">';
if (isset($_desc['avg']) && (int)$objectSkala->getSkala() !== 1) {
echo self::formatNumber($_desc['avg'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_AVERAGE'),'');
}
echo '</td>';
echo '<td class="' . $cssBack . ' anl_br anl_ac anl_bt">';
echo '<td class="' . $cssBack . ' col_value">';
if (isset($_desc['div']) && (int)$objectSkala->getSkala() !== 1) {
echo self::formatNumber($_desc['div'],SurveyDataSettingProfiles :: getSetting('NUM_DIGIT_DEVIATION'),'');
}
echo '</td>';
echo '<td class="' . $cssBack . ' anl_br anl_ac anl_bt">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').'</td>';
echo '<td class="' . $cssBack . ' anl_ac anl_bt">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').'</td>';
echo '<td class="' . $cssBack . ' col_value">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['min'] : '').'</td>';
echo '<td class="' . $cssBack . ' col_value">'.((int)$objectSkala->getSkala() !== 1 ? $_desc['max'] : '').'</td>';
echo '</tr>';
}
/** Izrišemo fekvence
*
*/
@ -5218,8 +5230,7 @@ class SurveyAnalysis {
static public function showIcons($spid, $spremenljivka, $_from = 'freq', $additional=array()) {
global $lang;
$sccFloat = 'taCenter ';
#kateri skin
$skin = 0;
$options = array('sums'=>true,'sums*'=>true,'desc'=>true,'freq'=>true,'sums_spec'=>false);
@ -5549,7 +5560,7 @@ class SurveyAnalysis {
// Javna povezava nima teh ikon
if ($printIcon == false && self::$printPreview == false) {
echo '<span class="'.$sccFloat.'printHide iconHide">';
echo '<div class="analysis_icons_holder">';
if ($options['sums'] == true) {
if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3 ) {
@ -5558,13 +5569,13 @@ class SurveyAnalysis {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
}
echo '<span class="faicon an_sigma large '.($_from == 'sums' ? '' : 'icon-blue_soft_link').'" title="' . $lang['srv_analysis_icon_sumary'] . '"></span> ';
echo '<span class="faicon an_sigma" title="' . $lang['srv_analysis_icon_sumary'] . '"></span> ';
echo '</a>';
}
if ($options['sums_spec'] == true) {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_sigmax large '.($_from == 'sums*' ? '' : 'icon-blue_soft_link').'" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '<span class="faicon an_sigmax" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '</a>';
}
@ -5574,17 +5585,19 @@ class SurveyAnalysis {
}else {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
}
echo '<span class="faicon an_freqx large '.($_from == 'sums*' ? '' : 'icon-blue_soft_link').'" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '<span class="faicon an_freqx" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '</a>';
}
if ($options['desc'] == true) {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_DESCRIPTOR.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_stat large '.($_from == 'desc' ? '' : 'icon-blue_soft_link').'" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> ';
echo '<span class="faicon an_stat" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> ';
echo '</a>';
}
if ($options['freq'] == true) {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_FREQUENCY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_freq large '.($_from == 'freq' ? '' : 'icon-blue_soft_link').'" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> ';
echo '<span class="faicon an_freq" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> ';
echo '</a>';
}
@ -5611,15 +5624,13 @@ class SurveyAnalysis {
$type=4;
break;
}
if ($showReport == true) {
SurveyAnalysisHelper::getInstance()->addCustomReportElement($type, $sub_type=0, $spid);
}
echo '</span>';
} else {
}
echo '</div>';
}
}
@ -7239,44 +7250,44 @@ class SurveyAnalysis {
// Nastavitve na dnu pri sumarniku
if($page == 'sums'){
echo '<a href="#" onClick="addCustomReportAllElementsAlert(1);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport" style="margin-right: 40px;"><span class="spaceRight faicon comments_creport" ></span><span class="bold">'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<a href="#" onClick="addCustomReportAllElementsAlert(1);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="#" onClick="printAnaliza(\'Sumarnik\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums&anketa=' . self::$sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums&anketa=' . self::$sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=sums_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv black very_large"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail black very_large"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail"></span></a>';
}
// Nastavitve na dnu pri frekvencah
elseif($page == 'freq'){
echo '<a href="#" onClick="addCustomReportAllElementsAlert(2);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport" style="margin-right: 40px;"><span class="spaceRight faicon comments_creport" ></span><span class="bold">'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<a href="#" onClick="addCustomReportAllElementsAlert(2);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<a href="#" onClick="printAnaliza(\'Frekvence\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency&anketa=' . self::$sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls black very_large"></span></a>';
echo '<a href="#" onClick="printAnaliza(\'Frekvence\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency&anketa=' . self::$sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=frequency_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv black very_large"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail black very_large"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail"></span></a>';
}
// Nastavitve na dnu pri opisnih statistikah
else{
echo '<a href="#" onClick="addCustomReportAllElementsAlert(3);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport" style="margin-right: 40px;"><span class="spaceRight faicon comments_creport" ></span><span class="bold">'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<a href="#" onClick="addCustomReportAllElementsAlert(3);" title="'.$lang['srv_custom_report_comments_add_hover'].'" class="'.(!$userAccess->checkUserAccess('analysis_analysis_creport') ? 'user_access_locked' : '').'" user-access="analysis_analysis_creport"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<a href="#" onClick="printAnaliza(\'Opisne statistike\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics&anketa=' . self::$sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls black very_large"></span></a>';
echo '<a href="#" onClick="printAnaliza(\'Opisne statistike\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics&anketa=' . self::$sid) . '" target="_blank"'.$lan_pdf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon pdf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_rtf&anketa=' . self::$sid) . '" target="_blank"'.$lan_rtf.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon rtf"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?b=export&m=statistics_xls&anketa=' . self::$sid) . '" target="_blank"'.$lan_xls.' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_export') ? 'user_access_locked' : '').'" user-access="analysis_export"><span class="faicon xls"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv black very_large"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail black very_large"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv"></span></a>';
echo '<a href="#" onclick="createArchiveBeforeEmail();" title="'.$lang['srv_analiza_arhiviraj_email_ttl'] . '" class="'.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').'" user-access="archive"><span class="faicon arhiv_mail"></span></a>';
}
}
@ -7342,7 +7353,7 @@ class SurveyAnalysis {
'sprID'=>$id,
'loop'=>$loop)));
$return = '<span class="faicon print_small icon-grey_dark_link" onclick="printCurrentAnalysis(\''.$id.'\');"></span>&nbsp;&nbsp';
$return = '<span class="faicon print_small" onclick="printCurrentAnalysis(\''.$id.'\');"></span>&nbsp;&nbsp';
$userAccess = UserAccess::getInstance($global_user_id);
if($userAccess->checkUserAccess($what='data_export')){

2883
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

16
resources/sass/admin_new/basic/icons/analiza.scss
View File

@ -14,49 +14,33 @@ span.faicon.an_sigma::before {
font-family: $font_family;
font-weight: 700;
content: "Σ";
vertical-align: middle;
}
span.faicon.an_sigmax::before {
font-family: $font_family;
font-weight: 700;
content: "Σ*";
vertical-align: middle;
margin-left: 3px;
}
span.faicon.an_freq::before {
font-family: $font_family;
font-weight: 700;
font-style: italic;
content: "f";
vertical-align: middle;
margin-left: 3px;
}
span.faicon.an_freqx::before {
font-family: $font_family;
font-weight: 700;
font-style: italic;
content: "f*";
vertical-align: middle;
margin-left: 3px;
}
span.faicon.an_stat::before {
font-family: $font_family;
font-weight: 700;
font-style: italic;
content: "s";
vertical-align: middle;
margin-left: 3px;
}
span.faicon.an_chart_bar::before {
font-size: 14px;
font-weight: 700;
/*content: "\f080";*/
content: "\f200";
margin-left: 3px;
}

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

@ -1,4 +1,3 @@
#div_analiza_data {
.div_analiza_holder {
@ -50,16 +49,49 @@
border: 1px $gray solid;
table tr td{
border: 0;
}
// Prvi stolpec
&.anl_w110{
width: 112px;
span{
font-size: 14px;
line-height: 18px;
}
// Stolpec z ikonami
&.col_icons{
width: 110px;
text-align: center;
}
// Stolpec z variablo
&.col_var{
width: 110px;
text-align: left;
}
// Stolpec z vprasanjem
&.col_question{
width: auto;
text-align: left;
}
// Stolpec z legendo
&.col_info{
width: 110px;
text-align: left;
}
// Stolpec z vrednostjo
&.col_value{
width: 110px;
text-align: right;
}
// Razmik
&.cll_clps{
padding: 0;
@ -95,6 +127,11 @@
line-height: 19px;
background-color: $light-gray;
// Stolpec z vrednostmi
&.anl_w70{
text-align: center;
}
}
}
@ -106,6 +143,21 @@
}
}
&.row_question{
td{
font-weight: 600;
}
}
&.row_grid{
}
&.row_var{
}
&.sum{
td{
@ -120,16 +172,57 @@
}
}
}
}
}
.analysis_bottom_settings{
display: flex;
align-items: center;
justify-content: center;
margin-top: 64px;
a{
margin: 0 16px;
font-size: 16px;
font-weight: 400;
text-decoration: none;
color: $black;
.faicon{
&:before{
margin-right: 8px;
color: $blue;
font-size: 20px;
}
&.arhiv_mail:before{
font-weight: 600;
}
&.comments:before{
font-weight: 400;
}
&.pdf:before{
color: $red;
}
&.rtf{
}
&.xls:before{
color: $green;
}
}
}
}
iframe#ifmcontentstoprint {
border: 0;
}

32
resources/sass/admin_new/pages/survey_analysis/icons.scss Normal file
View File

@ -0,0 +1,32 @@
// Ikone (frekvenca, suma...)
.analysis_icons_holder{
display: flex;
align-items: center;
justify-content: center;
>a{
margin-right: 8px;
&:last-of-type{
margin-right: 0;
}
.faicon{
&:before{
font-size: 16px;
}
&.an_freq,
&.an_freqx,
&.an_stat,
&.an_sigma,
&.an_sigmax{
&:before{
font-size: 22px;
}
}
}
}
}

1
resources/sass/admin_new/pages/survey_analysis/survey_analysis.scss
View File

@ -1,5 +1,6 @@
@import "basic";
@import "preview";
@import "icons";
@import "sums";
@import "freq";