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

Merge branch '1335-Configurar_graficas_full_scale_por_defecto' into 'develop' 

add new select to setup for TIP

See merge request !856
This commit is contained in:
vgilc 2017-10-06 09:19:34 +02:00
parent c1ff200f3c 45743e2dc5
commit 539053d61d
4 changed files with 59 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pandora_console/godmode/setup/setup_visuals.php
View File

@ -535,6 +535,26 @@ $table_chars->data[$row][0] .= ui_print_help_tip(__('Show percentile 95 in graph
$table_chars->data[$row][1] = html_print_input_text ('percentil', $config['percentil'], '', 20, 20, true);
$row++;
$table_chars->data[$row][0] = __('Graph TIP view:');
$table_chars->data[$row][0] .= ui_print_help_tip(__('This option may cause performance issues'), true);
$options_full_escale = array();
$options_full_escale[0] = __('None');
$options_full_escale[1] = __('All');
$options_full_escale[2] = __('On Boolean graphs');
$table_chars->data[$row][1] = html_print_select($options_full_escale, 'full_scale_option', $config["full_scale_option"], '', '', 0, true, false, false);
$row++;
/*
$table_font->data[$row][0] = __('Font path');
$fonts = load_fonts();
$table_font->data[$row][1] = html_print_select($fonts, 'fontpath',
io_safe_output($config["fontpath"]), '', '', 0, true);
$row++;
*/
echo "<fieldset>";
echo "<legend>" . __('Charts configuration') . "</legend>";
html_print_table ($table_chars);

4
pandora_console/include/functions_config.php
View File

@ -576,6 +576,10 @@ function config_update_config () {
}
if (!config_update_value ('percentil', (int) get_parameter('percentil', 0)))
$error_update[] = __('Default percentil');
if (!config_update_value ('full_scale_option', (int) get_parameter('full_scale_option', 0)))
$error_update[] = __('Default full scale (TIP)');
if (!config_update_value ('classic_menu', (bool) get_parameter('classic_menu', false)))
$error_update[] = __('Classic menu mode');

13
pandora_console/operation/agentes/interface_traffic_graph_win.php
View File

@ -150,8 +150,19 @@ $interface_traffic_modules = array(
$zoom = (int) get_parameter ("zoom", 1);
$baseline = get_parameter ("baseline", 0);
$show_percentil = get_parameter ("show_percentil", 0);
$fullscale = get_parameter("fullscale", 0);
$fullscale = get_parameter("fullscale");
if(!isset($_GET["fullscale_sent"]) ){
if(!isset($config['full_scale_option']) ||
$config['full_scale_option'] == 0 ||
$config['full_scale_option'] == 2 ){
$fullscale = 0;
}
else{
$fullscale = 1;
}
}
if ($zoom > 1) {
$height = $height * ($zoom / 2.1);
$width = $width * ($zoom / 1.4);

26
pandora_console/operation/agentes/stat_win.php
View File

@ -170,7 +170,26 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
$time_compare_separated = get_parameter ("time_compare_separated", 0);
$time_compare_overlapped = get_parameter ("time_compare_overlapped", 0);
$unknown_graph = get_parameter_checkbox ("unknown_graph", 1);
$fullscale = get_parameter ("fullscale", 0);
if(!isset($config['full_scale_option']) || $config['full_scale_option'] == 0){
$fullscale = 0;
}
elseif($config['full_scale_option'] == 1){
$fullscale = 1;
}
elseif($config['full_scale_option'] == 2){
if($graph_type == 'boolean'){
$fullscale = 1;
}else{
$fullscale = 0;
}
}
$fullscale_other = get_parameter ("fullscale_other", $fullscale);
if(isset($fullscale_other)){
$fullscale = $fullscale_other;
}
// To avoid the horizontal overflow
$width -= 20;
@ -404,8 +423,9 @@ $alias = db_get_value ("alias","tagente","id_agente",$id_agent);
}
$data = array();
$data[0] = __('Show full scale graph (TIP)') . ui_print_help_tip(__('This option may cause performance issues'), true);
$data[1] = html_print_checkbox ("fullscale", 1, (bool) $fullscale, true);
$data[0] = __('Show full scale graph (TIP)');
$data[1] = html_print_checkbox ("fullscale", 1, (bool) $fullscale, true, false,'fullscal_other()');
$data[1] .= html_print_input_hidden('fullscale_other', 0, true);
$table->data[] = $data;
$table->rowclass[] = '';