From: Alexander Moisseev <moiseev@mezonplus.ru>
Date: Fri, 3 Nov 2017 15:57:48 +0000 (+0300)
Subject: [WebUI] Fix message count in throughput summary (#1724)
X-Git-Tag: 1.7.0~483^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4f14254d5bcf1038a26c6a7578d07500bbbfb96f;p=thirdparty%2Frspamd.git

[WebUI] Fix message count in throughput summary (#1724)

MFH: rspamd-1.6
---

diff --git a/interface/js/app/graph.js b/interface/js/app/graph.js
index 029bf054ca..c082e6a3ce 100644
--- a/interface/js/app/graph.js
+++ b/interface/js/app/graph.js
@@ -112,14 +112,17 @@ function($, D3Evolution, unused) {
         var timeInterval = xExtents[1] - xExtents[0];
 
         return json.map(function (curr, i) {
+            // Time intervals that don't have data are excluded from average calculation as d3.mean()ignores nulls
             var avg = d3.mean(curr, function (d) { return d.y; });
+            // To find an integral on the whole time interval we need to convert nulls to zeroes
+            var value = d3.mean(curr, function (d) { return +d.y; }) * timeInterval / scaleFactor;
             var yExtents = d3.extent(curr, function (d) { return d.y; });
 
             return {
                 label: graph_options.legend.entries[i].label,
-                value: avg && (avg * timeInterval / scaleFactor) ^ 0,
+                value: value ^ 0,
                 min: +yExtents[0].toFixed(6),
-                avg: avg && +avg.toFixed(6),
+                avg: +avg.toFixed(6),
                 max: +yExtents[1].toFixed(6),
                 last: +curr[curr.length - 1].y.toFixed(6),
                 color: graph_options.legend.entries[i].color,