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

Redesign - popravki grafov

Browse Source
This commit is contained in:
pero1203 2022-06-14 11:25:01 +02:00
parent 7b62cc58ca
commit fdc9c3c203
6 changed files with 1591 additions and 1464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
admin/survey/classes/surveyAnalysis/class.SurveyChart.php
View File

@ -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
@ -7227,15 +7229,6 @@ class SurveyChart {
self::displayMultinumberSettings($spid, $settings);
break;
case 21:
case 4:
self::displayTableSettings($spid);
break;
case 19:
self::displayMultitextSettings($spid, $settings);
break;
default:
break;
}
@ -7304,8 +7297,58 @@ 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,6 +7372,7 @@ 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
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>';
@ -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>';

6
admin/survey/classes/tracking/CrossRoad.php
View File

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

1
lang/1.php
View File

@ -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&#269;e brez preteklih (samo za datume)",
"archive_date" => "Zapis datuma v arhivu: ",

1
lang/2.php
View File

@ -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",

2919
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

46
resources/sass/admin_new/pages/survey_analysis/page_charts.scss
View File

@ -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,11 +316,16 @@
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;