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

Merge branch '2535-Macro-para-unidad-informes' into 'develop'

Browse Source 
Added unit in label graphs

See merge request artica/pandorafms!1874
This commit is contained in:
vgilc 2018-10-25 13:12:26 +02:00
commit aabd5435d0
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pandora_console/include/functions.php
View File

@ -3129,16 +3129,23 @@ function series_type_graph_array($data, $show_elements_graph){
if (isset($show_elements_graph['labels']) && if (isset($show_elements_graph['labels']) &&
is_array($show_elements_graph['labels']) && is_array($show_elements_graph['labels']) &&
(count($show_elements_graph['labels']) > 0)){ (count($show_elements_graph['labels']) > 0)){
$name_legend = $data_return['legend'][$key] = $show_elements_graph['labels'][$value['agent_module_id']] . ' ' ; if ($show_elements_graph['unit'])
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ' / ' . __('Unit ') . ' ' . $show_elements_graph['unit'] .': ';
else
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ': ';
} }
else{ else{
if(strpos($key, 'baseline') !== false){ if(strpos($key, 'baseline') !== false){
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . if ($show_elements_graph['unit'])
$value['module_name'] . ' Baseline '; $name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ' / ' . __('Unit ') . ' ' . $show_elements_graph['unit'] .'Baseline ';
else
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . 'Baseline ';
} }
else{ else{
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . if ($show_elements_graph['unit'])
$value['module_name'] . ': '; $name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ' / ' . __('Unit ') . ' ' . $show_elements_graph['unit'] .': ';
else
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ': ';
} }
} }
@ -3174,6 +3181,11 @@ function series_type_graph_array($data, $show_elements_graph){
!$show_elements_graph['fullscale'] && strpos($key, 'max') !== false){ !$show_elements_graph['fullscale'] && strpos($key, 'max') !== false){
$data_return['series_type'][$key] = $type_graph; $data_return['series_type'][$key] = $type_graph;
if ($show_elements_graph['unit'])
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ' / ' . __('Unit ') . ' ' . $show_elements_graph['unit'] .': ';
else
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ': ';
$data_return['legend'][$key] = $name_legend; $data_return['legend'][$key] = $name_legend;
if($show_elements_graph['type_mode_graph']){ if($show_elements_graph['type_mode_graph']){
$data_return['legend'][$key] .= $data_return['legend'][$key] .=
@ -3235,6 +3247,10 @@ function series_type_graph_array($data, $show_elements_graph){
__('Percentil') . ' ' . __('Percentil') . ' ' .
$config['percentil'] . $config['percentil'] .
'º ' . __('of module') . ' '; 'º ' . __('of module') . ' ';
if ($show_elements_graph['unit'])
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ' / ' . __('Unit ') . ' ' . $show_elements_graph['unit'] .': ';
else
$name_legend = $data_return['legend'][$key] = $value['agent_alias'] . ' / ' . $value['module_name'] . ': ';
$data_return['legend'][$key] .= $name_legend; $data_return['legend'][$key] .= $name_legend;
$data_return['legend'][$key] .= remove_right_zeros( $data_return['legend'][$key] .= remove_right_zeros(
number_format( number_format(