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-10755-meter-leyendas-de-las-graficas-alineadas-horizontalmente-no-verticalmente' into 'develop' 

Ent 10755 meter leyendas de las graficas alineadas horizontalmente no verticalmente

See merge request artica/pandorafms!5658
This commit is contained in:
Matias Didier 2023-04-18 14:32:28 +00:00
parent 2d065bca9d 8167c93aad
commit 94fdf153d3
4 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pandora_console/include/functions.php
View File

@ -4050,7 +4050,7 @@ function series_type_graph_array($data, $show_elements_graph)
$name_legend .= ' * '.$value['weight'].') ';
}
$data_return['legend'][$key] = $name_legend;
$data_return['legend'][$key] = '<span style="font-size: 9pt; font-weight: bolder;">'.$name_legend.'</span>';
if ((int) $value['min'] === PHP_INT_MAX) {
$value['min'] = 0;
}
@ -4059,28 +4059,28 @@ function series_type_graph_array($data, $show_elements_graph)
$value['max'] = 0;
}
$data_return['legend'][$key] .= __('Min:').remove_right_zeros(
$data_return['legend'][$key] .= '<span style="font-size: 9px;">'.__('Min').'</span><span style="font-weight: 600;">'.remove_right_zeros(
number_format(
$value['min'],
$config['graph_precision'],
$config['csv_decimal_separator'],
$config['csv_decimal_separator'] == ',' ? '.' : ','
)
).' '.__('Max:').remove_right_zeros(
).'</span>&nbsp;<span style="font-size: 9px;">'.__('Max').'</span><span style="font-weight: 600;">'.remove_right_zeros(
number_format(
$value['max'],
$config['graph_precision'],
$config['csv_decimal_separator'],
$config['csv_decimal_separator'] == ',' ? '.' : ','
)
).' '._('Avg:').remove_right_zeros(
).'</span>&nbsp;<span style="font-size: 9px;">'._('Avg').'</span><span style="font-weight: 600;">'.remove_right_zeros(
number_format(
$value['avg'],
$config['graph_precision'],
$config['csv_decimal_separator'],
$config['csv_decimal_separator'] == ',' ? '.' : ','
)
).' '.$str;
).'</span>&nbsp;'.$str;
if ($show_elements_graph['compare'] == 'overlapped'
&& $key == 'sum2'

11
pandora_console/include/graphs/functions_flot.php
View File

@ -272,6 +272,11 @@ function flot_area_graph(
style=' width: ".$params['width'].'px;
height: '.$params['height']."px;'></div>";
$legend_top = 10;
if (empty($params['show_legend']) === false) {
$legend_top = (int) $params['height'];
}
if ($params['menu']) {
$params['height'] = 100;
} else {
@ -280,13 +285,9 @@ function flot_area_graph(
if ((bool) $params['vconsole'] === false) {
$return .= '<div id="overview_'.$graph_id.'" class="overview_graph" style="margin:0px; margin-top:30px; margin-bottom:50px; width:'.$params['width'].'px; height: 200px;"></div>';
$legend_top = 10;
if (empty($params['show_legend']) === false) {
$legend_top = (20 + (count($legend) * 18));
}
if ($water_mark != '' && (bool) $params['dashboard'] === false) {
$return .= '<div id="watermark_'.$graph_id.'" style="position:absolute; top: '.$legend_top.'px; left: calc(100% - 100px);">';
$return .= '<div id="watermark_'.$graph_id.'" style="position:absolute; bottom: '.$legend_top.'px; left: calc(100% - 100px);">';
$return .= '<img id="watermark_image_'.$graph_id.'" src="'.$water_mark['url'].'">';
$return .= '</div>';
}

4
pandora_console/include/styles/dashboards.css
View File

@ -273,6 +273,10 @@ li#div-textarea label {
width: 100%;
}
.container-center:has(div.parent_graph) {
display: initial;
}
.widget-groups-status {
display: flex;
flex-direction: row;

10
pandora_console/include/styles/pandora.css
View File

@ -11896,6 +11896,16 @@ td[id^="table_info_box"] a {
border-bottom: 1px solid #dedede !important;
}
div.parent_graph > p.legend_background > table > tbody {
display: flex;
flex-direction: row;
flex-wrap: wrap;
}
div.parent_graph > p.legend_background > table > tbody > tr {
margin-right: 20px;
}
.small-input-select2 > div > input,
.small-input-select2 > div > select,
.small-input {