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

Merge branch 'ent-12029-vista-heatmap-tamano-de-texto-muy-grande' into 'develop'

Browse Source 
Ent 12029 vista heatmap tamano de texto muy grande

See merge request artica/pandorafms!6534
This commit is contained in:
Matias Didier 2023-10-06 07:07:30 +00:00
commit ee6ef65da6
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pandora_console/include/class/Heatmap.class.php
View File

@ -1277,6 +1277,7 @@ class Heatmap
$scale = ($this->width / $this->height); $scale = ($this->width / $this->height);
$Yaxis = $this->getYAxis($count_result, $scale); $Yaxis = $this->getYAxis($count_result, $scale);
$Yaxis_font_scale = $Yaxis;
if ($count_result <= 3) { if ($count_result <= 3) {
$Xaxis = $count_result; $Xaxis = $count_result;
$Yaxis = 1; $Yaxis = 1;
@ -1381,22 +1382,22 @@ class Heatmap
if (count($groups) > 1 && $this->group === 1 && $this->dashboard === false) { if (count($groups) > 1 && $this->group === 1 && $this->dashboard === false) {
$x_back = 0; $x_back = 0;
$y_back = 0; $y_back = 0;
$x_text_correction = 0.25; $x_text_correction = 0.08;
if ($count_result <= 10) { if ($count_result <= 10) {
$fontSize = 'small-size'; $fontSize = 0.2;
$stroke = 'small-stroke'; $stroke = 'small-stroke';
} else if ($count_result > 10 && $count_result <= 100) { } else if ($count_result > 10 && $count_result <= 100) {
$fontSize = 'tiny-size'; $fontSize = 0.18;
$stroke = 'tiny-stroke'; $stroke = 'tiny-stroke';
} else if ($count_result > 100 && $count_result <= 1000) { } else if ($count_result > 100 && $count_result <= 1000) {
$fontSize = 'medium-size'; $fontSize = 0.16;
$stroke = 'medium-stroke'; $stroke = 'medium-stroke';
} else if ($count_result > 1000 && $count_result <= 10000) { } else if ($count_result > 1000 && $count_result <= 10000) {
$fontSize = 'big-size'; $fontSize = 0.14;
$stroke = 'big-stroke'; $stroke = 'big-stroke';
} else { } else {
$fontSize = 'huge-size'; $fontSize = 0.12;
$stroke = 'huge-stroke'; $stroke = 'huge-stroke';
} }
@ -1452,7 +1453,7 @@ class Heatmap
// Name. // Name.
echo '<text x="'.((($x_position - $x_back) / 2) + $x_back - $x_text_correction).'" y="'.($y_position + 1 - 0.01).'" echo '<text x="'.((($x_position - $x_back) / 2) + $x_back - $x_text_correction).'" y="'.($y_position + 1 - 0.01).'"
class="'.$fontSize.'">'.$name.'</text>'; style="font-size: '.($fontSize * $Yaxis_font_scale).'%">'.$name.'</text>';
$x_back = $x_position; $x_back = $x_position;
if ($x_position === $Xaxis) { if ($x_position === $Xaxis) {
@ -1503,7 +1504,7 @@ class Heatmap
// Name. // Name.
echo '<text x="'.(($x_position) / 2 - $x_text_correction).'" y="'.($y_position + 1 - 0.01).'" echo '<text x="'.(($x_position) / 2 - $x_text_correction).'" y="'.($y_position + 1 - 0.01).'"
class="'.$fontSize.'">'.$name.'</text>'; style="font-size: '.($fontSize * $Yaxis_font_scale).'%">'.$name.'</text>';
// Bottom-right of last line. // Bottom-right of last line.
$points = sprintf( $points = sprintf(
@ -1560,7 +1561,7 @@ class Heatmap
// Name. // Name.
echo '<text x="'.(($x_position) / 2 - $x_text_correction).'" y="'.($y_position + 1 - 0.02).'" echo '<text x="'.(($x_position) / 2 - $x_text_correction).'" y="'.($y_position + 1 - 0.02).'"
class="'.$fontSize.'">'.$name.'</text>'; style="font-size: '.($fontSize * $Yaxis_font_scale).'%">'.$name.'</text>';
// Bottom-top of last line. // Bottom-top of last line.
$points = sprintf( $points = sprintf(

20
pandora_console/include/styles/heatmap.css
View File

@ -289,26 +289,6 @@ div#heatmap-controls div.heatmap-refr > div {
stroke-width: 0.04; stroke-width: 0.04;
} }
.small-size {
font-size: 1%;
}
.tiny-size {
font-size: 2%;
}
.medium-size {
font-size: 4%;
}
.big-size {
font-size: 6%;
}
.huge-size {
font-size: 8%;
}
.progress_main { .progress_main {
height: 2.5em; height: 2.5em;
border: 2px solid #82b92e; border: 2px solid #82b92e;