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

#11474 Fix data position

Browse Source
This commit is contained in:
miguel angel rasteu 2023-06-08 09:25:36 +02:00
parent 0ca464846d
commit 115b77d7df
1 changed files with 67 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
pandora_console/operation/inventory/inventory.php
View File

@ -362,7 +362,6 @@ if ($is_metaconsole === true) {
if ($is_metaconsole === true) { if ($is_metaconsole === true) {
$nodo_image_url = $config['homeurl'].'/images/node.png'; $nodo_image_url = $config['homeurl'].'/images/node.png';
if ($id_server > 0) { if ($id_server > 0) {
// $agent_selected = io_safe_output($inventory_agent), true);
$connection = metaconsole_get_connection_by_id($id_server); $connection = metaconsole_get_connection_by_id($id_server);
$agents_node = metaconsole_get_agents_servers($connection['server_name'], $inventory_id_group); $agents_node = metaconsole_get_agents_servers($connection['server_name'], $inventory_id_group);
$node = metaconsole_get_servers($id_server); $node = metaconsole_get_servers($id_server);
@ -769,14 +768,14 @@ if ($inventory_module !== 'basic') {
foreach ($nodos as $nodo) { foreach ($nodos as $nodo) {
$agents = ''; $agents = '';
$data = [];
foreach ($nodo['data'] as $agent_rows) { foreach ($nodo['data'] as $agent_rows) {
$modules = ''; $modules = '';
foreach ($agent_rows['row'] as $key => $row) { foreach ($agent_rows['row'] as $key => $row) {
$columns = explode(';', io_safe_output($row['data_format'])); $columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp'); array_push($columns, 'Timestamp');
$data = [];
$data_rows = explode(PHP_EOL, $row['data']); $data_rows = explode(PHP_EOL, $row['data']);
foreach ($data_rows as $data_row) { foreach ($data_rows as $data_row) {
// Exclude results don't match filter. // Exclude results don't match filter.
@ -796,35 +795,58 @@ if ($inventory_module !== 'basic') {
array_push($data, (object) $row_tmp); array_push($data, (object) $row_tmp);
} }
} }
$id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid'];
$table = ui_print_datatable(
[
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'default_pagination' => 10,
'no_sortable_columns' => [-1],
]
);
$modules .= ui_toggle(
$table,
'<span class="title-blue">'.$row['name'].'</span>',
'',
'',
true,
true,
'',
'white-box-content w100p',
'box-shadow white_table_graph w100p',
'images/arrow_down_green.png',
'images/arrow_right_green.png',
false,
false,
false,
'',
'',
null,
null,
false,
$id_table
);
} }
$id_table = 'id_'.$row['id_module_inventory'].'_'.$nodo['server_uid']; $agents .= ui_toggle(
$table = ui_print_datatable( $modules,
[ $agent_rows['agent'],
'id' => $id_table,
'class' => 'info_table w100p',
'style' => 'width: 99%',
'columns' => $columns,
'column_names' => $columns,
'no_sortable_columns' => [],
'data_element' => $data,
'searching' => true,
'dom_elements' => 'ftip',
'order' => [
'field' => $columns[0],
'direction' => 'asc',
],
'zeroRecords' => __('No inventory found'),
'emptyTable' => __('No inventory found'),
'return' => true,
'default_pagination' => 10,
'no_sortable_columns' => [-1],
]
);
$modules .= ui_toggle(
$table,
'<span class="title-blue">'.$row['name'].'</span>',
'', '',
'', '',
true, true,
@ -832,32 +854,9 @@ if ($inventory_module !== 'basic') {
'', '',
'white-box-content w100p', 'white-box-content w100p',
'box-shadow white_table_graph w100p', 'box-shadow white_table_graph w100p',
'images/arrow_down_green.png',
'images/arrow_right_green.png',
false,
false,
false,
'',
'',
null,
null,
false,
$id_table
); );
} }
$agents .= ui_toggle(
$modules,
$agent_rows['agent'],
'',
'',
true,
true,
'',
'white-box-content w100p',
'box-shadow white_table_graph w100p',
);
$node_name = $nodo['server_name']; $node_name = $nodo['server_name'];
if ($count[$nodo['server_name']] > 1) { if ($count[$nodo['server_name']] > 1) {
$node_name .= ' ('.$nodo['dbhost'].')'; $node_name .= ' ('.$nodo['dbhost'].')';
@ -882,9 +881,10 @@ if ($inventory_module !== 'basic') {
foreach ($nodos as $nodo_key => $nodo) { foreach ($nodos as $nodo_key => $nodo) {
$agents = ''; $agents = '';
$data = [];
foreach ($nodo['data'] as $module_key => $module_rows) { foreach ($nodo['data'] as $module_key => $module_rows) {
$agent = ''; $agent = '';
$data = [];
foreach ($module_rows as $row) { foreach ($module_rows as $row) {
$columns = explode(';', io_safe_output($row['data_format'])); $columns = explode(';', io_safe_output($row['data_format']));
array_push($columns, 'Timestamp'); array_push($columns, 'Timestamp');
@ -957,19 +957,20 @@ if ($inventory_module !== 'basic') {
false, false,
$id_table $id_table
); );
}
$agents .= ui_toggle(
$agent, $agents .= ui_toggle(
$module_key, $agent,
'', $module_key,
'', '',
true, '',
true, true,
'', true,
'white-box-content w100p', '',
'box-shadow white_table_graph w100p', 'white-box-content w100p',
); 'box-shadow white_table_graph w100p',
);
}
$node_name = $nodo['server_name']; $node_name = $nodo['server_name'];
if ($count[$nodo['server_name']] > 1) { if ($count[$nodo['server_name']] > 1) {