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

Merge branch '1124-4288-agrupar-graficas-combinadas-ii_rev2' into 'develop' 

fixed error in graph container

See merge request !721
This commit is contained in:
vgilc 2017-08-08 12:26:07 +02:00
parent d5cff43128 4cbd005137
commit dcfd4a7939
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pandora_console/godmode/reporting/create_container.php
View File

@ -41,8 +41,13 @@ if (is_ajax()){
$id_agent = get_parameter('id_agent'); $id_agent = get_parameter('id_agent');
$id_agent_module = get_parameter('id_agent_module'); $id_agent_module = get_parameter('id_agent_module');
$time_lapse = get_parameter('time_lapse'); $time_lapse = get_parameter('time_lapse');
$only_avg = (bool) get_parameter('only_avg'); $only_avg = get_parameter('only_avg');
if($only_avg != 'false'){
$only_avg = 1;
}
else{
$only_avg = 0;
}
$values = array( $values = array(
'id_container' => $id_container2, 'id_container' => $id_container2,
'type' => "simple_graph", 'type' => "simple_graph",
@ -76,8 +81,13 @@ if (is_ajax()){
$agent_alias = get_parameter('agent_alias',''); $agent_alias = get_parameter('agent_alias','');
$module_name = get_parameter('module_name',''); $module_name = get_parameter('module_name','');
$tag = get_parameter('tag',0); $tag = get_parameter('tag',0);
$only_avg_dyn = get_parameter('only_avg',0); $only_avg = get_parameter('only_avg');
if($only_avg != 'false'){
$only_avg = 1;
}
else{
$only_avg = 0;
}
$values = array( $values = array(
'id_container' => $id_container2, 'id_container' => $id_container2,
'type' => "dynamic_graph", 'type' => "dynamic_graph",
@ -87,7 +97,7 @@ if (is_ajax()){
'agent' => $agent_alias, 'agent' => $agent_alias,
'module' => $module_name, 'module' => $module_name,
'id_tag' => $tag, 'id_tag' => $tag,
'only_average' => $only_avg_dyn); 'only_average' => $only_avg);
$id_item = db_process_sql_insert('tcontainer_item', $values); $id_item = db_process_sql_insert('tcontainer_item', $values);
return; return;
} }
@ -437,7 +447,7 @@ if($edit_container){
$data = array(); $data = array();
$data[0] = __('Only average'); $data[0] = __('Only average');
$data[1] = html_print_checkbox('only_avg', 1, false,true); $data[1] = html_print_checkbox('only_avg_2', 1, false,true);
$table->data[] = $data; $table->data[] = $data;
$table->rowclass[] = ''; $table->rowclass[] = '';
@ -599,7 +609,7 @@ echo html_print_input_hidden('id_agent', 0);
var group = $("#container_id_group1").val(); var group = $("#container_id_group1").val();
var module_group = $("#combo_modulegroup").val(); var module_group = $("#combo_modulegroup").val();
var tag = $("#tag").val(); var tag = $("#tag").val();
var only_avg = $("#checkbox-only_avg1").prop("checked"); var only_avg = $("#checkbox-only_avg_2").prop("checked");
var id_container = <?php echo $id_container; ?>; var id_container = <?php echo $id_container; ?>;
jQuery.post ("ajax.php", jQuery.post ("ajax.php",
{"page" : "godmode/reporting/create_container", {"page" : "godmode/reporting/create_container",