diff --git a/CHANGELOG.md b/CHANGELOG.md index 40e2b0aaf52..4d91cd35b8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## Version 25.03.xx +Fixes: +- [events] Fix sum chart tooltip displaying the raw floating-point value instead of a rounded number + ## Version 25.03.50 Fixes: - [star-rating] Fix custom widget logo resolving to the wrong path (mis-detected as the global app logo) after editing a widget diff --git a/frontend/express/public/core/events/javascripts/countly.details.models.js b/frontend/express/public/core/events/javascripts/countly.details.models.js index a991bafe290..6122e069580 100644 --- a/frontend/express/public/core/events/javascripts/countly.details.models.js +++ b/frontend/express/public/core/events/javascripts/countly.details.models.js @@ -10,7 +10,7 @@ var dur = 0; for (var i = 0; i < chartData.length; i++) { graphData[0].push(chartData[i].c ? chartData[i].c : 0); - graphData[1].push(chartData[i].s ? chartData[i].s : 0); + graphData[1].push(chartData[i].s ? parseFloat(Number(chartData[i].s).toFixed(2)) : 0); let avgDur = (chartData[i].dur || 0) / (chartData[i].c || 1); graphData[2].push(avgDur < 0.1 ? 0 : avgDur); if (chartData[i].c) { @@ -20,8 +20,8 @@ dur += chartData[i].dur; } } - var showSumGraph = graphData[1].some(function(item) { - return item !== 0; + var showSumGraph = chartData.some(function(item) { + return !!item.s; //check raw sums, since tiny non-zero sums round to 0 }); var series = []; var yAxis = []; @@ -139,7 +139,7 @@ var maxLength = eventData.chartData.length > 15 ? 15 : eventData.chartData.length; for (var i = 0; i < maxLength; i++) { arrCount.push(eventData.chartData[i].c); - arrSum.push(eventData.chartData[i].s); + arrSum.push(eventData.chartData[i].s ? parseFloat(Number(eventData.chartData[i].s).toFixed(2)) : eventData.chartData[i].s); arrDuration.push(eventData.chartData[i].dur / (eventData.chartData[i].c || 1)); xAxisData.push(typeof eventData.chartData[i].curr_segment === 'string' ? countlyAllEvents.helpers.decode(eventData.chartData[i].curr_segment) : eventData.chartData[i].curr_segment); @@ -150,13 +150,8 @@ dur += eventData.chartData[i].dur; } } - var showSumGraph = arrSum.some(function(item) { - if (item) { //null, undefined, 0 - return true; - } - else { - return false; - } + var showSumGraph = eventData.chartData.slice(0, maxLength).some(function(item) { + return !!item.s; //check raw sums, since tiny non-zero sums round to 0 }); xAxis.data = xAxisData; var graphPointsLen = 0; diff --git a/frontend/express/public/javascripts/countly/countly.common.js b/frontend/express/public/javascripts/countly/countly.common.js index ccc5f7f88f0..5c3ebc5297c 100644 --- a/frontend/express/public/javascripts/countly/countly.common.js +++ b/frontend/express/public/javascripts/countly/countly.common.js @@ -2431,7 +2431,7 @@ } else if (number >= 0.1 || number <= -0.1) { number += ""; - tmpNumber = number.replace(".0", ""); + tmpNumber = number.replace(/\.0$/, ""); } else { tmpNumber = number + "";