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

fixed error ingraph bool zoom

Browse Source
This commit is contained in:
daniel 2018-06-25 15:05:07 +02:00
parent e39b03511d
commit 1ca35be41e
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pandora_console/include/functions_graph.php
View File

@ -271,17 +271,35 @@ function grafico_modulo_sparse_data_chart (
); );
} }
else{ else{
$data = db_get_all_rows_filter ( if($data_module_graph['id_module_type'] == 2 ||
'tagente_datos', $data_module_graph['id_module_type'] == 6 ||
array ('id_agente_modulo' => (int)$agent_module_id, $data_module_graph['id_module_type'] == 18 ||
"utimestamp > '". $date_array['start_date']. "'", $data_module_graph['id_module_type'] == 9){
"utimestamp < '". $date_array['final_date'] . "'", $data = db_get_all_rows_filter (
'group' => "ROUND(utimestamp / $data_slice)", 'tagente_datos',
'order' => 'utimestamp ASC'), array ('id_agente_modulo' => (int)$agent_module_id,
array ('sum(datos)/count(datos) as datos', 'min(utimestamp) as utimestamp'), "utimestamp > '". $date_array['start_date']. "'",
'AND', "utimestamp < '". $date_array['final_date'] . "'",
$data_module_graph['history_db'] 'group' => "ROUND(utimestamp / $data_slice)",
); 'order' => 'utimestamp ASC'),
array ('ROUND(sum(datos)/count(datos)) as datos', 'min(utimestamp) as utimestamp'),
'AND',
$data_module_graph['history_db']
);
}
else{
$data = db_get_all_rows_filter (
'tagente_datos',
array ('id_agente_modulo' => (int)$agent_module_id,
"utimestamp > '". $date_array['start_date']. "'",
"utimestamp < '". $date_array['final_date'] . "'",
'group' => "ROUND(utimestamp / $data_slice)",
'order' => 'utimestamp ASC'),
array ('sum(datos)/count(datos) as datos', 'min(utimestamp) as utimestamp'),
'AND',
$data_module_graph['history_db']
);
}
} }
} }