tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

WIP: Setted graph_image_height

This commit is contained in:
Jose Gonzalez 2021-12-22 11:06:11 +01:00
parent ed4e1e4be4
commit 7ea195c9c7
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/reporting/reporting_builder.item_editor.php
View File

@ -211,7 +211,7 @@ switch ($action) {
$failover_type = REPORT_FAILOVER_TYPE_NORMAL; $failover_type = REPORT_FAILOVER_TYPE_NORMAL;
$server_name = ''; $server_name = '';
$server_id = 0; $server_id = 0;
$dyn_height = 230; $dyn_height = (empty($config['graph_image_height']) === false) ? $config['graph_image_height'] : REPORT_ITEM_DYNAMIC_HEIGHT;
$landscape = false; $landscape = false;
$pagebreak = false; $pagebreak = false;
$summary = 0; $summary = 0;
@ -252,7 +252,7 @@ switch ($action) {
$server_name = ''; $server_name = '';
$server_id = 0; $server_id = 0;
$get_data_editor = false; $get_data_editor = false;
$dyn_height = 230; $dyn_height = (empty($config['graph_image_height']) === false) ? $config['graph_image_height'] : REPORT_ITEM_DYNAMIC_HEIGHT;
break; break;
} }

2
pandora_console/include/constants.php
View File

@ -456,6 +456,8 @@ define('REPORT_ITEM_ORDER_BY_ASCENDING', 2);
define('REPORT_ITEM_ORDER_BY_DESCENDING', 1); define('REPORT_ITEM_ORDER_BY_DESCENDING', 1);
define('REPORT_ITEM_ORDER_BY_UNSORT', 0); define('REPORT_ITEM_ORDER_BY_UNSORT', 0);
define('REPORT_ITEM_DYNAMIC_HEIGHT', 230);
define('REPORT_OLD_TYPE_SIMPLE_GRAPH', 1); define('REPORT_OLD_TYPE_SIMPLE_GRAPH', 1);
define('REPORT_OLD_TYPE_CUSTOM_GRAPH', 2); define('REPORT_OLD_TYPE_CUSTOM_GRAPH', 2);
define('REPORT_OLD_TYPE_SLA', 3); define('REPORT_OLD_TYPE_SLA', 3);

6
pandora_console/include/functions_reporting.php
View File

@ -9817,19 +9817,21 @@ function reporting_set_conf_charts(
$content, $content,
&$ttl &$ttl
) { ) {
global $config;
switch ($type) { switch ($type) {
case 'dinamic': case 'dinamic':
default: default:
$only_image = false; $only_image = false;
$width = 900; $width = 900;
$height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : 230; $height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : $config['graph_image_height'];
$ttl = 1; $ttl = 1;
break; break;
case 'static': case 'static':
$ttl = 2; $ttl = 2;
$only_image = true; $only_image = true;
$height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : 230; $height = isset($content['style']['dyn_height']) ? $content['style']['dyn_height'] : $config['graph_image_height'];
$width = 650; $width = 650;
break; break;