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

Fixed module proc data in tree view(Now respect module types). Ticket #2713

This commit is contained in:
Arturo Gonzalez Diaz 2015-10-13 12:34:01 +02:00
parent ed3563d90e
commit c2b678ef95
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pandora_console/include/functions_treeview.php
View File

@ -141,17 +141,26 @@ function treeview_printModuleTable($id_module, $server_data = false) {
// Data
$last_data = db_get_row_filter ('tagente_estado', array('id_agente_modulo' => $module['id_agente_modulo'], 'order' => array('field' => 'id_agente_estado', 'order' => 'DESC')));
if ($config["render_proc"]) {
if (is_numeric($last_data["datos"]) && $last_data["datos"] == 1) {
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . $config["render_proc_ok"] . "</span>";
}
else if (is_numeric($last_data["datos"]) && $last_data["datos"] == 0){
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . $config["render_proc_fail"] . "</span>";
}
else {
if (is_numeric($last_data["datos"]))
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . format_numeric($last_data["datos"]) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" . substr(io_safe_output($last_data['datos']),0,12) . "</span>";
switch($module["id_tipo_modulo"]) {
case 2:
case 6:
case 9:
case 18:
case 21:
case 31:
if (is_numeric($last_data["datos"]) && $last_data["datos"] >= 1) {
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . $config["render_proc_ok"] . "</span>";
}
else {
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . $config["render_proc_fail"] . "</span>";
}
break;
default:
if (is_numeric($last_data["datos"]))
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" . format_numeric($last_data["datos"]) . "</span>";
else
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" . substr(io_safe_output($last_data['datos']),0,12) . "</span>";
break;
}
}
else {