[Libreoffice-commits] online.git: loleaflet/src

[Aditya Dewan]

 loleaflet/src/admin/AdminSocketAnalytics.js |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 4f775788b2958053f5ec7d066b3caad5f12bc924
Author: Aditya Dewan <iit2015097 at iiita.ac.in>
Date:   Sat Aug 19 20:05:35 2017 +0530

    tdf#107278 bug fix | misinterpratation of units related to network usage
    
    Change-Id: I22bccfe1970b11a0284d0e7ecee9e71f4b0522f7
    Reviewed-on: https://gerrit.libreoffice.org/41327
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/loleaflet/src/admin/AdminSocketAnalytics.js b/loleaflet/src/admin/AdminSocketAnalytics.js
index f2286596..7652d4b6 100644
--- a/loleaflet/src/admin/AdminSocketAnalytics.js
+++ b/loleaflet/src/admin/AdminSocketAnalytics.js
@@ -173,7 +173,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 			this._d3NetYAxis = d3.svg.axis()
 				.scale(this._yNetScale)
 				.tickFormat(function (d) {
-					return Util.humanizeMem(d) + '/sec';
+					return Util.humanizeMem(d/1000) + '/sec';
 				})
 				.orient('left');
 			this._d3NetSentLine = d3Line;
@@ -534,7 +534,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 				data = textMsg.substring(0, textMsg.length - 1).split(',');
 
 				for (i = this._sentStatsData.length - 1, j = data.length - 1; i >= 0 && j >= 0; i--, j--) {
-					this._sentStatsData[i].value = parseInt(data[j]) / this._netStatsInterval;
+					this._sentStatsData[i].value = parseInt(data[j]);
 				}
 				this._updateAverage('sent', true);
 
@@ -544,7 +544,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 			else {
 				// this is a notification data; append to _sentStatsData
 				data = textMsg.trim();
-				this._addNewData(this._sentStatsData, parseInt(data) / this._netStatsInterval, 'sent');
+				this._addNewData(this._sentStatsData, parseInt(data), 'sent');
 				this._updateAverage('sent', false);
 				this._updateNetGraph();
 			}
@@ -556,7 +556,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 				data = textMsg.substring(0, textMsg.length - 1).split(',');
 
 				for (i = this._recvStatsData.length - 1, j = data.length - 1; i >= 0 && j >= 0; i--, j--) {
-					this._recvStatsData[i].value = parseInt(data[j]) / this._netStatsInterval;
+					this._recvStatsData[i].value = parseInt(data[j]);
 				}
 				this._updateAverage('recv', true);
 
@@ -566,7 +566,7 @@ var AdminSocketAnalytics = AdminSocketBase.extend({
 			else {
 				// this is a notification data; append to _recvStatsData
 				data = textMsg.trim();
-				this._addNewData(this._recvStatsData, parseInt(data) / this._netStatsInterval, 'recv');
+				this._addNewData(this._recvStatsData, parseInt(data), 'recv');
 				this._updateAverage('recv', false);
 				this._updateNetGraph();
 			}