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-6757-Aumentar-numero-caracteres-en-custom-graphs' into 'develop' 

title en ticks bullet charts

See merge request artica/pandorafms!4521
This commit is contained in:
Daniel Rodriguez 2021-11-16 13:15:20 +00:00
parent a940396b0d 72f2caacd9
commit 7e8782f56b
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pandora_console/include/functions_graph.php
View File

@ -2050,7 +2050,7 @@ function graphic_combined_module(
$width, $width,
$height, $height,
$color, $color,
$module_name_list, [],
$long_index, $long_index,
ui_get_full_url( ui_get_full_url(
'images/image_problem_area_small.png', 'images/image_problem_area_small.png',

20
pandora_console/include/graphs/functions_d3.php
View File

@ -225,14 +225,14 @@ function d3_bullet_chart(
.bullet .range.s2 { fill: #ccc; } .bullet .range.s2 { fill: #ccc; }
.bullet .measure.s0 { fill: steelblue; } .bullet .measure.s0 { fill: steelblue; }
.bullet .measure.s1 { fill: steelblue; } .bullet .measure.s1 { fill: steelblue; }
.bullet .title { font-size: 7pt; font-weight: bold; text-align:left; } .bullet .title { font-size: 9pt; font-weight: bold; text-align:left; cursor: help;}
.bullet .subtitle { fill: #999; font-size: 7pt;} .bullet .subtitle { fill: #999; font-size: 7pt;}
.bullet g text { font-size:'.$font_size.'pt; '.$invert_color.' } .bullet g text { font-size:'.$font_size.'pt; '.$invert_color.' }
</style> </style>
<script language="javascript" type="text/javascript"> <script language="javascript" type="text/javascript">
var margin = {top: 5, right: 40, bottom: 20, left: 120}; var margin = {top: 5, right: 40, bottom: 20, left: 130};
var width = ('.$width.'+10); var width = ('.$width.'+10);
var height = '.$height.'- margin.top - margin.bottom; var height = '.$height.'- margin.top - margin.bottom;
@ -251,13 +251,14 @@ function d3_bullet_chart(
$name = io_safe_output($data['nombre']); $name = io_safe_output($data['nombre']);
} }
$name = ui_print_truncate_text($name, 15, false, true, false, '...', false); $long_name = $name;
$name = ui_print_truncate_text($name, 20, false, true, false, '...', false);
$marker = ''; $marker = '';
if ($data['value'] == 0) { if ($data['value'] == 0) {
$marker = ', 0'; $marker = ', 0';
} }
$temp[] = '{"title":"'.$name.'","subtitle":"'.$data['unit'].'", $temp[] = '{"longTitle":"'.$long_name.'", "title":"'.$name.'","subtitle":"'.$data['unit'].'",
"ranges":['.((float) $data['max']).'],"measures":['.$data['value'].'], "ranges":['.((float) $data['max']).'],"measures":['.$data['value'].'],
"markers":['.$data['min_warning'].','.$data['min_critical'].$marker.']}'; "markers":['.$data['min_warning'].','.$data['min_critical'].$marker.']}';
} }
@ -276,12 +277,19 @@ function d3_bullet_chart(
.call(chart); .call(chart);
var title = svg.append("g") var title = svg.append("g")
.attr("width", "120px")
.style("text-anchor", "end") .style("text-anchor", "end")
.attr("transform", "translate(-10, 15)"); .attr("transform", "translate(-10, 15)");
title.append("text") title.append("text")
.attr("class", "'.$font.' invert_filter") .attr("class", "title '.$font.' invert_filter")
.text(function(d) { return d.title; }); .attr("textLength","120")
.attr("lengthAdjust", "spacingAndGlyphs")
.text(function(d) { return d.title; })
.append("title")
.text(function(d) { return d.longTitle; });
title.append("text") title.append("text")
.attr("class", "subtitle") .attr("class", "subtitle")