From 23892edd15d876e8056037c018b8ac37f2d43327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nejc=20Kova=C4=8D?= <nejc.kouko@gmail.com>
Date: Sat, 13 Aug 2022 15:18:56 +0200
Subject: [PATCH] =?UTF-8?q?analize=20-->=20statistike:=20dodatne=20mo?=
 =?UTF-8?q?=C5=BEnosti=20pri=20vpra=C5=A1anju?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../surveyAnalysis/class.SurveyAnalysis.php   | 193 ++++++++++++++----
 admin/survey/script/urejanje_oblika.js        |   9 +
 public/css/admin_new.css                      |   3 +-
 .../pages/survey_analysis/icons.scss          |   7 +-
 4 files changed, 172 insertions(+), 40 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index 950026e70..d4373f7e7 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -811,14 +811,20 @@ class SurveyAnalysis {
 		
 		# pokličemo objekt SpremenljivkaSkala
 		$objectSkala = new SpremenljivkaSkala($spremenljivka['spr_id']);
+
 		
 
 		echo '<tr class="row_question">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,'desc');
+		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');
+			echo '</div>'; //options
 		echo '</td>';
 
+
 		echo '<td class="'.$cssBack.' cell_var">';
 		self::showVariable($spid,$spremenljivka['variable']);
 		echo '</td>';
@@ -1039,10 +1045,15 @@ class SurveyAnalysis {
 		echo '<tr class="row2">';
 
 		#variabla
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,'freq');
+		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');
+			echo '</div>'; //options
 		echo '</td>';
 
+
 		#odgovori
 		echo '<td class="cell_question">'.$lang['srv_analiza_frekvence_titleAnswers'] . '</td>';
 
@@ -1694,11 +1705,11 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		# variabla
-		echo '<td class="cell_icons">';
+		# variabla - en odgovor
+		echo '<td class=".cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">';
 		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<button onclick=""> <img src="\public\img\icons\dots.svg"> </button>';
-			echo '<div class= "options">';
+		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);
 			echo '</div>'; //options
 		echo '</td>';
@@ -1717,6 +1728,8 @@ class SurveyAnalysis {
 		echo '<td class="cell_value">'. $lang['srv_analiza_frekvence_titleKumulativa'] .'</td>';
 
 		echo '</tr>';
+
+		echo '<script src="\admin\survey\script\urejanje_oblika.js"> </script>';
 		// konec naslovne vrstice
 
 
@@ -1916,8 +1929,17 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
+		// 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));
+			echo '</div>'; //options
 		echo '</td>';
 
 		echo '<td class="cell_subquestion">';
@@ -2069,10 +2091,22 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
+		// 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));
+			echo '</div>'; //options
 		echo '</td>';
 
+
+
 		echo '<td class="cell_subquestion">';
 		echo $lang['srv_analiza_opisne_subquestion'];
 		echo '</td>';
@@ -2283,9 +2317,20 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
-		echo '</td>';
+		// 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);
+			echo '</div>'; //options
+		echo '</td>';		
+
+
 
 		if (self::$_SHOW_LEGENDA) {
 			echo '<td class="cell_info">'.$lang['srv_analiza_opisne_variable_expression'].'</td>';
@@ -2484,8 +2529,18 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
+		// 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));
+			echo '</div>'; //options
 		echo '</td>';
 
 		echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>';
@@ -2633,8 +2688,17 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
+		// 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));
+			echo '</div>'; //options
 		echo '</td>';
 
 		echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>';
@@ -2809,8 +2873,18 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		// 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);
+			echo '</div>'; //options
 		echo '</td>';
 
 		if ($_sub_question_col) {
@@ -3116,8 +3190,17 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		// 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);
+			echo '</div>'; //options
 		echo '</td>';
 
 		if ($_sub_question_col) {
@@ -3493,9 +3576,14 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
+
 		# variabla
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		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);
+			echo '</div>'; //options
 		echo '</td>';
 
 		#odgovori
@@ -3725,9 +3813,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		#variabla
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		# variabla
+		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);
+			echo '</div>'; //options
 		echo '</td>';
 
 		if ($show_enota) {
@@ -4002,9 +4094,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		# variabla
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		# variabla - število
+		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);
+			echo '</div>'; //options
 		echo '</td>';
 
         echo '<td class="cell_question">';
@@ -4302,11 +4398,15 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		#variabla
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		# variabla
+		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);
+			echo '</div>'; //options
 		echo '</td>';
-		
+
         #odgovori
         if(!$lokacija)
             echo '<td class="cell_subquestion">'.$lang['srv_analiza_opisne_subquestion'] . '</td>';
@@ -4655,9 +4755,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		# variabla
-		echo '<td class="cell_icons">';
-		self::showIcons($spid,$spremenljivka,$_from);
+		# variabla - besedilo
+		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);
+			echo '</div>'; //options
 		echo '</td>';
 		
         # odgovori
@@ -7543,6 +7647,19 @@ class SurveyAnalysis {
 		$lan_xls = ' title="'.$lang['XLS_Izpis'].'"';
 		
 		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
 		if(self::$printPreview == false){
diff --git a/admin/survey/script/urejanje_oblika.js b/admin/survey/script/urejanje_oblika.js
index 3a3b2133c..6b4224d47 100644
--- a/admin/survey/script/urejanje_oblika.js
+++ b/admin/survey/script/urejanje_oblika.js
@@ -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');
+    }
+}
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 20029345e..1a097be38 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -29509,7 +29509,8 @@ iframe#ifmcontentstoprint {
   border: 1px solid red;
   width: 200px;
   position: absolute;
-  left: -20px;
+  left: 0px;
+  top: 50px;
 }
 
 .analysis_icons_holder {
diff --git a/resources/sass/admin_new/pages/survey_analysis/icons.scss b/resources/sass/admin_new/pages/survey_analysis/icons.scss
index c8eaa2a36..bb2af4321 100644
--- a/resources/sass/admin_new/pages/survey_analysis/icons.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/icons.scss
@@ -13,10 +13,15 @@
         width: 200px;
     
         position: absolute;
-        left: -20px;
+        left: 0px;
+        top: 50px;
         
     }
 
+    // .displayNone{
+    //     background-color: blue;
+    // }
+
 }
 
 // .cell_icons {