From 1305d954a33d7f8a391cf0a6fb8c0625443eff42 Mon Sep 17 00:00:00 2001 From: cubedro Date: Fri, 24 Apr 2015 12:39:29 +0300 Subject: [PATCH] fixed hashrate filters --- public/js/filters.js | 14 +++++++------- views/index.jade | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/public/js/filters.js b/public/js/filters.js index 5214f26..f8218eb 100644 --- a/public/js/filters.js +++ b/public/js/filters.js @@ -42,22 +42,22 @@ angular.module('netStatsApp.filters', []) return (! mining ? 'icon-cancel' : 'icon-check'); }; }) -.filter('hashpowerClass', function() { - return function(mining) { - if(! mining) +.filter('hashrateClass', function() { + return function(mining, active) { + if(! mining || ! active) return 'text-gray'; return 'text-success'; }; }) -.filter('hashrateFilter', function() { +.filter('hashrateFilter', ['$filter', function(filter) { return function(hashrate) { if(typeof hashrate === 'undefined' || !hashrate) return 0; - return hashrate/1000; + return filter('number')((hashrate/1000).toFixed(2)); } -}) +}]) .filter('nodeVersion', function($sce) { return function(version) { if(typeof version !== 'undefined') @@ -101,7 +101,7 @@ angular.module('netStatsApp.filters', []) }; }) .filter('gasPriceFilter', ['$filter', function(filter) { - var numberFilter = filter('number') + var numberFilter = filter('number'); return function(price) { console.log("--------------------"); console.log(price.length); diff --git a/views/index.jade b/views/index.jade index 67f2039..8b8ddce 100644 --- a/views/index.jade +++ b/views/index.jade @@ -184,7 +184,7 @@ block content span.small {{node.stats | latencyFilter}} td(class="{{ node.stats.mining | miningClass : node.stats.active }}") i(class="{{ node.stats.mining | miningIconClass }}") - td(class="{{ node.stats.mining | hashpowerClass }}") + td(class="{{ node.stats.mining | hashrateClass : node.stats.active }}") span.small {{node.stats.hashrate | hashrateFilter}} kH/s td(class="{{ node.stats.peers | peerClass : node.stats.active }}", style="padding-left: 11px;") {{node.stats.peers}} td(style="padding-left: 15px;") {{node.stats.pending}}