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

Redesign - analize - naknadni popravki, opozorilo za testne podatke

Browse Source
This commit is contained in:
pero1203 2022-02-02 11:26:47 +01:00
parent 430cbdd6a4
commit d487cb4908
13 changed files with 373 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -239,18 +239,18 @@ class SurveyStaticHtml
$query_autogen_testdata = sisplet_query($str_autogen_testdata);
list($autogen_testdata) = mysqli_fetch_row($query_autogen_testdata);
echo '<div class="display_data_test_data_note"><span class="faicon warning icon-orange spaceRight"></span> ';
echo '<div class="display_data_test_data_note">';
echo '<div class="title">';
echo ' <span class="faicon warning"></span> '.$lang['srv_testni_podatki_alert_title'];
echo '</div>';
echo $lang['srv_testni_podatki_alert'] . ' <a href="#" onClick="delete_test_data();">' . $lang['srv_delete_testdata'] . '</a>';
echo ' (' . $testdata . '). ';
echo $lang['srv_testni_podatki_alert'] . ' <a href="#" onClick="delete_test_data();">'.$lang['srv_delete_testdata'].' ('.$testdata.')</a>.';
if ($autogen_testdata > 0) {
echo $lang['srv_autogen_testni_podatki_alert'] . ' <a href="index.php?anketa=' . $this->sid . '&a=testiranje&m=testnipodatki&delete_autogen_testdata=1">' . $lang['srv_delete_autogen_testdata'] . '</a>';
echo ' (' . $autogen_testdata . '). ';
echo ' '.$lang['srv_autogen_testni_podatki_alert'].' <a href="index.php?anketa=' . $this->sid . '&a=testiranje&m=testnipodatki&delete_autogen_testdata=1">'.$lang['srv_delete_autogen_testdata'].' ('.$autogen_testdata.')</a>.';
}
if ($showAnalizeCheckbox == true && false) {
# print_r("<pre>");
# print_r($_SESSION);
session_start();
$checked = (isset($_SESSION['testData'][$this->sid]['includeTestData']) && $_SESSION['testData'][$this->sid]['includeTestData'] == 'false') ? '' : ' checked="checked"';
echo '&nbsp;<label><input id="cnx_include_test_data" type="checkbox"' . $checked . ' onchange="surveyAnalisysIncludeTestData();" autocomplete="off">V analizah upoštevaj tudi testne vnose.';

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

@ -1902,9 +1902,20 @@ class SurveyAnalysis {
if (self::$_SHOW_LEGENDA) {
echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
}
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'"><a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">&nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'"><a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">&nbsp;(<span title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '</td>';
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
echo ' &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
echo ' &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '</td>';
echo '</tr>';
@ -1926,9 +1937,9 @@ class SurveyAnalysis {
echo '<td class="cell_grid" colspan="'.($_clmn_cnt).'">';
echo $lang['srv_analiza_opisne_answers'].'&nbsp;';
echo '<span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp;(<span class="blue">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo '<span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp;(<span class="blue">f&nbsp;</span>/&nbsp;%)</a></span>';
echo '<span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp;(f&nbsp;/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo '</td>';
echo '<td class="cell_value">'.$lang['srv_analiza_opisne_valid'].'</td>';
@ -2055,9 +2066,20 @@ class SurveyAnalysis {
if (self::$_SHOW_LEGENDA) {
echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
}
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'"><a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">&nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'"><a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">&nbsp;(<span title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '</td>';
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
echo ' &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
echo ' &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '</td>';
echo '</tr>';
@ -2079,9 +2101,9 @@ class SurveyAnalysis {
echo '<td class="cell_grid" colspan="'.($_clmn_cnt+1).'">';
echo $lang['srv_analiza_opisne_arguments'].'&nbsp;';
echo '<span id="img_analysis_f_p_2_'.$spid.'" class="img_analysis_f_p "><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo '<span id="img_analysis_f_2_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue">f&nbsp;</span>/&nbsp;%)</a></span>';
echo '<span id="img_analysis_p_2_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(f&nbsp;/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo '</td>';
echo '</tr>';
@ -2289,9 +2311,9 @@ class SurveyAnalysis {
echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_skala'].'</td>';
}
echo '<td class="cell_value" colspan="'.$_clmn_cnt.'">'.$lang['srv_analiza_opisne_answers'];
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue">f&nbsp;</span>/&nbsp;%)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(f&nbsp;/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo '</td>';
echo '<td class="cell_value">'.$lang['srv_analiza_opisne_valid'].'</td>';
echo '<td class="cell_value">'.$lang['srv_analiza_num_units'].'</td>';
@ -2470,9 +2492,20 @@ class SurveyAnalysis {
if (self::$_SHOW_LEGENDA) {
echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
}
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe"><a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">&nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe displayNone"><a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">&nbsp;(<span title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '</td>';
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
echo ' &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
echo ' &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '</td>';
echo '</tr>';
@ -2617,9 +2650,20 @@ class SurveyAnalysis {
if (self::$_SHOW_LEGENDA) {
echo '<div class="anl_variable_type">&nbsp;&nbsp;<span>'.$lang['srv_analiza_opisne_variable_type'].': </span>'.self::getSpremenljivkaLegenda($spremenljivka,'tip').'</div>';
}
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe"><a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">&nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe displayNone"><a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">&nbsp;(<span title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)</a></span>';
echo '</td>';
echo '<span name="span_show_navedbe_2_'.$spid.'" class="span_navedbe'.$css_hide_enote.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'2\');">';
echo ' &nbsp;(<span class="blue active" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '<span name="span_show_navedbe_3_'.$spid.'" class="span_navedbe'.$css_hide_navedbe.'">';
echo ' <a href="javascript:show_navedbe(\''.$spid.'\',\'1\');">';
echo ' &nbsp;(<span class="blue" title="'.$lang['srv_enote_navedbe_1'].'">'.$lang['srv_analiza_opisne_units'].'&nbsp;</span>/<span class="blue active" title="'.$lang['srv_enote_navedbe_2'].'">&nbsp;'.$lang['srv_analiza_opisne_arguments'].'</span>)';
echo ' </a>';
echo' </span>';
echo '</td>';
echo '</tr>';
@ -2816,9 +2860,9 @@ class SurveyAnalysis {
}
echo '<td class="cell_grid" colspan="'.($_clmn_cnt+1).'">'.$lang['srv_analiza_opisne_answers'];
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue">f&nbsp;</span>/&nbsp;%)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(f&nbsp;/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo '</td>';
echo '<td class="cell_value">'.$lang['srv_analiza_opisne_valid'].'</td>';
@ -3124,9 +3168,9 @@ class SurveyAnalysis {
}
echo '<td class="cell_grid" colspan="'.($_clmn_cnt+6).'">'.$lang['srv_analiza_opisne_answers'];
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue">f&nbsp;</span>/&nbsp;%)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(f&nbsp;/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_p_1_'.$spid.'" class="img_analysis_f_p"><a href="javascript:show_single_percent(\''.$spid.'\',\'2\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_f_1_'.$spid.'" class="img_analysis_f displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'1\');">&nbsp(<span class="blue active">f&nbsp;</span>/<span class="blue">&nbsp;%</span>)</a></span>';
echo ' <span id="img_analysis_p_1_'.$spid.'" class="img_analysis_p displayNone"><a href="javascript:show_single_percent(\''.$spid.'\',\'0\');">&nbsp(<span class="blue">f&nbsp;</span>/<span class="blue active">&nbsp;%</span>)</a></span>';
echo '</td>';
# št. enot
@ -5793,49 +5837,77 @@ class SurveyAnalysis {
echo '<div class="analysis_icons_holder">';
if ($options['sums'] == true) {
echo '<div class="icon_box">';
if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3 ) {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
} else {
}
else {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
}
echo '<span class="faicon an_sigma" title="' . $lang['srv_analysis_icon_sumary'] . '"></span> ';
echo '</a>';
echo '</div>';
}
if ($options['sums_spec'] == true) {
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY_NEW.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_sigmax" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '</a>';
echo '</div>';
}
if ($options['sums*'] == true) {
echo '<div class="icon_box">';
if ($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3) {
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_SUMMARY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
}else {
}
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" title="' . $lang['srv_analysis_icon_frequency*'] . '"></span> ';
echo '</a>';
echo '</div>';
}
if ($options['desc'] == true) {
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_DESCRIPTOR.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_stat" title="' . $lang['srv_analysis_icon_descriptor'] . '"></span> ';
echo '</a>';
echo '</div>';
}
if ($options['freq'] == true) {
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleVarPopup(\''.$spid.'\',\''.M_ANALYSIS_FREQUENCY.'\',\''.$from_navedbe.'\',\''.self::$_CURRENT_LOOP['cnt'].'\'); return false;">';
echo '<span class="faicon an_freq" title="' . $lang['srv_analysis_icon_frequency'] . '"></span> ';
echo '</a>';
echo '</div>';
}
// Ikona za prikaz grafa
if($showChart == true && in_array($spremenljivka['tip'],array(1,2,3,6,7,8,16,17,18,20,22)) && $_from != 'charts'){
echo '<div class="icon_box">';
echo '<a href="#" onclick="showAnalizaSingleChartPopup(\''.$spid.'\',\''.M_ANALYSIS_CHARTS.'\'); return false;">';
echo '<span class="faicon an_chart_bar icon-blue_soft_link" title="' . $lang['6'] . '"></span> ';
echo '</a>';
echo '</div>';
}
// Ikona za vkljucitev v porocilo
@ -5856,7 +5928,9 @@ class SurveyAnalysis {
}
if ($showReport == true) {
echo '<div class="icon_box">';
SurveyAnalysisHelper::getInstance()->addCustomReportElement($type, $sub_type=0, $spid);
echo '</div>';
}
echo '</div>';
@ -7477,16 +7551,19 @@ class SurveyAnalysis {
// Pri javni povezavi nimamo tega
if(self::$printPreview == false){
// 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"><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"></span></a>';
echo '<div class="comment_holder">';
echo ' <a href="#" class="comment" 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 '</div>';
//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"></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="'.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&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="#" 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>';
@ -7495,12 +7572,15 @@ class SurveyAnalysis {
// 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"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<div class="comment_holder">';
echo ' <a href="#" class="comment" 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 '</div>';
//echo '<a href="#" onClick="printAnaliza(\'Frekvence\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></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="'.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&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="#" 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>';
@ -7509,12 +7589,15 @@ class SurveyAnalysis {
// 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"><span class="spaceRight faicon comments" ></span><span>'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '<div class="comment_holder">';
echo ' <a href="#" class="comment" 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 '</div>';
//echo '<a href="#" onClick="printAnaliza(\'Opisne statistike\'); return false;"'.$lan_print.' class="srv_ico"><span class="faicon print"></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="'.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&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="#" 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>';

3
admin/survey/classes/surveyAnalysis/class.SurveyAnalysisHelper.php
View File

@ -47,9 +47,10 @@ class SurveyAnalysisHelper {
$sql = sisplet_query("SELECT id FROM srv_custom_report WHERE ank_id='".self::$anketa."' AND usr_id='".$creportAuthor."' AND type='$type' AND sub_type='$sub_type' AND spr1='$spr1' AND spr2='$spr2' AND profile='$creportProfile'");
$insert = (mysqli_num_rows($sql)) ? 0 : 1;
$id = $type.'-'.$sub_type.'-'.$spr1.'-'.$spr2;
// Samo zvezdica (sums, grafi, freq...)
if($type < 5)
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span style="margin-left: 3px;" id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span></a>';
echo '<a href="#" title="'.($insert == 0 ? $lang['srv_custom_report_inserted_title'] : $lang['srv_custom_report_insert_title']).'" onClick="addCustomReportElement(\''.$type.'\', \''.$sub_type.'\', \''.$spr1.'\', \''.$spr2.'\', 0); return false;"><span id="'.$id.'" class="faicon pointer '.($insert == 0 ? ' star_on' : ' star_off').'"></span></a>';
// Zvezdica s textom
else{
echo '<div class="custom_report_include">';

12
admin/survey/classes/surveyAnalysis/class.SurveyBreak.php
View File

@ -1518,12 +1518,14 @@ class SurveyBreak
echo '<div class="analysis_bottom_settings printHide">';
echo '<a href="#" onClick="addCustomReportAllElementsAlert(9);" 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="printAnaliza(\'Break\'); 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=break_izpis&anketa=' . $this->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=break_izpis_rtf&anketa=' . $this->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 '<div class="comment_holder">';
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(9);" 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 '</div>';
//echo '<a href="#" onClick="printAnaliza(\'Break\'); 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=break_izpis_xls&anketa=' . $this->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=break_izpis_rtf&anketa=' . $this->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=break_izpis&anketa=' . $this->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="#" onclick="doArchiveBreak();" 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="createArchiveBreakBeforeEmail();" 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>';

10
admin/survey/classes/surveyAnalysis/class.SurveyChart.php
View File

@ -7129,11 +7129,13 @@ class SurveyChart {
echo '<div class="chart_bottom_settings">';
echo '<a href="#" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'" 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="printAnaliza(\'Grafi\'); return false;" title="'.$lang['hour_print2'].'" class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf black very_large" ></span></a>';
echo '<div class="comment_holder">';
echo ' <a href="#" class="comment" onClick="addCustomReportAllElementsAlert(4);" title="'.$lang['srv_custom_report_comments_add_hover'].'" style="margin-right: 40px;"><span class="spaceRight faicon comments_creport" ></span><span class="bold">'.$lang['srv_custom_report_comments_add'].'</span></a>';
echo '</div>';
//echo '<a href="#" onClick="printAnaliza(\'Grafi\'); return false;" title="'.$lang['hour_print2'].'" class="srv_ico"><span class="faicon print icon-grey_dark_link"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_rtf&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['RTF_Izpis'].'"><span class="faicon rtf black very_large"></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PDF_Izpis'].'"><span class="faicon pdf black very_large" ></span></a>';
echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa=' . self::$anketa) . '" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt black very_large"></span></a>';
echo '<a href="#" onclick="doArchiveAnaliza();" title="'.$lang['srv_analiza_arhiviraj_ttl'].'"><span class="faicon arhiv black very_large"></span></a>';

1
lang/1.php
View File

@ -4089,6 +4089,7 @@ $lang = array (
"srv_show_pages" => "Prika&#382;i frekven&#269;no porazdelitev za vsako stran posebej",
"srv_stevilo_enot" => "&#352;tevilo enot",
"srv_skupaj_predvideni" => "Skupaj predvideni",
"srv_testni_podatki_alert_title" => "Vaša anketa vsebuje testne podatke",
"srv_testni_podatki_alert" => "Pozor, v bazi so tudi testni podatki!",
"srv_anketacopy" => "Kopiraj anketo",
"s_survey" => "Anketa",

1
lang/2.php
View File

@ -4073,6 +4073,7 @@ $lang = array (
"srv_show_pages" => "Display frequency distribution for each page",
"srv_stevilo_enot" => "Number of units",
"srv_skupaj_predvideni" => "Total calculated",
"srv_testni_podatki_alert_title" => "Your survey has test data",
"srv_testni_podatki_alert" => "Alert, there is also test data in survey!",
"srv_anketacopy" => "Copy survey",
"s_survey" => "Survey",

106
public/css/admin_new.css
View File

@ -15143,6 +15143,26 @@ textarea#addusers, textarea#addusers_note {
height: 120px;
}
.display_data_test_data_note {
padding: 16px 32px;
margin-bottom: 32px;
font-size: 16px;
background-color: #FFFFFF;
box-shadow: 0px 0px 7px 1px rgba(0, 0, 0, 0.1);
}
.display_data_test_data_note .title {
padding-bottom: 8px;
margin-bottom: 8px;
font-weight: 600;
text-transform: uppercase;
border-bottom: 1px #E5E5E5 solid;
}
.display_data_test_data_note .title .faicon::before {
margin-right: 8px;
font-size: 14px;
color: #FFC700;
}
#div_analiza_data .div_analiza_holder {
display: flex;
flex-direction: column;
@ -15164,6 +15184,10 @@ textarea#addusers, textarea#addusers_note {
#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_icons .print_small:before {
cursor: pointer;
color: #1E88E5;
}
#div_analiza_data .div_analiza_holder .analiza_table_top_settings .div_analiza_scale {
opacity: 0;
filter: alpha(opacity=0);
@ -15196,6 +15220,35 @@ textarea#addusers, textarea#addusers_note {
font-size: 14px;
line-height: 18px;
}
#div_analiza_data table tr th span.span_navedbe a, #div_analiza_data table tr th span.img_analysis_p a, #div_analiza_data table tr th span.img_analysis_f a, #div_analiza_data table tr th span.img_analysis_f_p a,
#div_analiza_data table tr td span.span_navedbe a,
#div_analiza_data table tr td span.img_analysis_p a,
#div_analiza_data table tr td span.img_analysis_f a,
#div_analiza_data table tr td span.img_analysis_f_p a {
color: #333333;
text-decoration: none;
}
#div_analiza_data table tr th span.span_navedbe a span, #div_analiza_data table tr th span.img_analysis_p a span, #div_analiza_data table tr th span.img_analysis_f a span, #div_analiza_data table tr th span.img_analysis_f_p a span,
#div_analiza_data table tr td span.span_navedbe a span,
#div_analiza_data table tr td span.img_analysis_p a span,
#div_analiza_data table tr td span.img_analysis_f a span,
#div_analiza_data table tr td span.img_analysis_f_p a span {
font-weight: 400;
}
#div_analiza_data table tr th span.span_navedbe a span.blue, #div_analiza_data table tr th span.img_analysis_p a span.blue, #div_analiza_data table tr th span.img_analysis_f a span.blue, #div_analiza_data table tr th span.img_analysis_f_p a span.blue,
#div_analiza_data table tr td span.span_navedbe a span.blue,
#div_analiza_data table tr td span.img_analysis_p a span.blue,
#div_analiza_data table tr td span.img_analysis_f a span.blue,
#div_analiza_data table tr td span.img_analysis_f_p a span.blue {
color: #1E88E5;
}
#div_analiza_data table tr th span.span_navedbe a span.active, #div_analiza_data table tr th span.img_analysis_p a span.active, #div_analiza_data table tr th span.img_analysis_f a span.active, #div_analiza_data table tr th span.img_analysis_f_p a span.active,
#div_analiza_data table tr td span.span_navedbe a span.active,
#div_analiza_data table tr td span.img_analysis_p a span.active,
#div_analiza_data table tr td span.img_analysis_f a span.active,
#div_analiza_data table tr td span.img_analysis_f_p a span.active {
font-weight: 600;
}
#div_analiza_data table tr th.cell_icons,
#div_analiza_data table tr td.cell_icons {
width: 110px;
@ -15204,6 +15257,7 @@ textarea#addusers, textarea#addusers_note {
#div_analiza_data table tr th.cell_var,
#div_analiza_data table tr td.cell_var {
width: 110px;
min-width: 110px;
text-align: center;
}
#div_analiza_data table tr th.cell_var a,
@ -15262,7 +15316,7 @@ textarea#addusers, textarea#addusers_note {
#div_analiza_data table tr th table.cell_table tr td,
#div_analiza_data table tr td table.cell_table tr td {
padding: 4px 16px;
text-align: right;
text-align: center;
border: 0;
}
#div_analiza_data table tr th table.cell_table tr:first-of-type td,
@ -15297,7 +15351,8 @@ textarea#addusers, textarea#addusers_note {
}
#div_analiza_data table tr.row2 th.cell_value,
#div_analiza_data table tr.row2 td.cell_value {
text-align: center;
text-align: right;
white-space: nowrap;
}
#div_analiza_data table tr.row3 th,
#div_analiza_data table tr.row3 td, #div_analiza_data table tr.row4 th,
@ -15307,6 +15362,9 @@ textarea#addusers, textarea#addusers_note {
#div_analiza_data table tr.row3 th.cell_grid,
#div_analiza_data table tr.row3 td.cell_grid, #div_analiza_data table tr.row4 th.cell_grid,
#div_analiza_data table tr.row4 td.cell_grid {
height: 52px;
padding-top: 8px;
padding-bottom: 8px;
text-align: center;
background-color: #F2F2F2;
}
@ -15362,15 +15420,36 @@ textarea#addusers, textarea#addusers_note {
justify-content: center;
margin-top: 64px;
}
.analysis_bottom_settings .comment_holder {
display: flex;
align-items: center;
padding-right: 8px;
margin-right: 8px;
height: 34px;
border-right: 1px #E5E5E5 solid;
}
.analysis_bottom_settings a {
margin: 0 16px;
margin: 0 8px;
font-size: 16px;
font-weight: 400;
text-decoration: none;
color: #333333;
}
.analysis_bottom_settings a .faicon:before {
.analysis_bottom_settings a.comment {
display: flex;
align-items: center;
padding: 6px 16px;
border: 1px #E5E5E5 solid;
border-radius: 2px;
border-right: 1px #E5E5E5 solid;
}
.analysis_bottom_settings a.comment:hover {
background-color: #f2f2f2;
}
.analysis_bottom_settings a.comment .faicon:before {
margin-right: 8px;
}
.analysis_bottom_settings a .faicon:before {
color: #1E88E5;
font-size: 20px;
}
@ -15720,18 +15799,23 @@ iframe#ifmcontentstoprint {
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
}
.analysis_icons_holder > a {
margin-right: 8px;
.analysis_icons_holder .icon_box {
display: flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
}
.analysis_icons_holder > a:last-of-type {
.analysis_icons_holder .icon_box > a:last-of-type {
margin-right: 0;
}
.analysis_icons_holder > a .faicon:before {
font-size: 14px;
.analysis_icons_holder .icon_box > a .faicon:before {
font-size: 12px;
}
.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: 20px;
.analysis_icons_holder .icon_box > a .faicon.an_freq:before, .analysis_icons_holder .icon_box > a .faicon.an_freqx:before, .analysis_icons_holder .icon_box > a .faicon.an_stat:before, .analysis_icons_holder .icon_box > a .faicon.an_sigma:before, .analysis_icons_holder .icon_box > a .faicon.an_sigmax:before {
font-size: 18px;
}
#div_analiza_data table.table_desc tr td.cell_var {

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

@ -25,6 +25,11 @@
.faicon:before{
font-size: 20px;
}
.print_small:before{
cursor: pointer;
color: $blue;
}
}
.div_analiza_scale {
@ -68,6 +73,29 @@
span{
font-size: 14px;
line-height: 18px;
&.span_navedbe,
&.img_analysis_p,
&.img_analysis_f,
&.img_analysis_f_p{
a{
color: $black;
text-decoration: none;
span{
font-weight: 400;
&.blue{
color: $blue;
}
&.active{
font-weight: 600;
}
}
}
}
}
// Stolpec z ikonami
@ -80,6 +108,7 @@
// Stolpec z variablo
&.cell_var{
width: 110px;
min-width: 110px;
text-align: center;
@ -151,7 +180,7 @@
tr{
td{
padding: 4px 16px;
text-align: right;
text-align: center;
border: 0;
}
@ -197,7 +226,8 @@
}
&.cell_value{
text-align: center;
text-align: right;
white-space: nowrap;
}
}
}
@ -210,6 +240,10 @@
background-color: $light-gray;
&.cell_grid{
height: 52px;
padding-top: 8px;
padding-bottom: 8px;
text-align: center;
background-color: $light-gray2;
}
@ -322,19 +356,48 @@
margin-top: 64px;
.comment_holder{
display: flex;
align-items: center;
padding-right: 8px;
margin-right: 8px;
height: 34px;
border-right: 1px $gray solid;
}
a{
margin: 0 16px;
margin: 0 8px;
font-size: 16px;
font-weight: 400;
text-decoration: none;
color: $black;
&.comment{
display: flex;
align-items: center;
padding: 6px 16px;
border: 1px $gray solid;
border-radius: 2px;
&:hover{
background-color: darken($white, 5%);
}
border-right: 1px $gray solid;
.faicon:before{
margin-right: 8px;
}
}
.faicon{
&:before{
margin-right: 8px;
&:before{
color: $blue;
font-size: 20px;
}

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

@ -4,29 +4,38 @@
display: flex;
align-items: center;
justify-content: center;
flex-wrap: wrap;
>a{
margin-right: 8px;
.icon_box{
display: flex;
align-items: center;
justify-content: center;
width: 24px;
height: 24px;
&:last-of-type{
margin-right: 0;
}
.faicon{
&:before{
font-size: 14px;
>a{
&:last-of-type{
margin-right: 0;
}
&.an_freq,
&.an_freqx,
&.an_stat,
&.an_sigma,
&.an_sigmax{
.faicon{
&:before{
font-size: 20px;
font-size: 12px;
}
&.an_freq,
&.an_freqx,
&.an_stat,
&.an_sigma,
&.an_sigmax{
&:before{
font-size: 18px;
}
}
}
}
}
}

1
resources/sass/admin_new/pages/survey_data/data_table.scss
View File

@ -1 +0,0 @@
@import "data_table";

3
resources/sass/admin_new/pages/survey_data/survey_data.scss
View File

@ -0,0 +1,3 @@
@import "data_table";
@import "test_data_warning";

30
resources/sass/admin_new/pages/survey_data/test_data_warning.scss Normal file
View File

@ -0,0 +1,30 @@
// Opozorilo na vrhu pri podatkih in analizah - anketa vsebuje testne podatke...
.display_data_test_data_note {
padding: 16px 32px;
margin-bottom: 32px;
font-size: 16px;
background-color: $white;
box-shadow: 0px 0px 7px 1px rgba(0, 0, 0, 0.1);
.title{
padding-bottom: 8px;
margin-bottom: 8px;
font-weight: 600;
text-transform: uppercase;
border-bottom: 1px $gray solid;
.faicon::before{
margin-right: 8px;
font-size: 14px;
color: $yellow;
}
}
}