From 469adc33b23fa84590f7328101bee8502e9c863e Mon Sep 17 00:00:00 2001
From: cubedro <contact@siteshop.ro>
Date: Wed, 18 Feb 2015 11:10:33 +0200
Subject: [PATCH] fixed times

---
 public/js/controllers.js |  2 +-
 public/js/filters.js     | 15 ++++++++++++---
 views/index.jade         |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/public/js/controllers.js b/public/js/controllers.js
index 7ec5951..e49a2c4 100644
--- a/public/js/controllers.js
+++ b/public/js/controllers.js
@@ -117,7 +117,7 @@ function StatsCtrl($scope, $filter, socket, _, toastr) {
 
 			$scope.lastBlock = _.max($scope.nodes, function(node) {
 				return parseInt(node.stats.block.timestamp);
-			}).stats.block.blocktime;
+			}).stats.block.timestamp;
 
 			$scope.lastDifficulty = _.max($scope.nodes, function(node) {
 				return parseInt(node.stats.block.timestamp);
diff --git a/public/js/filters.js b/public/js/filters.js
index 2390807..28a6021 100644
--- a/public/js/filters.js
+++ b/public/js/filters.js
@@ -66,14 +66,23 @@ angular.module('netStatsApp.filters', [])
 	};
 })
 .filter('blockTimeFilter', function() {
-	return function(time) {
-		if(time === 0)
+	return function(timestamp) {
+		var time = Math.floor((new Date()).getTime() / 1000);
+		var diff = time - timestamp;
+
+		if(diff === 0)
 			return '∞';
 
-		return moment.duration(Math.round(time), 's').humanize() + ' ago';
+		if(diff < 60)
+			return Math.round(diff) + ' s';
+
+		return moment.duration(Math.round(diff), 's').humanize() + ' ago';
 	};
 }).filter('avgTimeFilter', function() {
 	return function(time) {
+		if(time < 60)
+			return Math.round(time) + ' s';
+
 		return moment.duration(Math.round(time), 's').humanize();
 	};
 })
diff --git a/views/index.jade b/views/index.jade
index a320f08..d5aa557 100644
--- a/views/index.jade
+++ b/views/index.jade
@@ -103,5 +103,5 @@ block content
               td(class="{{ node.stats.block.number | blockClass : bestBlock }}").hidden-sm.hidden-xs
                 span.small {{node.stats.block.hash}}
                 //- div.small Difficulty: {{node.stats.block.difficulty | gasFilter}} | Gas used: {{node.stats.block.gasUsed | gasFilter}} | Min gas price: {{node.stats.block.minGasPrice | gasFilter}} | Gas limit: {{node.stats.block.gasLimit | gasFilter}}
-              td(class="{{ node.stats.block.timestamp | timeClass }}") {{node.stats.block.blocktime | blockTimeFilter }}
+              td(class="{{ node.stats.block.timestamp | timeClass }}") {{node.stats.block.timestamp | blockTimeFilter }}
               td(class="{{ node.stats.uptime | upTimeClass }}") {{ node.stats.uptime | upTimeFilter }}