mirror of
https://github.com/pandorafms/pandorafms.git
synced 2025-07-26 07:16:28 +02:00
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:
commit
256e81d086
@ -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;'>" .
|
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
|
||||||
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
||||||
else
|
else
|
||||||
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
|
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
|
||||||
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
|
GENERIC_SIZE_TEXT, true, true,
|
||||||
|
true, '...', 'white-space: nowrap;');
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (is_numeric($last_data["datos"]))
|
if (is_numeric($last_data["datos"]))
|
||||||
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
|
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
|
||||||
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
||||||
else
|
else
|
||||||
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
|
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
|
||||||
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
|
GENERIC_SIZE_TEXT, true, true,
|
||||||
|
true, '...', 'white-space: nowrap;');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
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;'>" .
|
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
|
||||||
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
||||||
else
|
else
|
||||||
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
|
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
|
||||||
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
|
GENERIC_SIZE_TEXT, true, true, true,
|
||||||
|
'...', 'white-space: nowrap;');
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (is_numeric($last_data["datos"]))
|
if (is_numeric($last_data["datos"]))
|
||||||
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
|
$data = "<span style='height: 20px; display: inline-table; vertical-align: top;'>" .
|
||||||
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
remove_right_zeros(number_format($last_data["datos"], $config['graph_precision'])) . "</span>";
|
||||||
else
|
else
|
||||||
$data = "<span title='" . $last_data["datos"] . "' style='white-space: nowrap;'>" .
|
$data = ui_print_truncate_text(io_safe_output($last_data['datos']),
|
||||||
substr(io_safe_output($last_data['datos']),0,12) . "</span>";
|
GENERIC_SIZE_TEXT, true, true, true,
|
||||||
|
'...', 'white-space: nowrap;');
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!empty($last_data['utimestamp'])) {
|
if (!empty($last_data['utimestamp'])) {
|
||||||
$last_data_str = $data;
|
$last_data_str = $data;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user