Redesign - popravki grafov

admin/survey/classes/surveyAnalysis/class.SurveyChart.php

@@ -7164,9 +7164,11 @@ class SurveyChart {
 	static function displaySingleSettings($spid, $settings=0){
 		global $site_path;
 		global $lang;
+
 		if (self::$publicChart == true) {
             return false;
         }
+
 		$spremenljivka = SurveyAnalysis::$_HEADERS[$spid];
 		
 		// Ikone izvoza na vrhu posameznih nastavitev
@@ -7226,16 +7228,7 @@ class SurveyChart {
 			case 20:
 				self::displayMultinumberSettings($spid, $settings);
 				break;
-				
+								
-			case 21:
-			case 4:
-				self::displayTableSettings($spid);
-				break;
-				
-			case 19:
-				self::displayMultitextSettings($spid, $settings);
-				break;
-				
 			default:
 				break;
 		}
@@ -7303,9 +7296,59 @@ class SurveyChart {
 			
 		echo '</div>';
 	}
+
+    // Nastavitve posamezne tabele (odprti odgovori)
+	static function displaySingleSettingsTable($spid, $settings=0){
+		global $site_path;
+		global $lang;
+
+		if (self::$publicChart == true) {
+            return false;
+        }
+        
+		$spremenljivka = SurveyAnalysis::$_HEADERS[$spid];
+		
+		// Ikone izvoza na vrhu posameznih nastavitev
+		self::displayExportIcons($spid, $hide_button=true);
+		
+		
+        echo '<div class="chart_settings_content">';
+        
+
+        echo '<div class="tab_holder"><div class="tab">'.$lang['srv_chart_open_answers_settings'].'</div></div>';
+		
+		// OSNOVNE NASTAVITVE
+		echo '<div class="chart_settings_inner" id="chart_settings_basic_'.$spid.'_loop_'.self::$current_loop.'">';
+		
+		switch($spremenljivka['tip']){
+			case 21:
+			case 4:
+				self::displayTableSettings($spid);
+				break;
+				
+			case 19:
+				self::displayMultitextSettings($spid, $settings);
+				break;
+				
+			default:
+				break;
+		}
+		
+		// Preview vprasanja
+		echo '<div class="chart_setting_icons">';
+		echo '  <span class="variable">'.$spremenljivka['variable'].'</span>';
+		echo '  <a href="#" title="' . $lang['srv_predogled_spremenljivka'] . '" onclick="showspremenljivkaSingleVarPopup(\''.$spid.'\'); return false;"><span class="faicon monitor"></span></a> ';	
+		SurveyAnalysis::showIcons($spid,$spremenljivka,$_from='charts');
+        echo '</div>';
+				
+		echo '</div>';
+		
+        
+		echo '</div>';
+	}
 	
 	// ikone na vrhu posameznih nastavitev (izvozi)
-	static function displayExportIcons($spid){
+	static function displayExportIcons($spid, $hide_button=false){
 		global $site_path;
 		global $lang;
 		
@@ -7329,7 +7372,8 @@ class SurveyChart {
             echo '<a href="'.makeEncodedIzvozUrlString('izvoz.php?m=charts_ppt&anketa='.self::$anketa.'&sprID='.$spid.'&loop='.$loop).'" target="_blank" title="'.$lang['PPT_Izpis'].'"><span class="faicon ppt"></span></a>';
         
         // Gumb za nastavitve
-        echo '<button class="small white-blue" onClick="chartAdvancedSettings(\''.$spid.'\', 1, \''.self::$current_loop.'\');"><span class="faicon wheel_32"></span>'.$lang['settings'].'</button>';
+        if(!$hide_button)
+            echo '<button class="small white-blue" onClick="chartAdvancedSettings(\''.$spid.'\', 1, \''.self::$current_loop.'\');"><span class="faicon wheel_32"></span>'.$lang['settings'].'</button>';
 
 		echo '</div>';
 	}
@@ -8756,8 +8800,8 @@ class SurveyChart {
 		
 		echo '</select>';
 		echo '</div>';	
-		
+
-		//Poravnava texta
+		// Poravnava texta
 		echo '<div class="chart_setting">';
 			
 		echo '<input type="checkbox" id="chart_show_legend_'.$spid.'_loop_'.self::$current_loop.'" name="chart_show_legend" '.(self::$settings['show_legend']=='1'?' checked="checked"':'').' onchange="changeChart(\''.$spid.'\', 21, \'show_legend\', \''.self::$current_loop.'\');">';
@@ -8789,7 +8833,7 @@ class SurveyChart {
 		
 		echo '<div class="chart_settings_content">';
 
-		//echo '<span class="title">'.$lang['srv_chart_settings'].'</span>';
+		echo '<div class="tab_holder"><div class="tab">'.$lang['srv_chart_open_answers_settings'].'</div></div>';
 
 
 		echo '<div class="chart_settings_inner">';
@@ -9344,7 +9388,7 @@ class SurveyChart {
 		
 		// Izpisemo nastavitve za tabele
 		echo '<div class="chart_settings table_settings printHide iconHide">';
-		self::displaySingleSettings($spid);
+		self::displaySingleSettingsTable($spid);
 		echo '</div>';	
 			
 		# izpišemo še tekstovne odgovore za polja drugo
@@ -9827,7 +9871,7 @@ class SurveyChart {
 		
 		// Izpisemo nastavitve za tabele
 		echo '<div class="chart_settings table_settings printHide iconHide">';
-		self::displaySingleSettings($spid);
+		self::displaySingleSettingsTable($spid);
 		echo '</div>';	
 		
 		echo '</div>';

admin/survey/classes/tracking/CrossRoad.php

@@ -326,7 +326,13 @@ class CrossRoad {
                         $third_action = NAVI_STATISTIC_ANALYSIS_BREAK;
                     }
 
-                    $layout_width = 'wide';
+        
+                    if  ($_GET['m'] == 'charts') {
+                        $layout_width = 'narrow';
+                    }
+                    else{
+                        $layout_width = 'wide';
+                    }
                     
                     if  ($_GET['m'] == 'anal_arch') {
                         $layout_menu = 'menu_left';

lang/1.php

@@ -4877,6 +4877,7 @@ $lang = array (
 	"srv_chart_advanced_skin"					=>	"Izberi skin",
 	"srv_chart_ttest_title"						=>	"Povprečna vrednost za",
 	"srv_chart_settings_fullScale"				=>	"Polna skala",
+	"srv_chart_open_answers_settings"			=>	"Nastavitve odprtih odgovorov",
 	"login_short"							=> "Prijava",
 	"desc2"								=>	"Padajoče brez preteklih (samo za datume)",
 	"archive_date"							=>	"Zapis datuma v arhivu: ",

lang/2.php

@@ -4850,6 +4850,7 @@ $lang = array (
 	"srv_chart_advanced_skin"					=>	"Select skin",
 	"srv_chart_ttest_title"						=>	"Average value",
 	"srv_chart_settings_fullScale"				=>	"Full scale",
+    "srv_chart_open_answers_settings"			=>	"Open answers settings",
 	"srv_comments_add_comment"					=>	"Respond to comments",
 	"srv_comments_unresolved"					=>	"Display only unresolved comments",
 	"srv_comments_marks"						=>	"Labelling comments",

resources/sass/admin_new/pages/survey_analysis/page_charts.scss

@@ -82,6 +82,10 @@
 
         &.table_settings{
             margin-top: -5px;
+
+            .tab{
+                width: 100% !important;
+            }
         }
 
         .chart_setting_exportLinks {
@@ -181,6 +185,15 @@
                     select{
                         width: 124px;
                         margin: 0;
+
+                        cursor: pointer;
+                        box-sizing: border-box;
+                        height: 30px;
+                        padding: 0 8px;
+
+                        background-color: $white;
+                        border: 1px solid $dark-gray2;
+                        border-radius: 4px;
                     }
 
                     .faicon.refresh:before{
@@ -241,7 +254,7 @@
                 .chart_setting_icons{
                     display: flex;
                     align-items: center;
-                    justify-content: center;
+                    justify-content: flex-start;
 
                     margin: 16px 0 0 0;
 
@@ -255,6 +268,10 @@
                         font-size: 14px;
                         font-weight: 600;
                     }
+
+                    .icon_box{
+                        height: auto !important;
+                    }
                 }
 
                 fieldset.chart_num_limits {
@@ -299,10 +316,15 @@
         margin-bottom: 20px;
         /*height: 60px;*/
         
+        .tab{
+            width: 100% !important;
+        }
+
         .chart_settings_inner {
             margin-top: 0px;
-        }
+        }   
     }
+
     
     .anl_bl {
         border-left: 1px solid $gray !important;
@@ -344,6 +366,8 @@
     .chart_setting_exportLinks{
         justify-content: flex-end;
     }
+
+    
 }
 
 
@@ -414,6 +438,16 @@ ul.vrednost_sort {
         padding-left: 0;
         padding-right: 0;
 	}
+
+    table{
+        tr.hidden{
+            display: none;
+        }
+
+        td.anl_ac{
+            text-align: center;
+        }
+    }
 }
 .freq_chart_table {
 	width: 800px;
@@ -424,6 +458,16 @@ ul.vrednost_sort {
         padding-left: 0;
         padding-right: 0;
 	}
+
+    table{
+        tr.hidden{
+            display: none;
+        }
+    
+        tr td.anl_ac{
+            text-align: center;
+        }
+    }
 }
 .anl_user_text_more_charts {
 	float: left;