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

#11490 deleted name in treemap if it's empty and fixed bug in metaconsole

This commit is contained in:
Daniel Cebrian 2023-08-30 12:37:34 +02:00
parent 93b52faf2f
commit 13dbed4327
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/include/graphs/pandora.d3.js
View File

@ -486,6 +486,9 @@ function treeMap(recipient, data, width, height, childLinks = false) {
})
.attr("height", headerHeight);
parentEnterTransition
.filter(function(d) {
if (d.name) return d;
})
.append("rect")
.attr("width", function(d) {
return Math.max(0.01, d.dx);
@ -493,6 +496,9 @@ function treeMap(recipient, data, width, height, childLinks = false) {
.attr("height", headerHeight)
.style("fill", headerColor);
parentEnterTransition
.filter(function(d) {
if (d.name) return d;
})
.append("text")
.attr("class", "label")
.attr("fill", "white")

30
pandora_console/include/lib/Dashboard/Widgets/groups_status_map.php
View File

@ -299,7 +299,22 @@ class GroupsStatusMapWidget extends Widget
GROUP BY a.id_grupo, estado';
$result = db_process_sql($sql);
if ($result !== false) {
$rows = array_merge_recursive($result, $rows);
foreach ($result as $key => $group) {
$not_exist = true;
foreach ($rows as $key2 => $row) {
if ($group['id_grupo'] === $row['id_grupo']
&& $group['estado'] === $row['estado']
) {
$rows[$key2]['total_modules'] += $group['total_modules'];
$not_exist = false;
break;
}
}
if ($not_exist === true) {
$rows[] = $group;
}
}
}
}
@ -376,25 +391,18 @@ class GroupsStatusMapWidget extends Widget
continue;
}
if (empty($level1['children'][$row['id_grupo']][$row['estado']]['value']) === false) {
$total = ($row['total_modules'] + $level1['children'][$row['id_grupo']][$row['estado']]['value']);
} else {
$total = $row['total_modules'];
}
$level1['children'][$row['id_grupo']][$row['estado']] = [
$level1['children'][$row['id_grupo']][] = [
'id' => uniqid(),
'name' => $row['estado'],
'value' => $total,
'value' => $row['total_modules'],
'color' => $color,
'tooltip_content' => $total.__(' Modules(%s)', $name_status),
'tooltip_content' => $row['total_modules'].__(' Modules(%s)', $name_status),
'link' => 'index.php?sec=view&sec2=operation/agentes/status_monitor&refr=0&ag_group='.$row['id_grupo'].'&ag_freestring=&module_option=1&ag_modulename=&moduletype=&datatype=&status='.$row['estado'].'&sort_field=&sort=none&pure=',
];
$names[$row['id_grupo']] = $row['nombre'];
}
$level2 = [
'name' => __('Group status map'),
'children' => [],
];
foreach ($level1['children'] as $id_grupo => $group) {