diff --git a/app/views/includes/foot.jade b/app/views/includes/foot.jade index 735e8c0..4a14f1a 100755 --- a/app/views/includes/foot.jade +++ b/app/views/includes/foot.jade @@ -36,7 +36,6 @@ script(type='text/javascript', src='/js/services/socket.js') //Application Controllers script(type='text/javascript', src='/js/controllers/index.js') script(type='text/javascript', src='/js/controllers/header.js') -script(type='text/javascript', src='/js/controllers/footer.js') script(type='text/javascript', src='/js/controllers/blocks.js') script(type='text/javascript', src='/js/controllers/transactions.js') script(type='text/javascript', src='/js/controllers/address.js') diff --git a/public/js/controllers/footer.js b/public/js/controllers/footer.js deleted file mode 100644 index e9d5c42..0000000 --- a/public/js/controllers/footer.js +++ /dev/null @@ -1,16 +0,0 @@ -'use strict'; - -angular.module('insight.system').controller('FooterController', - function ($scope, Global, Status) { - $scope.global = Global; - - $scope.getFooter = function() { - Status.get({ - q: 'getInfo' - }, function(d) { - $scope.info = d.info; - }); - }; - -}); - diff --git a/public/js/controllers/status.js b/public/js/controllers/status.js index 019c04d..f1fdded 100644 --- a/public/js/controllers/status.js +++ b/public/js/controllers/status.js @@ -23,6 +23,17 @@ angular.module('insight.status').controller('StatusController', $scope.getSync = function() { Sync.get({}, function(sync) { $rootScope.syncError = null; + + if (sync.blocksToSync > sync.syncedBlocks ) { + sync.message = 'Blocks to sync: ' + (sync.blocksToSync - sync.syncedBlocks); + sync.tooltip = 'Skipped blocks:' + sync.skipped_blocks; + } + else { + sync.message = 'On sync'; + sync.tooltip = ''; + } + + $scope.sync = sync; }, function(e) { $rootScope.syncError = 'Could not get sync information' + e; diff --git a/public/js/controllers/transactions.js b/public/js/controllers/transactions.js index d33e250..28efee2 100644 --- a/public/js/controllers/transactions.js +++ b/public/js/controllers/transactions.js @@ -14,19 +14,29 @@ angular.module('insight.transactions').controller('transactionsController', var ret = []; var tmp = {}; + var u=0; // TODO multiple output address // for(var i=0; i < l; i++) { + var notAddr = false; + + // non standard input + if (items[i].scriptSig && !items[i].addr) { + items[i].addr = 'Unparsed address [' + u++ + ']'; + items[i].notAddr = true; + notAddr = true; + } + // non standard output if (items[i].scriptPubKey && items[i].scriptPubKey.addresses.length > 1) { - item[i].addr = items[i].scriptPubKey.addresses.join(','); + items[i].addr = items[i].scriptPubKey.addresses.join(','); ret.push(items[i]); continue; } - var addr = items[i].addr || - (items[i].scriptPubKey && items[i].scriptPubKey.addresses[0] ); + var addr = items[i].addr || (items[i].scriptPubKey && items[i].scriptPubKey.addresses[0] ); + if (!tmp[addr]) { tmp[addr] = {}; tmp[addr].valueSat = 0; @@ -37,6 +47,7 @@ angular.module('insight.transactions').controller('transactionsController', tmp[addr].valueSat += items[i].valueSat; tmp[addr].value = tmp[addr].valueSat / 100000000; tmp[addr].items.push(items[i]); + tmp[addr].notAddr = notAddr; tmp[addr].count++; } diff --git a/public/views/header.html b/public/views/header.html index bcc2d55..38f0c84 100755 --- a/public/views/header.html +++ b/public/views/header.html @@ -23,16 +23,20 @@
No matching records found!
-
- - Status: On Sync - - - Connections: {{info.connections}} - - - Height: {{info.blocks}} - +
+ + + {{sync.message}} + + + + + Connections: {{info.connections}} + + + Height: {{info.blocks}} + +
diff --git a/public/views/transaction.html b/public/views/transaction.html index 4e325be..3970353 100644 --- a/public/views/transaction.html +++ b/public/views/transaction.html @@ -23,7 +23,7 @@ Block - + {{tx.blockhash}} diff --git a/public/views/transaction/tx.html b/public/views/transaction/tx.html index c33a0f6..76be786 100644 --- a/public/views/transaction/tx.html +++ b/public/views/transaction/tx.html @@ -1,6 +1,14 @@
{{tx.txid}} + + + + + + {{tx.time * 1000 | date:'medium'}} + +
@@ -13,42 +21,32 @@
-
@@ -58,17 +56,18 @@
-
+
- {{address}} + {{vout.addr}} + {{address}}

{{vout.value}} BTC

-
+
{{address}} @@ -84,16 +83,6 @@
-