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

Merge pull request #114 from cubedro/develop

Browse Source 
Small fixes
This commit is contained in:
Marian OANCΞA 2015-05-05 10:32:27 +03:00
commit e36405c374
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/history.js
View File

@ -336,7 +336,7 @@ History.prototype.getAvgHashrate = function()
var avgBlocktime = (_.sum(blocktimeHistory) / blocktimeHistory.length)/1000;
return avgDifficulty * 12 * ( 12 / avgBlocktime );
return this.bestBlock().block.difficulty / 12 * ( 12 / avgBlocktime );
}
History.prototype.getMinersCount = function()

2
public/js/controllers.js
View File

@ -34,7 +34,7 @@ netStatsApp.controller('StatsCtrl', function($scope, $filter, socket, _, toastr)
$scope.latency = 0;
$scope.currentApiVersion = "0.0.7";
$scope.currentApiVersion = "0.0.8";
$scope.predicate = ['-stats.active', '-stats.block.number', 'stats.block.propagation'];
$scope.reverse = false;

2
views/index.jade
View File

@ -200,5 +200,5 @@ block content
div.propagationBox
span {{node.stats.block.propagation | blockPropagationFilter}}
td.peerPropagationChart(class="{{node.id}}")
td(class="{{ node.stats | propagationNodeAvgTimeClass : node.stats.active }}") {{ node.stats.propagationAvg | blockPropagationFilter : '' }}
td(class="{{ node.stats | propagationNodeAvgTimeClass : bestBlock }}") {{ node.stats.propagationAvg | blockPropagationFilter : '' }}
td(class="{{ node.stats.uptime | upTimeClass : node.stats.active }}") {{ node.stats.uptime | upTimeFilter }}