Merge opentimestamps#40: various dashboard fixes

petertodd · petertodd · commit 4e4d07fb5489 · 2018-04-21T14:14:17.000-04:00
b682fef fix english (Vincent Cloutier) dbccd73 various dashboard fixes (Vincent Cloutier) Pull request description: Tree-SHA512: 529f03d700a37a63fd3ba6e4eea8d54995de4d759181c2bbd0d251ec24415fa95fa14dae6b5254df144ea083925777896b361805c3d96bf55d523d39cf0eddaa
diff --git a/otsserver/rpc.py b/otsserver/rpc.py
@@ -157,14 +157,18 @@ def do_GET(self):
             # need to investigate further, but this seems to work.
             str_wallet_balance = str(proxy._call("getbalance"))
 
-            transactions = proxy._call("listtransactions", "", 50)
+            transactions = proxy._call("listtransactions", "", 1000)
             # We want only the confirmed txs containing an OP_RETURN, from most to least recent
             transactions = list(filter(lambda x: x["confirmations"] > 0 and x["amount"] == 0, transactions))
             a_week_ago = (datetime.date.today() - datetime.timedelta(days=7)).timetuple()
             a_week_ago_posix = time.mktime(a_week_ago)
             transactions_in_last_week = list(filter(lambda x: x["time"] > a_week_ago_posix, transactions))
             fees_in_last_week = reduce(lambda a,b: a-b["fee"], transactions_in_last_week, 0)
-            time_between_transactions = round(168 / len(transactions_in_last_week)) # in hours based on 168 hours in a week
+            try:
+                time_between_transactions = str(round(168 / len(transactions_in_last_week))) # in hours based on 168 hours in a week
+                time_between_transactions += " hour(s)"
+            except ZeroDivisionError:
+                time_between_transactions = "N/A"
             transactions.sort(key=lambda x: x["confirmations"])
             homepage_template = """<html>
 <head>
@@ -186,7 +190,7 @@ def do_GET(self):
 This address changes after every donation.
 </p>
 <p>
-Average time between transactions in the last week: {{ time_between_transactions }} hour(s)</br>
+Average time between transactions in the last week: {{ time_between_transactions }} </br>
 Fees used in the last week: {{ fees_in_last_week }} BTC</br>
 Latest transactions: </br>
 {{#transactions}}
