Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't show detailed doughnut tooltip if sum is > 99.9% #2398

Merged
merged 4 commits into from
Oct 16, 2022
Merged

Don't show detailed doughnut tooltip if sum is > 99.9% #2398

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4627fba
Don't show detailed doughnut tooltip if sum is 99.99%
yubiuser Oct 13, 2022
fb2635d
Add comment to explain 99.99 decision
yubiuser Oct 13, 2022
8762248
Go for 0.1 precision
yubiuser Oct 13, 2022
8abfde2
Indicate item share is less than 0.1%
yubiuser Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions scripts/pi-hole/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,17 +724,26 @@ function updateSummaryData(runOnce) {
}

function doughnutTooltip(tooltipLabel) {
var percentageTotalShown = tooltipLabel.chart._metasets[0].total.toFixed(2);
var label = " " + tooltipLabel.label;
var percentageTotalShown = tooltipLabel.chart._metasets[0].total.toFixed(1);
// tooltipLabel.chart._metasets[0].total returns the total percentage of the shown slices
// to compensate rounding errors we round to one decimal

if (percentageTotalShown >= 100) {
var label = " " + tooltipLabel.label;
// in case the item share is really small it could be rounded to 0.0
// we compensate for this
var itemPercentage =
tooltipLabel.parsed.toFixed(1) === 0 ? "< 0.1" : tooltipLabel.parsed.toFixed(1);

// even if no doughnut slice is hidden, sometimes percentageTotalShown is slightly less then 100
// we therefore use 99.9 to decide if slices are hidden (we only show with 0.1 precision)
if (percentageTotalShown > 99.9) {
// All items shown
return label + ": " + tooltipLabel.parsed.toFixed(1) + "%";
return label + ": " + itemPercentage + "%";
} else {
return (
label +
":<br>&bull; " +
tooltipLabel.parsed.toFixed(1) +
itemPercentage +
"% of all queries<br>&bull; " +
((tooltipLabel.parsed * 100) / percentageTotalShown).toFixed(1) +
"% of shown items"
Expand Down