From 0d5ac194d5d7008e7d9929f16bf47158392cce11 Mon Sep 17 00:00:00 2001
From: Peter Hrvatin <peter.hrvatin@gmail.com>
Date: Mon, 6 Jun 2022 09:54:54 +0200
Subject: [PATCH] Redesign - popravki napak - analize, grafi

---
 admin/survey/SurveyAdmin.php                  |  2 +-
 .../classes/class.SurveyCustomReport.php      |  4 +-
 .../survey/classes/class.SurveyStaticHtml.php | 15 +++----
 .../surveyAnalysis/class.SurveyAnalysis.php   | 18 ++++-----
 .../surveyAnalysis/class.SurveyChart.php      |  5 +--
 admin/survey/script/script_analiza.js         | 20 ++++++++--
 public/css/admin_new.css                      | 39 ++++++++++++-------
 .../sass/admin_new/basic/icons/export.scss    | 13 ++++---
 .../pages/survey_analysis/basic.scss          | 10 +++--
 .../pages/survey_analysis/page_charts.scss    |  4 ++
 10 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index 4383aff66..64083c785 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -4175,7 +4175,7 @@ class SurveyAdmin
                 echo '<a href="#" onClick="printAnaliza(\'Grafi\'); return false;"' . $lan_print . ' class="srv_ico"><span class="hover_export_icon"><span class="faicon print"></span></span>' . $lang['srv_export_hover_print'] . '</a>';
                 echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts&anketa=' . $this->anketa) . '" target="_blank"' . $lan_pdf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
                 echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_rtf&anketa=' . $this->anketa) . '" target="_blank"' . $lan_rtf . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
-                echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_ppt&anketa=' . $this->anketa) . '" target="_blank"' . $lan_ppt . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="sprites ppt_large"></span></span>' . $lang['srv_export_hover_ppt'] . '</a>';
+                echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?b=export&m=charts_ppt&anketa=' . $this->anketa) . '" target="_blank"' . $lan_ppt . ' class="srv_ico '.(!$userAccess->checkUserAccess('analysis_charts') ? 'user_access_locked' : '').'" user-access="analysis_charts"><span class="hover_export_icon"><span class="faicon ppt black"></span></span>' . $lang['srv_export_hover_ppt'] . '</a>';
             } 
             else if ($_GET['m'] == M_ANALYSIS_MEANS) {
                 echo '<a href="#" onclick="doArchiveMeans();"' . $lan_archive . ' class="srv_ico '.(!$userAccess->checkUserAccess('archive') ? 'user_access_locked' : '').' hidden" user-access="archive"><span class="hover_export_icon"><span class="faicon arhiv black very_large"></span></span>' . $lang['srv_export_hover_archive'] . '</a>';
diff --git a/admin/survey/classes/class.SurveyCustomReport.php b/admin/survey/classes/class.SurveyCustomReport.php
index cf26bc19e..694f9ab1b 100644
--- a/admin/survey/classes/class.SurveyCustomReport.php
+++ b/admin/survey/classes/class.SurveyCustomReport.php
@@ -561,10 +561,10 @@ class SurveyCustomReport {
 				
 				// Izbira podtipa (tabela / graf)
 				echo '  <input style="margin-left:16px;" type="radio" value="0" id="report_element_sub_type_'.$reportElement['id'].'_0" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 0 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
-                echo '  <label for="id="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_0">'.$lang['srv_table'].'</label>';
 
 				echo '  <input type="radio" value="1" id="report_element_sub_type_'.$reportElement['id'].'_1" name="report_element_sub_type_'.$reportElement['id'].'" '.($reportElement['sub_type'] == 1 ? 'checked="checked"' : '').' onClick="editCustomReportElement(\''.$reportElement['id'].'\', \'sub_type\', this.value)" />';
-                echo '  <label for="id="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
+                echo '  <label for="report_element_sub_type_'.$reportElement['id'].'_1">'.$lang['srv_chart'].'</label>';
 			}
 			
 			// Nastavitve za TTEST
diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php
index cf98c8111..b30b21e3a 100644
--- a/admin/survey/classes/class.SurveyStaticHtml.php
+++ b/admin/survey/classes/class.SurveyStaticHtml.php
@@ -982,15 +982,16 @@ class SurveyStaticHtml
         }
     }
 
-    public function displayChartOptions()
-    {
+    public function displayChartOptions(){
         global $lang, $admin_type;
 
+        SurveyChart::Init($this->sid);
+        
         // Nastavitev HQ grafov
-        echo '<li><label>';
-        echo $lang['srv_chart_hq'] . ': ';
-        echo '<input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" ' . (SurveyChart::$quality == 3 ? ' checked="checked"' : '') . '>';
-        echo '</label></li>';
+        echo '<li>';
+        echo '  <input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(SurveyChart::$quality == 3 ? ' checked="checked"' : '').'>';
+        echo '  <label for="chart_hq">'.$lang['srv_chart_hq'] . '</label>';
+        echo '</li>';
 
 
         // Nastavitev skina grafov
@@ -1053,7 +1054,7 @@ class SurveyStaticHtml
         if ($hideAdvanced == false) {
 
             echo '<li>';
-            echo '<span class="as_link" id="link_chart_color" title="' . $lang['srv_chart_skin'] . '">' . $lang['srv_chart_skin'] . ': <span style="font-weight: 500;">' . $name . '</span></span>';
+            echo '  <span id="link_chart_color" title="' . $lang['srv_chart_skin'] . '">' . $lang['srv_chart_skin'] . ': <span style="font-weight: 500;">' . $name . '</span></span>';
             echo '</li>';
         }
     }
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
index 90ad0f69d..76b765e14 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
@@ -2007,7 +2007,7 @@ class SurveyAnalysis {
 					if ($variable['other'] != true) {
 						echo '<td class="cell_value cell_noPadding">';
 
-						echo '  <table class="cell_table">';
+						echo '  <table class="cell_table freq_row percent_row">';
 						echo '      <tr id="'.$spid.'_'.$_sequence.'" name="single_sums_percent_cnt_'.$spid.'">';
 						echo '          <td>'.$_cnt.'</td>';
 						echo '      </tr>';
@@ -2156,7 +2156,7 @@ class SurveyAnalysis {
 
 					echo '<td class="cell_value cell_noPadding">';
 
-					echo '<table class="cell_table">';
+					echo '<table class="cell_table freq_row percent_row">';
 					echo '  <tr id="'.$spid.'_'.$_sequence.'" name="single_sums_percent_cnt_'.$spid.'">';
 					echo '      <td class="' . (self::$enableInspect == true && (int)$_cnt > 0 ? ' mc_inspect' : '').'"'
 					            . (self::$enableInspect == true && (int)$_cnt > 0 ? ' vkey="1"' : '')
@@ -2178,7 +2178,7 @@ class SurveyAnalysis {
 
 			echo '<td class="cell_value cell_noPadding">';
 
-			echo '<table class="cell_table">';
+			echo '<table class="cell_table freq_row percent_row">';
 			echo '  <tr name="single_sums_percent_cnt_'.$spid.'">';
 			echo '      <td>'.$_arguments.'</td>';
 			echo '  </tr>';
@@ -2962,7 +2962,7 @@ class SurveyAnalysis {
 
                                         echo '<td class="cell_value cell_noPadding">';
 
-                                        echo '  <table class="cell_table">';
+                                        echo '  <table class="cell_table freq_row percent_row">';
                                         echo '      <tr name="single_sums_percent_cnt_'.$spid.'">';
                                         echo '          <td class="'.(self::$enableInspect == true && (int)self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] > 0 ? ' mg_inspect' : '').'"'
                                                         .(self::$enableInspect == true && (int)self::$_FREQUENCYS[$_sequence]['valid'][$key]['cnt'] > 0 ? ' vkey="'.$key.'"' : '')
@@ -2983,7 +2983,7 @@ class SurveyAnalysis {
                                 // suma
                                 echo '<td class="cell_value cell_noPadding">';
 
-                                echo '  <table class="cell_table">';
+                                echo '  <table class="cell_table freq_row percent_row">';
                                 echo '      <tr name="single_sums_percent_cnt_'.$spid.'">';
                                 echo '          <td>'.((int)self::$_FREQUENCYS[$_sequence]['validCnt']).'</td>';
                                 echo '      </tr>';
@@ -3313,7 +3313,7 @@ class SurveyAnalysis {
 						#mg_inspectž
 						echo '<td class="cell_value cell_noPadding">';
                         
-						echo '  <table class="cell_table">';
+						echo '  <table class="cell_table freq_row percent_row">';
 						echo '      <tr name="single_sums_percent_cnt_'.$spid.'">';
 						echo '          <td class="'.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' dmg_inspect' : '').'" '.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' gid="'.$variable['key'].'_1"' : '').'>'.$variable['freq'].'</td>';
 						echo '      </tr>';
@@ -3332,7 +3332,7 @@ class SurveyAnalysis {
 				// suma
 				echo '<td class="cell_value cell_noPadding">';
 
-				echo '  <table class="cell_table">';
+				echo '  <table class="cell_table freq_row percent_row">';
 				echo '      <tr name="single_sums_percent_cnt_'.$spid.'">';
 				echo '          <td>'.(int)$grid['suma'].'</td>';
 				echo '      </tr>';
@@ -3361,7 +3361,7 @@ class SurveyAnalysis {
 						echo '<td class="cell_value cell_noPadding">';
 
 						#mg_inspect
-						echo '  <table class="cell_table">';
+						echo '  <table class="cell_table freq_row percent_row">';
 						echo '      <tr name="single_sums_percent_cnt_'.$spid.'">';
 						echo '          <td class="anl_ac'.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' dmg_inspect' : '').'" '.(self::$enableInspect == true && (int)$variable['freq'] > 0 ? ' gid="'.$variable['key'].'_2"' : '').'>'.$variable['freq'].'</td>';
 						echo '      </tr>';
@@ -3379,7 +3379,7 @@ class SurveyAnalysis {
 				// suma
 				echo '<td class="cell_value cell_noPadding">';
 
-				echo '  <table class="cell_table">';
+				echo '  <table class="cell_table freq_row percent_row">';
 				echo '      <tr name="single_sums_percent_cnt_'.$spid.'">';
 				echo '          <td>'.(int)$_right_grid['suma'].'</td>';
 				echo '      </tr>';
diff --git a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
index ce2373ce4..19b8c4659 100644
--- a/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
+++ b/admin/survey/classes/surveyAnalysis/class.SurveyChart.php
@@ -313,7 +313,6 @@ class SurveyChart {
 		// prikazemo nastavitve
 		if (self::$isArchive != true && self::$publicChart != true) {
 			self::displayGlobalSettings();		
-			echo "<br/>\n";
 		}
 
 		# preberemo header
@@ -7091,8 +7090,8 @@ class SurveyChart {
 		
 		echo '<ul>';
 		echo '<li>';
-		echo $lang['srv_chart_hq'].': ';
-		echo '<input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(self::$quality == 3 ? ' checked="checked"' : '').'>';			
+		echo '  <input type="checkbox" name="chart_hq" id="chart_hq" onClick="changeChartHq(this)" '.(self::$quality == 3 ? ' checked="checked"' : '').'>';			
+		echo '  <label for="chart_hq">'.$lang['srv_chart_hq'].'</label>';
 		echo '</li>';
 		
 		# nastavitev skina grafov
diff --git a/admin/survey/script/script_analiza.js b/admin/survey/script/script_analiza.js
index dcb6f72e5..29e775814 100644
--- a/admin/survey/script/script_analiza.js
+++ b/admin/survey/script/script_analiza.js
@@ -732,13 +732,19 @@ function show_single_percent(id, status) {
         if($('#freq-p_button_1_'+id).hasClass('active')){
 
             if($('#freq-p_button_2_'+id).hasClass('active')){
-                $('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).hide();});
+                $('[name=single_sums_percent_cnt_'+id+']').each(function() {
+                    $(this).hide().parent().parent().removeClass('freq_row');
+                });
+
                 $('#freq-p_button_1_'+id).removeClass('active');
             }
         }
         // Prizgemo
         else{
-            $('[name=single_sums_percent_cnt_'+id+']').each(function() {$(this).show();});
+            $('[name=single_sums_percent_cnt_'+id+']').each(function() {
+                $(this).show().parent().parent().addClass('freq_row');
+            });
+
             $('#freq-p_button_1_'+id).addClass('active');
         }
     } 
@@ -749,13 +755,19 @@ function show_single_percent(id, status) {
         if($('#freq-p_button_2_'+id).hasClass('active')){
 
             if($('#freq-p_button_1_'+id).hasClass('active')){
-                $('[name=single_sums_percent_'+id+']').each(function() {$(this).hide();});
+                $('[name=single_sums_percent_'+id+']').each(function() {
+                    $(this).hide().parent().parent().removeClass('percent_row');
+                });
+
                 $('#freq-p_button_2_'+id).removeClass('active');
             }
         }
         // Prizgemo
         else{
-            $('[name=single_sums_percent_'+id+']').each(function() {$(this).show();});
+            $('[name=single_sums_percent_'+id+']').each(function() {
+                $(this).show().parent().parent().addClass('percent_row');
+            });
+
             $('#freq-p_button_2_'+id).addClass('active');
         }
     }
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index fc3bcdd7b..5a5241e1a 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -6531,8 +6531,9 @@ and open the template in the editor.
 */
 /* Izvozi */
 span.faicon.pdf::before {
-  font-size: 16px;
   content: "";
+  font-size: 16px;
+  font-weight: 400;
   color: #ed1c24;
 }
 
@@ -27546,20 +27547,20 @@ and open the template in the editor.
   text-align: center;
   border: 0;
 }
-#div_analiza_data:not(.anal_arch) table tr th table.cell_table tr:first-of-type td,
-#div_analiza_data:not(.anal_arch) table tr td table.cell_table tr:first-of-type td,
-#div_means_data table tr th table.cell_table tr:first-of-type td,
-#div_means_data table tr td table.cell_table tr:first-of-type td,
-#div_break_data table tr th table.cell_table tr:first-of-type td,
-#div_break_data table tr td table.cell_table tr:first-of-type td,
-#ttestResults table tr th table.cell_table tr:first-of-type td,
-#ttestResults table tr td table.cell_table tr:first-of-type td,
-.subpage_analysis_creport table tr th table.cell_table tr:first-of-type td,
-.subpage_analysis_creport table tr td table.cell_table tr:first-of-type td,
-.report_element_data table tr th table.cell_table tr:first-of-type td,
-.report_element_data table tr td table.cell_table tr:first-of-type td,
-#arch_body_div table tr th table.cell_table tr:first-of-type td,
-#arch_body_div table tr td table.cell_table tr:first-of-type td {
+#div_analiza_data:not(.anal_arch) table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_analiza_data:not(.anal_arch) table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_means_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_means_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_break_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#div_break_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#ttestResults table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#ttestResults table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+.subpage_analysis_creport table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+.subpage_analysis_creport table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+.report_element_data table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+.report_element_data table tr td table.cell_table.percent_row.freq_row tr:first-of-type td,
+#arch_body_div table tr th table.cell_table.percent_row.freq_row tr:first-of-type td,
+#arch_body_div table tr td table.cell_table.percent_row.freq_row tr:first-of-type td {
   border-bottom: 1px #E5E5E5 dashed;
 }
 #div_analiza_data:not(.anal_arch) table tr.row1 th,
@@ -27861,6 +27862,7 @@ and open the template in the editor.
 }
 .analysis_bottom_settings .comment_holder span {
   font-size: 14px;
+  font-style: normal;
 }
 .analysis_bottom_settings .comment_holder span.faicon:before {
   font-size: 14px;
@@ -27902,6 +27904,9 @@ and open the template in the editor.
 .analysis_bottom_settings a .faicon.xls:before {
   color: #00C437;
 }
+.analysis_bottom_settings a .faicon.ppt:before {
+  color: #fa4913;
+}
 
 iframe#ifmcontentstoprint {
   border: 0;
@@ -28733,6 +28738,10 @@ iframe#ifmcontentstoprint {
   overflow: hidden;
   text-align: center;
 }
+.chart_holder.chart_holder:first-child,
+.tableChart.chart_holder:first-child {
+  padding-top: 6px;
+}
 .chart_holder .chart_title,
 .tableChart .chart_title {
   width: 800px;
diff --git a/resources/sass/admin_new/basic/icons/export.scss b/resources/sass/admin_new/basic/icons/export.scss
index 3241d7b2a..cbe74614e 100644
--- a/resources/sass/admin_new/basic/icons/export.scss
+++ b/resources/sass/admin_new/basic/icons/export.scss
@@ -12,22 +12,23 @@ and open the template in the editor.
 
 // PDF
 span.faicon.pdf::before{
-        font-size: 16px;
-		content: "\f1c1";
-		
-		color: #ed1c24;
+    content: "\f1c1";
+    font-size: 16px;
+    
+    font-weight: 400;
+    color: #ed1c24;
 }
 span.faicon.pdf.black{
     color: $blue !important;
     &:hover{
-            color: #ed1c24 !important;
+        color: #ed1c24 !important;
     }
 }
 a:hover span.faicon.pdf.black{
 	color: #ed1c24 !important;
 }
 span.faicon.pdf.black::before{
-		color: inherit !important;
+	color: inherit !important;
 }
 
 
diff --git a/resources/sass/admin_new/pages/survey_analysis/basic.scss b/resources/sass/admin_new/pages/survey_analysis/basic.scss
index c87afef10..2bdea3575 100644
--- a/resources/sass/admin_new/pages/survey_analysis/basic.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/basic.scss
@@ -241,10 +241,10 @@
                             text-align: center;
                             border: 0;
                         }
+                    }
 
-                        &:first-of-type td{
-                            border-bottom: 1px $gray dashed;
-                        }
+                    &.percent_row.freq_row tr:first-of-type td{
+                        border-bottom: 1px $gray dashed;
                     }
                 }
             }
@@ -426,6 +426,7 @@
 
         span{
             font-size: 14px;
+            font-style: normal;
 
             &.faicon:before{
                 font-size: 14px;
@@ -485,6 +486,9 @@
             &.xls:before{
                 color: $green;
             }
+            &.ppt:before{
+                color: #fa4913;
+            }
         }
     }
 }
diff --git a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
index b5de8317f..6afcdf1c3 100644
--- a/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
+++ b/resources/sass/admin_new/pages/survey_analysis/page_charts.scss
@@ -12,6 +12,10 @@
     overflow: hidden;
 
     text-align: center;
+
+    &.chart_holder:first-child{
+        padding-top: 6px;
+    }
     
     .chart_title {
         width: 800px;