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

Redesign - grafi

Browse Source
This commit is contained in:
pero1203 2022-04-25 01:10:05 +02:00
parent 9bd144c718
commit cdb207de02
4 changed files with 627 additions and 727 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

File diff suppressed because it is too large Load Diff

145
admin/survey/classes/surveyAnalysis/class.SurveyTableChart.php
View File

@ -1705,8 +1705,7 @@ class SurveyTableChart {
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
$Test->drawGrid(4,TRUE,230,230,230,50);
@ -1764,8 +1763,7 @@ class SurveyTableChart {
$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
// Če gre za hierarhijo, potem je fiksna skala
@ -1849,8 +1847,7 @@ class SurveyTableChart {
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
$Test->drawGrid(4,TRUE,230,230,230,50);
@ -1905,24 +1902,12 @@ class SurveyTableChart {
$roundText = ($this->settings['labelWidth'] == 20) ? 35 : 65;
// Pri navadnem radio in checkbox vprasanju imamo samo en stolpec - zato so dimenzije drugacne
/*if($spremenljivka['tip'] == 1 || $spremenljivka['tip'] == 2 || $spremenljivka['tip'] == 3){
$Test->setGraphArea($this->settings['hq']*200,$this->settings['hq']*50,$this->settings['hq']*630,$this->settings['hq']*220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*243,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*295,200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE);
$Test->drawHorGrid(4,TRUE,230,230,230,50);
}
else{*/
$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
$Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(295+$addHeight),200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
$Test->drawHorGrid(4,TRUE,230,230,230,50);
//}
$Test->setGraphArea($this->settings['hq']*$startX,$this->settings['hq']*70,$this->settings['hq']*650,$this->settings['hq']*(220+$addHeight));
$Test->drawFilledRoundedRectangle(7,7,793,243+$addHeight,5,255,255,255);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(295+$addHeight),200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
$Test->drawHorScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_ADDALLSTART0,0,0,0,TRUE,0,0,TRUE,1,FALSE,$roundText);
$Test->drawHorGrid(4,TRUE,230,230,230,50);
// Draw the 0 line
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*6);
@ -1975,12 +1960,8 @@ class SurveyTableChart {
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->setGraphArea(50,40,685,220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
// Draw the pie graph
$labels = ($this->settings['sort'] == 1) ? 'custom_percent_sort' : 'custom_percent';
@ -2018,12 +1999,8 @@ class SurveyTableChart {
$Test->setLineStyle($this->settings['hq'],$DotSize=0);
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
//$Test->setGraphArea(50,40,685,220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
//$Test->createColorGradientPalette(195,204,56,223,110,41,3);
//$Test->createColorGradientPalette(168,188,56,248,255,136,5);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
// Draw the pie graph
$labels = ($this->settings['sort'] == 1) ? 'custom_percent_sort' : 'custom_percent';
@ -2067,8 +2044,7 @@ class SurveyTableChart {
$Test->setGraphArea($this->settings['hq']*270,$this->settings['hq']*50,$this->settings['hq']*530,$this->settings['hq']*(220+$addHeight));
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*(243+$addHeight),5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*(245+$addHeight),200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
@ -2122,11 +2098,7 @@ class SurveyTableChart {
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*320);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*343,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*345,200,200,200);
//$Test->drawGraphArea(255,255,255,TRUE);
//$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,20,20,20,TRUE,$angle,0,TRUE,1,FALSE,$roundText);
//$Test->drawGrid(4,TRUE,230,230,230,50);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*345,200,200,200);
// Draw the 0 line
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
@ -2179,8 +2151,7 @@ class SurveyTableChart {
$Test->setFontProperties(dirname(__FILE__).'/../../pChart/Fonts/verdana.ttf',$this->settings['hq']*$this->fontSize);
$Test->setGraphArea($this->settings['hq']*100,$this->settings['hq']*40,$this->settings['hq']*650,$this->settings['hq']*220);
$Test->drawFilledRoundedRectangle($this->settings['hq']*7,$this->settings['hq']*7,$this->settings['hq']*793,$this->settings['hq']*273,5,255,255,255);
//$Test->drawRoundedRectangle(5,5,795,245,5,128,128,128);
$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
//$Test->drawRectangle($this->settings['hq']*5,$this->settings['hq']*5,$this->settings['hq']*795,$this->settings['hq']*275,200,200,200);
$Test->drawGraphArea(255,255,255,TRUE);
$Test->drawScale($DataSet->GetData(),$DataSet->GetDataDescription(),SCALE_START0,0,0,0,TRUE,$angle,0,TRUE);
if($count <= 20)
@ -2215,11 +2186,14 @@ class SurveyTableChart {
// Ikone izvoza na vrhu posameznih nastavitev
//$this->displayExportIcons($chartID);
echo '<div id="switch_left_'.$chartID.'_loop_0" class="switch_left '.($this->settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'0\', \'0\')">'.$lang['srv_chart_settings_basic'].'</div>';
//echo '<span id="switch_middle_'.$chartID.'_loop_0" class="'.($this->settings_mode == 1 ? 'rightHighlight' : 'leftHighlight').'"></span>';
echo '<div id="switch_right_'.$chartID.'_loop_0" class="switch_right '.($this->settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'1\', \'0\')">'.$lang['srv_chart_settings_advanced'].'</div>';
echo '<div class="chart_settings_content">';
echo '<div class="tab_holder">';
echo ' <div id="switch_left_'.$chartID.'_loop_0" class="tab switch_left '.($this->settings_mode == 1 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'0\', \'0\')">'.$lang['srv_chart_settings_basic'].'</div>';
echo ' <div id="switch_right_'.$chartID.'_loop_0" class="tab switch_right '.($this->settings_mode == 0 ? ' non-active' : '').'" onClick="chartSwitchSettings(\''.$chartID.'\', \'1\', \'0\')">'.$lang['srv_chart_settings_advanced'].'</div>';
echo '</div>';
// OSNOVNE NASTAVITVE
echo '<div class="chart_settings_inner" id="chart_settings_basic_'.$chartID.'_loop_0" '.($this->settings_mode == 1 ? ' style="display:none;"' : '').'>';
@ -2261,8 +2235,8 @@ class SurveyTableChart {
// visoka locljivost grafa
echo '<div class="chart_setting">';
echo $lang['srv_chart_hq'].': ';
echo '<input type="checkbox" id="tablechart_hq_'.$chartID.'" name="tablechart_hq" '.($settings['hq']=='3'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \''.$this->podstran.'\', \'hq\');">';
echo '<label for="tablechart_hq_'.$chartID.'">'.$lang['srv_chart_hq'].'</label>';
echo '</div>';
break;
@ -2273,32 +2247,23 @@ class SurveyTableChart {
$checked = ($settings['show_numerus']=='1') ? ' checked="checked"': '';
echo $lang['srv_chart_showNumerus'].': ';
echo '<input type="checkbox" id="tablechart_show_numerus_'.$chartID.'" name="tablechart_show_numerus" '.$checked.' onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'show_numerus\');">';
echo '<label for="tablechart_show_numerus_'.$chartID.'">'.$lang['srv_chart_showNumerus'].'</label>';
echo '</div>';
default:
break;
}
// Link na urejanje label
//echo '<span class="edit" style="margin-top:15px;" onclick="chartAdvancedSettings(\''.$this->counter.'\');">'.$lang['srv_chart_advancedLink_labels'].'</span>';
// Vprasajcek za pomoc
//echo Help :: display('displaychart_settings_labels');
// Link na urejanje barv
echo '<span class="edit" onclick="tableChartAdvancedSettings(\''.$chartID.'\', \''.$this->podstran.'\')">'.$lang['srv_chart_advancedLink_colors'].'</span>';
// Vprasajcek za pomoc
echo Help :: display('displaychart_settings_colors');
// Link na rekodiranje
//echo '<span class="edit" onclick="chartAdvancedSettings(\''.$this->counter.'\', \'3\');">'.$lang['srv_chart_advancedLink_recoding'].'</span>';
// Vprasajcek za pomoc
//echo Help :: display('displaychart_settings_recoding');
echo '</div>';
echo '</div>';
}
@ -2331,7 +2296,7 @@ class SurveyTableChart {
// Tip grafa
echo '<div class="chart_setting">';
echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'type\');">';
echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'type\');">';
if($this->crossCheck){
// navedbe
@ -2374,29 +2339,12 @@ class SurveyTableChart {
// prikaz label v stolpcih
//if($settings['type'] == 0 || $settings['type'] == 1){
echo '<div class="chart_setting">';
echo $lang['srv_chart_barLabel'].': ';
echo '<input type="checkbox" id="tablechart_barLabel_'.$chartID.'" name="tablechart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'barLabel\');">';
echo '<div class="chart_setting">';
echo '<input type="checkbox" id="tablechart_barLabel_'.$chartID.'" name="tablechart_barLabel" '.($settings['barLabel']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'barLabel\');">';
echo '<label for="tablechart_barLabel_'.$chartID.'">'.$lang['srv_chart_barLabel'].'</label>';
echo '</div>';
//}
// sirina label
/*if($settings['type'] == 0 || $settings['type'] == 3){
echo '<div class="chart_setting">';
echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'crosstab\', \'labelWidth\');">';
echo ' <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
echo ' <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
echo '</select>';
echo '</div>';
}*/
echo '</div>';
}
// Nastavitve za ttest graf
@ -2407,7 +2355,7 @@ class SurveyTableChart {
// sirina label
echo '<div class="chart_setting">';
echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'labelWidth\');">';
echo $lang['srv_wide_chart'].': <select class="dropdown small" id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'labelWidth\');">';
echo ' <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
echo ' <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
@ -2420,8 +2368,8 @@ class SurveyTableChart {
// visoka locljivost grafa
echo '<div class="chart_setting">';
echo $lang['srv_chart_hq'].': ';
echo '<input type="checkbox" id="tablechart_hq_'.$chartID.'" name="tablechart_hq" '.($settings['hq']=='3'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'ttest\', \'hq\');">';
echo '<label for="tablechart_hq_'.$chartID.'">'.$lang['srv_chart_hq'].'</label>';
echo '</div>';
}
@ -2433,7 +2381,7 @@ class SurveyTableChart {
// Tip grafa
echo '<div class="chart_setting">';
echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'type\');">';
echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'type\');">';
echo ' <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_avg_hor'].'</option>';
echo ' <option value="1" '.($settings['type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_avg_radar'].'</option>';
@ -2446,8 +2394,8 @@ class SurveyTableChart {
// sortiranje
echo '<div class="chart_setting">';
echo $lang['srv_chart_sort'].': ';
echo '<input type="checkbox" id="tablechart_sort_'.$chartID.'" name="tablechart_sort" '.($settings['sort']=='1'?' checked="checked"':'').' onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'sort\');">';
echo '<label for="tablechart_sort_'.$chartID.'">'.$lang['srv_chart_sort'].'</label>';
echo '</div>';
@ -2456,7 +2404,7 @@ class SurveyTableChart {
if($settings['type'] == 0){
echo '<div class="chart_setting">';
echo $lang['srv_wide_chart'].': <select id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'labelWidth\');">';
echo $lang['srv_wide_chart'].': <select class="dropdown small" id="tablechart_labelWidth_'.$chartID.'" name="tablechart_labelWidth" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'labelWidth\');">';
echo ' <option value="50" '.($settings['labelWidth']=='50'?' selected="selected"':'').'>50%</option>';
echo ' <option value="20" '.($settings['labelWidth']=='20'?' selected="selected"':'').'>20%</option>';
@ -2470,7 +2418,7 @@ class SurveyTableChart {
// Tip radarja
if($settings['type'] == 1){
echo '<div class="chart_setting">';
echo $lang['srv_chart_radar_type'].': <select id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_type\');">';
echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_type\');">';
echo ' <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
echo ' <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@ -2482,7 +2430,7 @@ class SurveyTableChart {
// Postavitev skale pri radarju
if($settings['type'] == 1){
echo '<div class="chart_setting">';
echo $lang['srv_chart_radar_scale'].': <select id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_scale\');">';
echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'mean\', \'radar_scale\');">';
echo ' <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
echo ' <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@ -2501,7 +2449,7 @@ class SurveyTableChart {
// Tip grafa
echo '<div class="chart_setting">';
echo $lang['srv_chart_type'].':<br /> <select style="width:140px;" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'type\');">';
echo $lang['srv_chart_type'].': <select class="dropdown small" id="tablechart_type_'.$chartID.'" name="tablechart_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'type\');">';
if($tip != 7)
echo ' <option value="0" '.($settings['type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar'].'</option>';
@ -2515,7 +2463,7 @@ class SurveyTableChart {
// sortiranje
echo '<div class="chart_setting">';
echo $lang['srv_chart_sort'].': <select id="tablechart_sort_'.$chartID.'" name="tablechart_sort" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'sort\');">';
echo $lang['srv_chart_sort'].': <select class="dropdown small" id="tablechart_sort_'.$chartID.'" name="tablechart_sort" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'sort\');">';
echo ' <option value="0" '.($settings['sort']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_sort_no'].'</option>';
if($tip != 7)
@ -2531,13 +2479,13 @@ class SurveyTableChart {
if($settings['rotate']=='1'){
echo $lang['srv_chart_rotate_grids'].' ';
echo '<span onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
echo '<span class="faicon refresh" onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
echo '<input type="hidden" id="tablechart_rotate_'.$chartID.'" name="tablechart_rotate" value="0">';
echo ' '.$lang['srv_chart_rotate_vars'].' ';
}
else{
echo $lang['srv_chart_rotate_vars'].' ';
echo '<span onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;"><img src="img_0/random_off.png" title="Obrni grafe/variable" /></span>';
echo '<span class="faicon refresh" onclick="changeTableChart(\''.$chartID.'\', \'break\', \'rotate\');" style="cursor: pointer;" title="Obrni grafe/variable"></span>';
echo '<input type="hidden" id="tablechart_rotate_'.$chartID.'" name="tablechart_rotate" value="1">';
echo ' '.$lang['srv_chart_rotate_grids'];
}
@ -2546,7 +2494,7 @@ class SurveyTableChart {
// Tip radarja
if($settings['type'] == '0'){
echo '<div class="chart_setting">';
echo $lang['srv_chart_radar_type'].': <select id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_type\');">';
echo $lang['srv_chart_radar_type'].': <select class="dropdown small" id="tablechart_radar_type_'.$chartID.'" name="tablechart_radar_type" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_type\');">';
echo ' <option value="0" '.($settings['radar_type']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type0'].'</option>';
echo ' <option value="1" '.($settings['radar_type']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_type1'].'</option>';
@ -2558,7 +2506,7 @@ class SurveyTableChart {
// Postavitev skale pri radarju
if($settings['type'] == '0'){
echo '<div class="chart_setting">';
echo $lang['srv_chart_radar_scale'].': <select id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_scale\');">';
echo $lang['srv_chart_radar_scale'].': <select class="dropdown small" id="tablechart_radar_scale_'.$chartID.'" name="tablechart_radar_scale" onchange="changeTableChart(\''.$chartID.'\', \'break\', \'radar_scale\');">';
echo ' <option value="0" '.($settings['radar_scale']=='0'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale0'].'</option>';
echo ' <option value="1" '.($settings['radar_scale']=='1'?' selected="selected"':'').'>'.$lang['srv_chart_radar_scale1'].'</option>';
@ -2590,7 +2538,6 @@ class SurveyTableChart {
// urejanje label
echo '<div id="chartSettingsArea2" class="chartSettingsArea" style="visibility: hidden;">';
//$this->displayAdvancedSettingsLabels($chartID);
echo '</div>';
echo '</form>';

354
public/css/admin_new.css
View File

@ -25865,6 +25865,199 @@ iframe#ifmcontentstoprint {
text-decoration: none;
}
/*
Grafi v analizi
*/
.chart_holder {
width: 1060px;
margin: 0 auto;
padding-top: 36px;
overflow: hidden;
text-align: center;
}
.chart_holder .chart_title {
width: 800px;
margin: 0 0 16px 0;
font-weight: 600;
font-size: 18px;
text-align: left;
}
.chart_holder .chart_title .subtitle {
font-weight: normal;
font-size: 12px;
color: #333333;
}
.chart_holder .chart_title span.numerus {
font-weight: normal;
color: #333333;
padding-left: 10px;
}
.chart_holder .chart_img {
float: left;
min-height: 260px;
border: 1px solid #D3D3D3;
border-radius: 2px;
}
.chart_holder .chart_img img {
width: 800px;
}
.chart_holder .chart_bottom_info {
clear: both;
width: auto;
height: 20px;
padding: 5px;
text-align: left;
}
.chart_holder .chart_bottom_info ul {
list-style: none;
}
.chart_holder .chart_bottom_info ul li {
display: inline;
margin-right: 2px;
}
.chart_holder .chart_other_text {
margin-top: 10px;
float: left;
width: 770px;
min-height: 150px;
padding-left: 30px;
}
.chart_holder .chart_settings {
float: right;
position: relative;
display: flex;
flex-direction: column;
width: 230px;
margin-top: -46px;
opacity: 0;
}
.chart_holder .chart_settings .chart_setting_exportLinks {
display: flex;
align-items: center;
margin-bottom: 16px;
}
.chart_holder .chart_settings .chart_setting_exportLinks a {
margin: 0 0 0 16px;
}
.chart_holder .chart_settings .chart_setting_exportLinks a:first-child {
margin-left: 0;
}
.chart_holder .chart_settings .chart_setting_exportLinks button {
min-width: 0;
width: auto;
margin-left: 16px;
padding: 4px 14px;
font-weight: 400;
font-size: 14px;
color: #333333;
border-radius: 2px;
}
.chart_holder .chart_settings .chart_setting_exportLinks button .faicon {
margin-right: 8px;
}
.chart_holder .chart_settings .chart_setting_exportLinks button .faicon:before {
color: #1E88E5;
font-size: 14px;
}
.chart_holder .chart_settings .chart_settings_content {
border: 1px solid #D3D3D3;
border-radius: 2px;
}
.chart_holder .chart_settings .chart_settings_content .tab_holder {
display: flex;
}
.chart_holder .chart_settings .chart_settings_content .tab_holder .tab {
position: relative;
display: flex;
justify-content: center;
align-items: center;
width: 50%;
height: 40px;
font-size: 13px;
color: #333333;
}
.chart_holder .chart_settings .chart_settings_content .tab_holder .tab.non-active {
cursor: pointer;
color: #777777;
background-color: #F8F8F8 !important;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner {
position: relative;
box-sizing: border-box;
width: 100%;
padding: 0 16px 16px 16px;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting {
display: flex;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
margin: 16px 0 0 0;
text-align: left;
font-weight: 400;
font-size: 14px;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting label {
text-align: left;
font-weight: 400;
font-size: 14px;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting select {
width: 124px;
margin: 0;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_setting .faicon.refresh:before {
color: #1E88E5;
font-size: 14px;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner fieldset.chart_num_limits {
padding: 0;
margin: 0 !important;
}
.chart_holder .chart_settings .chart_settings_content .chart_settings_inner .chart_num_limits legend {
color: black;
}
.chart_holder .chart_settings .chart_settings_content span.title {
color: #1E88E5;
font-size: 14px;
font-weight: bold;
}
.chart_holder .chart_settings .chart_settings_content span.edit {
cursor: pointer;
display: block;
margin: 10px;
font-weight: bold;
text-align: left;
color: #1E88E5;
}
.chart_holder .chart_settings .chart_settings_content span.edit:hover {
color: #1E88E5;
}
.chart_holder .chart_settings .chart_settings_content input[type=text] {
width: 50px;
float: right;
}
.chart_holder .other_settings {
margin-top: 50px;
margin-bottom: 20px;
/*height: 60px;*/
}
.chart_holder .other_settings .chart_settings_inner {
margin-top: 0px;
}
.chart_holder .anl_bl {
border-left: 1px solid #E5E5E5 !important;
}
.chart_holder .anl_br {
border-right: 1px solid #E5E5E5 !important;
}
.chart_holder .anl_bt {
border-top: 1px solid #E5E5E5 !important;
}
.chart_holder .anl_bb {
border-bottom: 1px solid #E5E5E5 !important;
}
/*editing chart labels in popup*/
table#grids td {
padding: 0 5px;
@ -26028,167 +26221,6 @@ ul.vrednost_sort input[type=text] {
margin: 10px;
}
.chart_holder {
margin: 20px auto 50px auto;
width: 1000px;
overflow: hidden;
text-align: center;
}
.chart_holder .chart_title {
width: 800px;
margin: 5px 0px 15px 0;
padding-left: 5px;
padding-right: 5px;
font-weight: 600;
font-size: 14px;
text-align: left;
}
.chart_holder .chart_title .subtitle {
font-weight: normal;
font-size: 12px;
color: #333333;
}
.chart_holder .chart_title span.numerus {
font-weight: normal;
color: #333333;
padding-left: 10px;
}
.chart_holder .chart_img {
float: left;
min-height: 260px;
}
.chart_holder .chart_img img {
width: 800px;
}
.chart_holder .chart_bottom_info {
clear: both;
width: auto;
height: 20px;
padding: 5px;
text-align: left;
}
.chart_holder .chart_bottom_info ul {
list-style: none;
}
.chart_holder .chart_bottom_info ul li {
display: inline;
margin-right: 2px;
}
.chart_holder .chart_other_text {
margin-top: 10px;
float: left;
width: 770px;
min-height: 150px;
padding-left: 30px;
}
.chart_holder .chart_settings {
float: right;
position: relative;
opacity: 0;
filter: alpha(opacity=0);
margin-top: -25px;
background-color: #E5E5E5;
border: 1px solid #E5E5E5;
}
.chart_holder .chart_settings .switch_left {
z-index: 99999;
position: relative;
width: 90px;
height: 17px;
padding: 5px 0 8px 0 !important;
color: #1E88E5;
font-size: 13px;
font-weight: 500;
background-color: white;
float: left;
}
.chart_holder .chart_settings .switch_right {
z-index: 99999;
position: relative;
width: 90px;
height: 17px;
padding: 5px 0 8px 0 !important;
color: #1E88E5;
font-size: 13px;
font-weight: 500;
background-color: white;
float: right;
}
.chart_holder .chart_settings .non-active {
cursor: pointer;
background-color: #E5E5E5 !important;
}
.chart_holder .chart_settings .chart_settings_inner {
position: relative;
clear: both;
margin-top: -3px;
padding: 10px;
width: 160px;
height: auto;
font-size: 10px;
line-height: 15px;
font-weight: normal;
text-align: left;
background-color: white;
}
.chart_holder .chart_settings span.title {
color: #1E88E5;
font-size: 14px;
font-weight: bold;
}
.chart_holder .chart_settings span.edit {
cursor: pointer;
display: block;
margin: 10px;
font-weight: bold;
text-align: left;
color: #1E88E5;
}
.chart_holder .chart_settings span.edit:hover {
color: #1E88E5;
}
.chart_holder .chart_settings input[type=text] {
width: 50px;
float: right;
}
.chart_holder .chart_settings .chart_setting_exportLinks {
text-align: right;
padding: 7px;
}
.chart_holder .chart_settings .chart_setting_exportLinks span {
margin: 0 4px;
}
.chart_holder .chart_settings_inner fieldset.chart_num_limits {
padding: 0;
margin: 0 !important;
}
.chart_holder .chart_settings_inner .chart_num_limits legend {
color: black;
}
.chart_holder .other_settings {
margin-top: 50px;
margin-bottom: 20px;
/*height: 60px;*/
}
.chart_holder .other_settings .chart_settings_inner {
margin-top: 0px;
}
.chart_holder .chart_setting {
margin: 10px;
}
.chart_holder .anl_bl {
border-left: 1px solid #E5E5E5 !important;
}
.chart_holder .anl_br {
border-right: 1px solid #E5E5E5 !important;
}
.chart_holder .anl_bt {
border-top: 1px solid #E5E5E5 !important;
}
.chart_holder .anl_bb {
border-bottom: 1px solid #E5E5E5 !important;
}
.chart_other_text .chart_title {
margin-top: 20px;
padding-left: 0;

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

@ -1,3 +1,244 @@
/*
Grafi v analizi
*/
// Posamezen element grafa
.chart_holder {
width: 1060px;
margin: 0 auto;
padding-top: 36px;
overflow: hidden;
text-align: center;
.chart_title {
width: 800px;
margin: 0 0 16px 0;
font-weight: 600;
font-size: 18px;
text-align: left;
.subtitle {
font-weight: normal;
font-size: 12px;
color: $black;
}
span.numerus {
font-weight: normal;
color: $black;
padding-left: 10px;
}
}
.chart_img {
float: left;
min-height: 260px;
border: 1px solid $dark-gray2;
border-radius: 2px;
img {
width: 800px;
}
}
.chart_bottom_info {
clear: both;
width: auto;
height: 20px;
padding: 5px;
text-align: left;
ul {
list-style: none;
li {
display: inline;
margin-right: 2px;
}
}
}
.chart_other_text {
margin-top: 10px;
float: left;
width: 770px;
min-height: 150px;
padding-left: 30px;
}
.chart_settings {
float: right;
position: relative;
display: flex;
flex-direction: column;
width: 230px;
margin-top: -46px;
opacity: 0;
.chart_setting_exportLinks {
display: flex;
align-items: center;
margin-bottom: 16px;
a {
margin: 0 0 0 16px;
&:first-child{
margin-left: 0;
}
}
button{
min-width: 0;
width: auto;
margin-left: 16px;
padding: 4px 14px;
font-weight: 400;
font-size: 14px;
color: $black;
border-radius: 2px;
.faicon{
margin-right: 8px;
&:before{
color: $blue;
font-size: 14px;
}
}
}
}
.chart_settings_content{
border: 1px solid $dark-gray2;
border-radius: 2px;
.tab_holder{
display: flex;
.tab{
position: relative;
display: flex;
justify-content: center;
align-items: center;
width: 50%;
height: 40px;
font-size: 13px;
color: $black;
&.non-active {
cursor: pointer;
color: $very-dark-gray;
background-color: $light-gray !important;
}
}
}
.chart_settings_inner {
position: relative;
box-sizing: border-box;
width: 100%;
padding: 0 16px 16px 16px;
.chart_setting {
display: flex;
align-items: center;
justify-content: space-between;
box-sizing: border-box;
margin: 16px 0 0 0;
text-align: left;
font-weight: 400;
font-size: 14px;
label{
text-align: left;
font-weight: 400;
font-size: 14px;
}
select{
width: 124px;
margin: 0;
}
.faicon.refresh:before{
color: $blue;
font-size: 14px;
}
}
fieldset.chart_num_limits {
padding: 0;
margin: 0 !important;
}
.chart_num_limits {
legend {
color: black;
}
}
}
span.title {
color: $blue;
font-size: 14px;
font-weight: bold;
}
span.edit {
cursor: pointer;
display: block;
margin: 10px;
font-weight: bold;
text-align: left;
color: $blue;
&:hover {
color: $blue;
}
}
input[type=text] {
width: 50px;
float: right;
}
}
}
.other_settings {
margin-top: 50px;
margin-bottom: 20px;
/*height: 60px;*/
.chart_settings_inner {
margin-top: 0px;
}
}
.anl_bl {
border-left: 1px solid $gray !important;
}
.anl_br {
border-right: 1px solid $gray !important;
}
.anl_bt {
border-top: 1px solid $gray !important;
}
.anl_bb {
border-bottom: 1px solid $gray !important;
}
}
/*editing chart labels in popup*/
table#grids {
@ -162,174 +403,7 @@ ul.vrednost_sort {
margin: 10px;
}
}
.chart_holder {
margin: 20px auto 50px auto;
width: 1000px;
overflow: hidden;
text-align: center;
.chart_title {
width: 800px;
margin: 5px 0px 15px 0;
padding-left: 5px;
padding-right: 5px;
font-weight: 600;
font-size: 14px;
text-align: left;
.subtitle {
font-weight: normal;
font-size: 12px;
color: $black;
}
span.numerus {
font-weight: normal;
color: $black;
padding-left: 10px;
}
}
.chart_img {
float: left;
min-height: 260px;
img {
width: 800px;
}
}
.chart_bottom_info {
clear: both;
width: auto;
height: 20px;
padding: 5px;
text-align: left;
ul {
list-style: none;
li {
display: inline;
margin-right: 2px;
}
}
}
.chart_other_text {
margin-top: 10px;
float: left;
width: 770px;
min-height: 150px;
padding-left: 30px;
}
.chart_settings {
float: right;
position: relative;
opacity: 0;
filter: alpha(opacity=0);
margin-top: -25px;
background-color: $gray;
border: 1px solid $gray;
.switch_left {
z-index: 99999;
position: relative;
width: 90px;
height: 17px;
padding: 5px 0 8px 0 !important;
color: $blue;
font-size: 13px;
font-weight: 500;
background-color: white;
float: left;
}
.switch_right {
z-index: 99999;
position: relative;
width: 90px;
height: 17px;
padding: 5px 0 8px 0 !important;
color: $blue;
font-size: 13px;
font-weight: 500;
background-color: white;
float: right;
}
.non-active {
cursor: pointer;
background-color: $gray !important;
}
.chart_settings_inner {
position: relative;
clear: both;
margin-top: -3px;
padding: 10px;
width: 160px;
height: auto;
font-size: 10px;
line-height: 15px;
font-weight: normal;
text-align: left;
background-color: white;
}
span.title {
color: $blue;
font-size: 14px;
font-weight: bold;
}
span.edit {
cursor: pointer;
display: block;
margin: 10px;
font-weight: bold;
text-align: left;
color: $blue;
&:hover {
color: $blue;
}
}
input[type=text] {
width: 50px;
float: right;
}
.chart_setting_exportLinks {
text-align: right;
padding: 7px;
span {
margin: 0 4px;
}
}
}
.chart_settings_inner {
fieldset.chart_num_limits {
padding: 0;
margin: 0 !important;
}
.chart_num_limits {
legend {
color: black;
}
}
}
.other_settings {
margin-top: 50px;
margin-bottom: 20px;
/*height: 60px;*/
.chart_settings_inner {
margin-top: 0px;
}
}
.chart_setting {
margin: 10px;
}
.anl_bl {
border-left: 1px solid $gray !important;
}
.anl_br {
border-right: 1px solid $gray !important;
}
.anl_bt {
border-top: 1px solid $gray !important;
}
.anl_bb {
border-bottom: 1px solid $gray !important;
}
}
.chart_other_text {
.chart_title {
margin-top: 20px;