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

2014-03-06 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_visual_map.php,
	operation/visual_console/render_view.php: cleaned source code style.
	
	* include/functions_reporting.php: fixed the legend for the graphs
	into the topn element report.
	
	Incident: #597




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9521 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2014-03-06 17:46:44 +00:00
parent 35ac022587
commit 32a95a211a
4 changed files with 81 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/ChangeLog
View File

@ -1,3 +1,13 @@
2014-03-06 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_visual_map.php,
operation/visual_console/render_view.php: cleaned source code style.
* include/functions_reporting.php: fixed the legend for the graphs
into the topn element report.
Incident: #597
2014-03-06 Miguel de Dios <miguel.dedios@artica.es> 2014-03-06 Miguel de Dios <miguel.dedios@artica.es>
* operation/agentes/snapshot_view.php: fixed the lost scrollbars. * operation/agentes/snapshot_view.php: fixed the lost scrollbars.

60
pandora_console/include/functions_reporting.php
View File

@ -5100,6 +5100,33 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
' - ' . ' - ' .
ui_print_truncate_text($module_name[$i], $truncate_size, false, true, false, "..."); ui_print_truncate_text($module_name[$i], $truncate_size, false, true, false, "...");
//Dirty hack, maybe I am going to apply a job in Apple
//https://www.imperialviolet.org/2014/02/22/applebug.html
$item_name_key_pie = $item_name;
$exist_key = true;
while ($exist_key) {
if (isset($data_pie_graph[$item_name_key_pie])) {
$item_name_key_pie .= ' ';
}
else {
$exist_key = false;
}
}
$item_name_key_hbar = $item_name;
$exist_key = true;
while ($exist_key) {
if (isset($data_hbar[$item_name_key_hbar])) {
$item_name_key_hbar = ' ' . $item_name_key_hbar;
}
else {
$exist_key = false;
}
}
$data_hbar[$item_name]['g'] = $dt; $data_hbar[$item_name]['g'] = $dt;
$data_pie_graph[$item_name] = $dt; $data_pie_graph[$item_name] = $dt;
@ -5122,9 +5149,38 @@ function reporting_render_report_html_item ($content, $table, $report, $mini = f
foreach ($agent_name as $an) { foreach ($agent_name as $an) {
$item_name = ''; $item_name = '';
$item_name = $item_name =
ui_print_truncate_text($agent_name[$i], $truncate_size, false, true, false, "...") . ui_print_truncate_text($agent_name[$i],
$truncate_size, false, true, false, "...") .
' - ' . ' - ' .
ui_print_truncate_text($module_name[$i], $truncate_size, false, true, false, "..."); ui_print_truncate_text($module_name[$i],
$truncate_size, false, true, false, "...");
//Dirty hack, maybe I am going to apply a job in Apple
//https://www.imperialviolet.org/2014/02/22/applebug.html
$item_name_key_pie = $item_name;
$exist_key = true;
while ($exist_key) {
if (isset($data_pie_graph[$item_name_key_pie])) {
$item_name_key_pie .= ' ';
}
else {
$exist_key = false;
}
}
$item_name_key_hbar = $item_name;
$exist_key = true;
while ($exist_key) {
if (isset($data_hbar[$item_name_key_hbar])) {
$item_name_key_hbar = ' ' . $item_name_key_hbar;
}
else {
$exist_key = false;
}
}
$data_pie_graph[$item_name] = $data_top[$i]; $data_pie_graph[$item_name] = $data_top[$i];
$data_hbar[$item_name]['g'] = $data_top[$i]; $data_hbar[$item_name]['g'] = $data_top[$i];

9
pandora_console/include/functions_visual_map.php
View File

@ -1014,11 +1014,12 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
$layout_data_parent = db_get_row_filter('tlayout_data', $layout_data_parent = db_get_row_filter('tlayout_data',
array('id' => $layout_data["parent_item"])); array('id' => $layout_data["parent_item"]));
$status_parent = visual_map_get_status_element($layout_data_parent); $status_parent =
visual_map_get_status_element($layout_data_parent);
$line['id'] = $layout_data['id']; $line['id'] = $layout_data['id'];
$line['node_begin'] = 'layout-data-'.$layout_data["parent_item"]; $line['node_begin'] = 'layout-data-' . $layout_data["parent_item"];
$line['node_end'] = 'layout-data-'.$layout_data["id"]; $line['node_end'] = 'layout-data-' . $layout_data["id"];
switch ($status_parent) { switch ($status_parent) {
default: default:
case VISUAL_MAP_STATUS_UNKNOWN: case VISUAL_MAP_STATUS_UNKNOWN:
@ -1038,8 +1039,6 @@ function visual_map_print_visual_map ($id_layout, $show_links = true, $draw_line
array_push ($lines, $line); array_push ($lines, $line);
} }
// ************************************************************* // *************************************************************
// Get STATUS of current object // Get STATUS of current object
// ************************************************************* // *************************************************************

19
pandora_console/operation/visual_console/render_view.php
View File

@ -183,20 +183,19 @@ if ($config["pure"]) {
?> ?>
t = new Date(); t = new Date();
t.setTime (t.getTime() + <?php echo $refr * 1000; ?>); t.setTime (t.getTime() + <?php echo $refr * 1000; ?>);
$("#countdown").countdown( $("#countdown").countdown({
{
until: t, until: t,
format: 'MS', format: 'MS',
description: '<?php echo __('Until refresh'); ?>', description: '<?php echo __('Until refresh'); ?>',
onExpiry: function () { onExpiry: function () {
href = "<?php href = "<?php
$url = ui_get_full_url(); $url = ui_get_full_url();
$url = preg_replace("/&refr=.*&/", "&", $url); $url = preg_replace("/&refr=.*&/", "&", $url);
echo $url; echo $url;
?>"; ?>";
href = href + "&refr=<?php echo $refr;?>"; href = href + "&refr=<?php echo $refr;?>";
$(document).attr ("location", href); $(document).attr ("location", href);
} }
} }
); );