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

analize --> statistike: dodatne možnosti pri vprašanju

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-13 15:18:56 +02:00
parent 9fb81db4e0
commit 23892edd15
4 changed files with 172 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -813,12 +813,18 @@ class SurveyAnalysis {
$objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']); $objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']);
echo '<tr class="row_question">'; echo '<tr class="row_question">';
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'desc');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'desc'); self::showIcons($spid,$spremenljivka,'desc');
echo '</div>'; //options
echo '</td>'; echo '</td>';
echo '<td class="'.$cssBack.' cell_var">'; echo '<td class="'.$cssBack.' cell_var">';
self::showVariable($spid,$spremenljivka['variable']); self::showVariable($spid,$spremenljivka['variable']);
echo '</td>'; echo '</td>';
@ -1039,10 +1045,15 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
#variabla #variabla
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'freq');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'freq'); self::showIcons($spid,$spremenljivka,'freq');
echo '</div>'; //options
echo '</td>'; echo '</td>';
#odgovori #odgovori
echo '<td class="cell_question">'.$lang['srv_analiza_frekvence_titleAnswers'] . '</td>'; echo '<td class="cell_question">'.$lang['srv_analiza_frekvence_titleAnswers'] . '</td>';
@ -1694,11 +1705,11 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
# variabla # variabla - en odgovor
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick=""> <img src="\public\img\icons\dots.svg"> </button>'; echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')" > <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
echo '</td>'; echo '</td>';
@ -1717,6 +1728,8 @@ class SurveyAnalysis {
echo '<td class="cell_value">'. $lang['srv_analiza_frekvence_titleKumulativa'] .'</td>'; echo '<td class="cell_value">'. $lang['srv_analiza_frekvence_titleKumulativa'] .'</td>';
echo '</tr>'; echo '</tr>';
echo '<script src="\admin\survey\script\urejanje_oblika.js"> </script>';
// konec naslovne vrstice // konec naslovne vrstice
@ -1916,8 +1929,17 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
// echo '</td>';
# variabla
echo '<td class=".cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options
echo '</td>'; echo '</td>';
echo '<td class="cell_subquestion">'; echo '<td class="cell_subquestion">';
@ -2069,10 +2091,22 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
// echo '</td>';
# variabla
echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options
echo '</td>'; echo '</td>';
echo '<td class="cell_subquestion">'; echo '<td class="cell_subquestion">';
echo $lang['srv_analiza_opisne_subquestion']; echo $lang['srv_analiza_opisne_subquestion'];
echo '</td>'; echo '</td>';
@ -2283,10 +2317,21 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from);
// echo '</td>';
echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
if (self::$_SHOW_LEGENDA) { if (self::$_SHOW_LEGENDA) {
echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_expression'].'</td>'; echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_expression'].'</td>';
echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_skala'].'</td>'; echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_skala'].'</td>';
@ -2484,8 +2529,18 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
// echo '</td>';
# variabla - več odgovorov
echo '<td class=".cell_icons cell_icons'.$spid.' vec_odgovorov sum" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options
echo '</td>'; echo '</td>';
echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>'; echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>';
@ -2633,8 +2688,17 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
// echo '</td>';
# variabla
echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options
echo '</td>'; echo '</td>';
echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>'; echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>';
@ -2809,8 +2873,18 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from);
// echo '</td>';
# variabla - tabela en odgovor
echo '<td class=".cell_icons cell_icons'.$spid.' tabela_en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
if ($_sub_question_col) { if ($_sub_question_col) {
@ -3116,8 +3190,17 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
echo '<td class="cell_icons">'; // echo '<td class="cell_icons">';
// self::showIcons($spid,$spremenljivka,$_from);
// echo '</td>';
echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
if ($_sub_question_col) { if ($_sub_question_col) {
@ -3493,9 +3576,14 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
# variabla # variabla
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
#odgovori #odgovori
@ -3726,8 +3814,12 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
# variabla # variabla
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
if ($show_enota) { if ($show_enota) {
@ -4002,9 +4094,13 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
# variabla # variabla - število
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' stevilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
echo '<td class="cell_question">'; echo '<td class="cell_question">';
@ -4303,8 +4399,12 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
# variabla # variabla
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
#odgovori #odgovori
@ -4655,9 +4755,13 @@ class SurveyAnalysis {
echo '<tr class="row2">'; echo '<tr class="row2">';
# variabla # variabla - besedilo
echo '<td class="cell_icons">'; echo '<td class=".cell_icons cell_icons'.$spid.' besedilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
echo '</td>'; echo '</td>';
# odgovori # odgovori
@ -7544,6 +7648,19 @@ class SurveyAnalysis {
echo '<div class="analysis_bottom_settings printHide">'; echo '<div class="analysis_bottom_settings printHide">';
// Klik izven treh pikic/settingsov pri vprasanju - zapremo okno
echo '<script>
$(document).mouseup(function(e){
var container = $(".cell_icons, .options");
if (!container.is(e.target) && container.has(e.target).length === 0){
$(".options").addClass("displayNone");
}
});
</script>';
// Pri javni povezavi nimamo tega // Pri javni povezavi nimamo tega
if(self::$printPreview == false){ if(self::$printPreview == false){

9
admin/survey/script/urejanje_oblika.js
View File

@ -81,3 +81,12 @@ function show_settings_mobile(id_of_element){
} }
function show_settings_survey_analysis(id_of_element){
if($('#options'+id_of_element).hasClass('displayNone')){
$('.options').addClass('displayNone');
$('#options'+id_of_element).removeClass('displayNone');
}
else{
$('.options').addClass('displayNone');
}
}

3
public/css/admin_new.css
View File

@ -29509,7 +29509,8 @@ iframe#ifmcontentstoprint {
border: 1px solid red; border: 1px solid red;
width: 200px; width: 200px;
position: absolute; position: absolute;
left: -20px; left: 0px;
top: 50px;
} }
.analysis_icons_holder { .analysis_icons_holder {

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

@ -13,10 +13,15 @@
width: 200px; width: 200px;
position: absolute; position: absolute;
left: -20px; left: 0px;
top: 50px;
} }
// .displayNone{
// background-color: blue;
// }
} }
// .cell_icons { // .cell_icons {