tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-11680-15857-bug-dashboard-metaconsola-widgets-servicio-con-mapa-sunburts' into 'develop'

Browse Source 
Ent 11680 [#15857]Bug Dashboard metaconsola widgets servicio con mapa sunburts

See merge request artica/pandorafms!6190
This commit is contained in:
Rafael Ameijeiras 2023-07-17 06:04:55 +00:00
commit df70aa6ee6
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/graphs/functions_d3.php
View File

@ -150,7 +150,7 @@ function d3_tree_map_graph($data, $width=700, $height=700, $return=false)
} }
function d3_sunburst_graph($data, $width=700, $height=700, $return=false, $tooltip=true) function d3_sunburst_graph($data, $width=700, $height=700, $return=false, $tooltip=true, $id_container=false)
{ {
global $config; global $config;
@ -158,6 +158,8 @@ function d3_sunburst_graph($data, $width=700, $height=700, $return=false, $toolt
$data = json_encode($data); $data = json_encode($data);
} }
$id_container = ($id_container === false) ? '#sunburst' : $id_container;
$output = "<div id=\"sunburst\" style='overflow: hidden;'></div>"; $output = "<div id=\"sunburst\" style='overflow: hidden;'></div>";
$output .= include_javascript_d3(true); $output .= include_javascript_d3(true);
$output .= '<style type="text/css"> $output .= '<style type="text/css">
@ -167,7 +169,7 @@ function d3_sunburst_graph($data, $width=700, $height=700, $return=false, $toolt
} }
</style>'; </style>';
$output .= "<script language=\"javascript\" type=\"text/javascript\"> $output .= "<script language=\"javascript\" type=\"text/javascript\">
sunburst('#sunburst', $data, '$width', '$height', '$tooltip'); sunburst('$id_container', $data, '$width', '$height', '$tooltip');
</script>"; </script>";
if (!$return) { if (!$return) {

9
pandora_console/include/lib/Dashboard/Widgets/service_map.php
View File

@ -433,7 +433,14 @@ class ServiceMapWidget extends Widget
); );
} else { } else {
include_once $config['homedir'].'/include/graphs/functions_d3.php'; include_once $config['homedir'].'/include/graphs/functions_d3.php';
servicemap_print_sunburst($this->values['serviceId'], $size['width'], $size['height'], false); $id_container = '#container_servicemap_'.$this->values['serviceId'].'_'.$this->cellId.' #sunburst';
servicemap_print_sunburst(
$this->values['serviceId'],
$size['width'],
$size['height'],
false,
$id_container
);
} }
$output .= ob_get_clean(); $output .= ob_get_clean();