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

Merge branch '2-el-campo-last-data-hacer-click-en-un-modulo-no-se-muestra-correctamente' into 'develop' 

Change visual of data in tree view, now show more data.

Closes #2

See merge request !4
This commit is contained in:
mlopez 2017-01-11 13:14:39 +01:00
parent 2224478ed5 eaacf46131
commit 256e81d086
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pandora_console/include/functions_treeview.php
View File

@ -198,16 +198,18 @@ function treeview_printModuleTable($id_module, $server_data = false, $no_head =
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true,
true, '...', 'white-space: nowrap;');
break;
default:
if (is_numeric($last_data["datos"]))
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true,
true, '...', 'white-space: nowrap;');
break;
}
break;
@ -225,17 +227,20 @@ function treeview_printModuleTable($id_module, $server_data = false, $no_head =
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true, true,
'...', 'white-space: nowrap;');
break;
default:
if (is_numeric($last_data["datos"]))
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
GENERIC_SIZE_TEXT, true, true, true,
'...', 'white-space: nowrap;');
break;
}
}
if (!empty($last_data['utimestamp'])) {
$last_data_str = $data;