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

Merge branch 'ent-1940-Peso-en-graficas-personalizadas' into 'develop' 

fixed weight legend

See merge request artica/pandorafms!3339
This commit is contained in:
Daniel Rodriguez 2020-07-10 10:10:42 +02:00
parent 941dfc2b62 595339613b
commit 0d68dde3db
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/include/functions.php
View File

@ -3724,6 +3724,13 @@ function series_type_graph_array($data, $show_elements_graph)
} }
} }
if (isset($value['weight']) === true
&& empty($value['weight']) === false
) {
$name_legend .= ' ('.__('Weight').' * '.$value['weight'].') ';
$data_return['legend'][$key] .= ' ('.__('Weight').' * '.$value['weight'].') ';
}
if ((int) $value['min'] === PHP_INT_MAX) { if ((int) $value['min'] === PHP_INT_MAX) {
$value['min'] = 0; $value['min'] = 0;
} }

12
pandora_console/include/functions_graph.php
View File

@ -1560,15 +1560,19 @@ function graphic_combined_module(
foreach ($value['data'] as $k => $v) { foreach ($value['data'] as $k => $v) {
if ($v[1] != false) { if ($v[1] != false) {
$array_data[$key]['data'][$k][1] = ($v[1] * $params_combined['weight_list'][$i]); $array_data[$key]['data'][$k][1] = ($v[1] * $params_combined['weight_list'][$i]);
$array_data[$key]['slice_data'][$v[0]]['avg'] *= $params_combined['weight_list'][$i];
$array_data[$key]['slice_data'][$v[0]]['min'] *= $params_combined['weight_list'][$i];
$array_data[$key]['slice_data'][$v[0]]['max'] *= $params_combined['weight_list'][$i];
} }
} }
$array_data[$key]['max'] *= $params_combined['weight_list'][$i];
$array_data[$key]['min'] *= $params_combined['weight_list'][$i];
$array_data[$key]['avg'] *= $params_combined['weight_list'][$i];
$array_data[$key]['weight'] = $params_combined['weight_list'][$i];
} }
} }
$max = $array_data['sum'.$i]['max'];
$min = $array_data['sum'.$i]['min'];
$avg = $array_data['sum'.$i]['avg'];
if ($config['fixed_graph'] == false) { if ($config['fixed_graph'] == false) {
$water_mark = [ $water_mark = [
'file' => $config['homedir'].'/images/logo_vertical_water.png', 'file' => $config['homedir'].'/images/logo_vertical_water.png',