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

Revert "fixed error ingraph bool zoom" 

This reverts commit 1ca35be41e.
This commit is contained in:
daniel 2018-06-25 15:07:12 +02:00
parent 1ca35be41e
commit 36293cba3a
1 changed files with 11 additions and 29 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,35 +271,17 @@ function grafico_modulo_sparse_data_chart (
); );
} }
else{ else{
if($data_module_graph['id_module_type'] == 2 || $data = db_get_all_rows_filter (
$data_module_graph['id_module_type'] == 6 || 'tagente_datos',
$data_module_graph['id_module_type'] == 18 || array ('id_agente_modulo' => (int)$agent_module_id,
$data_module_graph['id_module_type'] == 9){ "utimestamp > '". $date_array['start_date']. "'",
$data = db_get_all_rows_filter ( "utimestamp < '". $date_array['final_date'] . "'",
'tagente_datos', 'group' => "ROUND(utimestamp / $data_slice)",
array ('id_agente_modulo' => (int)$agent_module_id, 'order' => 'utimestamp ASC'),
"utimestamp > '". $date_array['start_date']. "'", array ('sum(datos)/count(datos) as datos', 'min(utimestamp) as utimestamp'),
"utimestamp < '". $date_array['final_date'] . "'", 'AND',
'group' => "ROUND(utimestamp / $data_slice)", $data_module_graph['history_db']
'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']
);
}
} }
} }