From 4dc4dc08040c23186a121af31846a69657c8ab9e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Thu, 20 Oct 2022 10:55:45 +0200
Subject: [PATCH] Analize - popravki ikon (freq, sums), treh pikic

---
 .../surveyAnalysis/class.SurveyAnalysis.php   | 175 +++++++-----------
 admin/survey/script/script_analiza.js         |  11 ++
 admin/survey/script/themes.js                 |  11 --
 public/css/admin_new.css                      |  28 ++-
 .../pages/survey_analysis/icons.scss          |  32 +++-
 5 files changed, 133 insertions(+), 124 deletions(-)

diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index c4bf27920..20f484665 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -611,8 +611,8 @@ class SurveyAnalysis {
 
 		echo '<tr class="row1">';
 
-		echo '<td class="cell_icons anl_w90">&nbsp;<span>'.'</span></td>';
-		echo '<td class="cell_var anl_w110">' . $lang['srv_analiza_opisne_variable'] .'<span>'.'</span></td>';
+		echo '<td class="cell_icons"></td>';
+		echo '<td class="cell_var">' . $lang['srv_analiza_opisne_variable'] .'<span>'.'</span></td>';
 		echo '<td class="cell_question">' . $lang['srv_analiza_opisne_variable_text'] .'<span>'.'</span></td>';
 		if (self::$_SHOW_LEGENDA) {
 			echo '<td class="cell_info">' . $lang['srv_analiza_opisne_variable_type'] .'<span >'.'</span></td>';
@@ -727,7 +727,7 @@ class SurveyAnalysis {
 		if ($variable['var_cnt'] == 0 && in_array($spremenljivka['tip'],array(16,19,20) ) ) {
 			echo '<tr class="row_grid">';
 
-			echo '<td class="cell_icons">&nbsp;</td>';
+			echo '<td class="cell_icons"></td>';
 
 			echo '<td class="cell_var">';
 			echo $grid['variable'];
@@ -743,9 +743,7 @@ class SurveyAnalysis {
 
 		echo '<tr class="row_var">';
 
-		echo '<td class="cell_icons">';
-		echo '&nbsp;';
-		echo '</td>';
+		echo '<td class="cell_icons"></td>';
 
 		echo '<td class="'.$cssBack.' cell_var">';
 		echo $variable['variable'];
@@ -816,13 +814,12 @@ class SurveyAnalysis {
 
 		echo '<tr class="row_question">';
 
-		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.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,'desc');
-			echo '</div>'; //options
+
+		echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')"> </span>';
+        echo '  <div class="options" id="options'.$spid.'">';
+        self::showIcons($spid, $spremenljivka, 'desc');
+        echo '  </div>';
 		echo '</td>';
 
 
@@ -1046,13 +1043,11 @@ class SurveyAnalysis {
 		echo '<tr class="row2">';
 
 		#variabla
-		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.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,'freq');
-			echo '</div>'; //options
+		echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,'freq');
+		echo '  </div>';
 		echo '</td>';
 
 
@@ -1710,11 +1705,10 @@ class SurveyAnalysis {
 
 		# variabla - en odgovor
 		echo '<td class="cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">';
-		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';
 
 		# odgovori
@@ -1930,17 +1924,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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 '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
+		echo '  </div>';
 		echo '</td>';
 
 		echo '<td class="cell_subquestion">';
@@ -2092,11 +2082,7 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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));
@@ -2107,7 +2093,6 @@ class SurveyAnalysis {
 		echo '</td>';
 
 
-
 		echo '<td class="cell_subquestion">';
 		echo $lang['srv_analiza_opisne_subquestion'];
 		echo '</td>';
@@ -2318,17 +2303,12 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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 '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';		
 
 
@@ -2530,18 +2510,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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 '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
+		echo '  </div>';
 		echo '</td>';
 
 		echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>';
@@ -2689,17 +2664,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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 '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options " id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
+		echo '  </div>';
 		echo '</td>';
 
 		echo '<td class="cell_question">'.$lang['srv_analiza_opisne_subquestion'].'</td>';
@@ -2874,18 +2845,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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 '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';
 
 		if ($_sub_question_col) {
@@ -3191,17 +3157,12 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
-		// 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 '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';
 
 		if ($_sub_question_col) {
@@ -3580,11 +3541,10 @@ class SurveyAnalysis {
 
 		# variabla
 		echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
-		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>'; //options
 		echo '</td>';
 
 		#odgovori
@@ -3814,13 +3774,13 @@ class SurveyAnalysis {
 
 		echo '<tr class="row2">';
 
+
 		# variabla
 		echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
-		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>'; 
 		echo '</td>';
 
 		if ($show_enota) {
@@ -4097,11 +4057,10 @@ class SurveyAnalysis {
 
 		# variabla - število
 		echo '<td class="cell_icons cell_icons'.$spid.' stevilo" id="cell_icons'.$spid.'">';
-		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';
 
         echo '<td class="cell_question">';
@@ -4401,11 +4360,10 @@ class SurveyAnalysis {
 
 		# variabla
 		echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
-		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';
 
         #odgovori
@@ -4758,11 +4716,10 @@ class SurveyAnalysis {
 
 		# variabla - besedilo
 		echo '<td class="cell_icons cell_icons'.$spid.' besedilo" id="cell_icons'.$spid.'">';
-		// self::showIcons($spid,$spremenljivka,$_from);
-		echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
-			echo '<div class= "options displayNone" id="options'.$spid.'">';
-				self::showIcons($spid,$spremenljivka,$_from);
-			echo '</div>'; //options
+		echo '  <span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
+		echo '  <div class= "options" id="options'.$spid.'">';
+		self::showIcons($spid,$spremenljivka,$_from);
+		echo '  </div>';
 		echo '</td>';
 		
         # odgovori
@@ -7658,7 +7615,7 @@ class SurveyAnalysis {
 			var container = $(".cell_icons, .options");
 		
 			if (!container.is(e.target) && container.has(e.target).length === 0){
-				$(".options").addClass("displayNone");
+				$(".options").hide();
 			}
 		});
 		</script>';
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index d5a15b7df..112956c36 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -1386,3 +1386,14 @@ function dataTableScroll(where){
 	}
 }
 
+// Prikaz ikon (frekvence, sums...) pri kliku na 3 pikice
+function show_settings_survey_analysis(id_of_element){
+    
+    if($('#options'+id_of_element).is(":visible")){
+        $('#options'+id_of_element).hide();
+    }
+    else{
+        $('.options').hide();
+        $('#options'+id_of_element).show();
+    }
+}
\ No newline at end of file
diff --git a/admin/survey/script/themes.js b/admin/survey/script/themes.js
index e546d20cb..b327c9f38 100644
--- a/admin/survey/script/themes.js
+++ b/admin/survey/script/themes.js
@@ -266,15 +266,4 @@ function show_settings_mobile(id_of_element){
     else{
         $('.buttons-window').addClass('displayNone');
     }
-}
-
-
-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');
-    }
 }
\ No newline at end of file
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 6ccadab88..f7dcf9840 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -30837,13 +30837,14 @@ iframe#ifmcontentstoprint {
 }
 #div_analiza_data .options {
   position: relative;
+  display: none;
 }
 #div_analiza_data .options .analysis_icons_holder {
   width: 220px;
   z-index: 9999;
   position: absolute;
-  left: 17px;
-  top: 40px;
+  left: -15px;
+  top: 20px;
   background-color: white;
   border-radius: 2px;
   box-shadow: 0px 0px 7px 0px #0000001F;
@@ -30905,6 +30906,29 @@ iframe#ifmcontentstoprint {
   display: none;
 }
 
+.chart_settings .faicon.dots,
+#custom_report_elements .faicon.dots,
+#recode_table .faicon.dots {
+  display: none;
+}
+.chart_settings .analysis_icons_holder,
+#custom_report_elements .analysis_icons_holder,
+#recode_table .analysis_icons_holder {
+  display: flex;
+  flex-direction: row;
+  margin-left: 8px;
+}
+.chart_settings .analysis_icons_holder .icon_box,
+#custom_report_elements .analysis_icons_holder .icon_box,
+#recode_table .analysis_icons_holder .icon_box {
+  margin-right: 8px;
+}
+.chart_settings .analysis_icons_holder .icon_box .icon_text,
+#custom_report_elements .analysis_icons_holder .icon_box .icon_text,
+#recode_table .analysis_icons_holder .icon_box .icon_text {
+  display: none;
+}
+
 #div_analiza_data table.table_desc tr td,
 .custom_report_elements table.table_desc tr td,
 #arch_body_div table.table_desc tr td {
diff --git a/resources/sass/admin_new/pages/survey_analysis/icons.scss b/resources/sass/admin_new/pages/survey_analysis/icons.scss
index c1c9d5d02..78db1c9f2 100644
--- a/resources/sass/admin_new/pages/survey_analysis/icons.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/icons.scss
@@ -14,14 +14,15 @@
     // Popup div z ikonami
     .options{
         position: relative;
+        display: none;
         
         .analysis_icons_holder{        
             width: 220px;
             z-index: 9999;
         
             position: absolute;
-            left: 17px;
-            top: 40px;
+            left: -15px;
+            top: 20px;
 
             background-color: white;
             border-radius: 2px;
@@ -106,3 +107,30 @@
     }
 }
 
+
+
+// Pri nekaterih straneh prikazemo star pogled
+.chart_settings,
+#custom_report_elements,
+#recode_table{
+
+    .faicon.dots{
+        display: none;
+    }
+
+    .analysis_icons_holder{
+        display: flex;
+        flex-direction: row;
+
+        margin-left: 8px;
+
+        .icon_box{
+            margin-right: 8px;
+
+            .icon_text{
+                display: none;
+            }
+        }
+    }
+}
+