grassrootseconomics/ethstats-server
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed charts bug when first loading and reversed uncles chart

Browse Source
This commit is contained in:
cubedro 2015-05-27 08:08:40 +03:00
parent 4203f60e3c
commit b99adc1fb7
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/js/netstats.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/js/netstats.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

31
public/js/controllers.js
View File

@ -3,6 +3,8 @@
netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr) { netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr) {
var MAX_BINS = 40;
// Main Stats init // Main Stats init
// --------------- // ---------------
@ -18,17 +20,17 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
$scope.uncleCount = 0; $scope.uncleCount = 0;
$scope.bestStats = {}; $scope.bestStats = {};
$scope.lastBlocksTime = []; $scope.lastBlocksTime = _.fill(Array(MAX_BINS), 2);
$scope.difficultyChart = []; $scope.difficultyChart = _.fill(Array(MAX_BINS), 2);
$scope.transactionDensity = []; $scope.transactionDensity = _.fill(Array(MAX_BINS), 2);
$scope.gasSpending = []; $scope.gasSpending = _.fill(Array(MAX_BINS), 2);
$scope.miners = []; $scope.miners = [];
$scope.nodes = []; $scope.nodes = [];
$scope.map = []; $scope.map = [];
$scope.blockPropagationChart = []; $scope.blockPropagationChart = [];
$scope.uncleCountChart = []; $scope.uncleCountChart = _.fill(Array(MAX_BINS), 2);
$scope.coinbases = []; $scope.coinbases = [];
$scope.latency = 0; $scope.latency = 0;
@ -197,7 +199,8 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
case "uncleCount": case "uncleCount":
$scope.uncleCount = data[0] + data[1]; $scope.uncleCount = data[0] + data[1];
$scope.uncleCountChart = data.reverse(); data.reverse();
$scope.uncleCountChart = data;
break; break;
@ -208,10 +211,10 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
if( !_.isEqual($scope.avgHashrate, data.avgHashrate) ) if( !_.isEqual($scope.avgHashrate, data.avgHashrate) )
$scope.avgHashrate = data.avgHashrate; $scope.avgHashrate = data.avgHashrate;
if( !_.isEqual($scope.lastBlocksTime, data.blocktime) ) if( !_.isEqual($scope.lastBlocksTime, data.blocktime) && data.blocktime.length >= MAX_BINS )
$scope.lastBlocksTime = data.blocktime; $scope.lastBlocksTime = data.blocktime;
if( !_.isEqual($scope.difficultyChart, data.difficulty) ) if( !_.isEqual($scope.difficultyChart, data.difficulty) && data.difficulty.length >= MAX_BINS )
$scope.difficultyChart = data.difficulty; $scope.difficultyChart = data.difficulty;
if( !_.isEqual($scope.blockPropagationChart, data.propagation.histogram) ) { if( !_.isEqual($scope.blockPropagationChart, data.propagation.histogram) ) {
@ -219,15 +222,17 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
$scope.blockPropagationAvg = data.propagation.avg; $scope.blockPropagationAvg = data.propagation.avg;
} }
if( !_.isEqual($scope.uncleCountChart, data.uncleCount.reverse()) ) { data.uncleCount.reverse();
$scope.uncleCount = data.uncleCount[0] + data.uncleCount[1];
$scope.uncleCountChart = data.uncleCount.reverse(); if( !_.isEqual($scope.uncleCountChart, data.uncleCount) && data.uncleCount.length >= MAX_BINS ) {
$scope.uncleCount = data.uncleCount[data.uncleCount.length-2] + data.uncleCount[data.uncleCount.length-1];
$scope.uncleCountChart = data.uncleCount;
} }
if( !_.isEqual($scope.transactionDensity, data.transactions) ) if( !_.isEqual($scope.transactionDensity, data.transactions) && data.transactions.length >= MAX_BINS )
$scope.transactionDensity = data.transactions; $scope.transactionDensity = data.transactions;
if( !_.isEqual($scope.gasSpending, data.gasSpending) ) if( !_.isEqual($scope.gasSpending, data.gasSpending) && data.gasSpending.length >= MAX_BINS )
$scope.gasSpending = data.gasSpending; $scope.gasSpending = data.gasSpending;
if( !_.isEqual($scope.miners, data.miners) ) { if( !_.isEqual($scope.miners, data.miners) ) {