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-12696-usuario-de-con-permisos-de-grupo-ve-todas-las-paradas-planificadas-en-la-vista-tactica' into 'develop' 

Ent 12696 usuario de con permisos de grupo ve todas las paradas planificadas en la vista tactica

See merge request artica/pandorafms!6852
This commit is contained in:
Rafael Ameijeiras 2024-01-18 12:53:02 +00:00
parent 030d34224e ce00c4b9e5
commit edc5354c21
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/include/lib/TacticalView/elements/Agents.php
View File

@ -436,12 +436,16 @@ class Agents extends Element
$percentages = []; $percentages = [];
$total = array_sum($data); $total = array_sum($data);
foreach ($data as $key => $value) { foreach ($data as $key => $value) {
$percentage = (($value / $total) * 100); if ($total > 0) {
if ($percentage < 1 && $percentage > 0) { $percentage = (($value / $total) * 100);
$percentage = 1; if ($percentage < 1 && $percentage > 0) {
} $percentage = 1;
}
$percentages[$key] = format_numeric($percentage, 0); $percentages[$key] = format_numeric($percentage, 0);
} else {
$percentages[$key] = '0%';
}
} }
$data = $percentages; $data = $percentages;

3
pandora_console/include/lib/TacticalView/elements/Groups.php
View File

@ -113,8 +113,9 @@ class Groups extends Element
$id_groups = implode(',', $id_groups); $id_groups = implode(',', $id_groups);
$modules = modules_get_modules_in_group($id_groups); $modules = modules_get_modules_in_group($id_groups);
$total_groups = count($modules); $total_groups = ($modules !== false) ? count($modules) : 0;
if ($total_groups === 0) { if ($total_groups === 0) {
include_once $config['homedir'].'/include/functions_graph.php';
return graph_nodata_image(['width' => '400']); return graph_nodata_image(['width' => '400']);
} }

4
pandora_console/include/lib/TacticalView/elements/ScheduledDowntime.php
View File

@ -156,13 +156,15 @@ class ScheduledDowntime extends Element
'cron_interval_from', 'cron_interval_from',
'cron_interval_to', 'cron_interval_to',
]; ];
$groups = implode(',', array_keys(users_get_groups($config['user'])));
$columns_str = implode(',', $columns); $columns_str = implode(',', $columns);
$sql = sprintf( $sql = sprintf(
'SELECT %s 'SELECT %s
FROM tplanned_downtime FROM tplanned_downtime
WHERE id_group IN (%s)
%s %s', %s %s',
$columns_str, $columns_str,
$groups,
$order, $order,
$pagination, $pagination,
); );