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

Merge branch 'ent-9814-nuego-item-graficas-de-capacity-planning-en-dashboard' into 'develop' 

Ent 9814 nuego item graficas de capacity planning en dashboard

See merge request artica/pandorafms!6591
This commit is contained in:
Matias Didier 2023-10-25 13:42:53 +00:00
parent 50d3139dc7 4b8b296722
commit 88deb7bd83
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/graphs/flot/jquery.flot.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
pandora_console/include/lib/Dashboard/Widgets/single_graph.php
View File

@ -300,6 +300,10 @@ class SingleGraphWidget extends Widget
$values['period'] = SECONDS_1DAY; $values['period'] = SECONDS_1DAY;
} }
if (isset($values['period_projection']) === false) {
$values['period_projection'] = SECONDS_1DAY;
}
if (isset($values['showLegend']) === false) { if (isset($values['showLegend']) === false) {
$values['showLegend'] = 1; $values['showLegend'] = 1;
} }
@ -439,7 +443,7 @@ class SingleGraphWidget extends Widget
$trickHight = 0; $trickHight = 0;
if ($this->values['showLegend'] === 1) { if ($this->values['showLegend'] === 1) {
// Needed for legend. // Needed for legend.
$trickHight = 40; $trickHight = 60;
} }
$output = '<div class="container-center widget-mrgn-0px">'; $output = '<div class="container-center widget-mrgn-0px">';
@ -448,10 +452,16 @@ class SingleGraphWidget extends Widget
'period' => $this->values['period'], 'period' => $this->values['period'],
'date' => strtotime(date('Y-m-d H:i:s')), 'date' => strtotime(date('Y-m-d H:i:s')),
'only_image' => false, 'only_image' => false,
'homeurl' => ui_get_full_url(false, false, false, false).'/',
'height' => ((int) $size['height'] - $trickHight), 'height' => ((int) $size['height'] - $trickHight),
'landscape' => $content['landscape'], 'landscape' => $content['landscape'],
'return_img_base_64' => true, 'return_img_base_64' => true,
'show_legend' => $this->values['showLegend'],
'width' => '100%',
'height' => ((int) $size['height'] - $trickHight),
'title' => $module_name,
'unit' => $units_name,
'homeurl' => $config['homeurl'],
'menu' => false,
]; ];
$params_combined = [ $params_combined = [

4
pandora_console/include/styles/dashboards.css
View File

@ -949,3 +949,7 @@ input.resize_button {
bottom: 3%; bottom: 3%;
right: 6%; right: 6%;
} }
.parent_graph > .graph {
margin-left: 10px;
}