Tidy up transactions list

4 files changed, 9 insertions, 10 deletions

diff --git a/public/css/calculator.css b/public/css/calculator.css
index e0a85748..89cc758e 100644
--- a/public/css/calculator.css
+++ b/public/css/calculator.css
@@ -71,8 +71,8 @@ div#calculator #amount {
   width: 5em;
 }
 div#calculator span.btn {
-  font-size: 1.4em;
-  width: 80%;
+  font-size: 16px;
+  width: 100%;
 }
 div#calculator strong#total {
   font-size: 30px;
diff --git a/public/css/calculator.less b/public/css/calculator.less
index 66aa48a4..da7b7fab 100644
--- a/public/css/calculator.less
+++ b/public/css/calculator.less
@@ -32,7 +32,7 @@ div.container-fluid {
 
 div#calculator {
   #exchange, #amount { width: 5em; }
-  span.btn { font-size: 1.4em; width: 80%; }
+  span.btn { font-size: 16px; width: 100%; }
   strong#total { font-size: 30px; }
   p#address { padding-top: 10px; }
   #title { display: none; }
diff --git a/public/js/report.coffee b/public/js/report.coffee
index 9f8a011b..37c5276d 100644
--- a/public/js/report.coffee
+++ b/public/js/report.coffee
@@ -63,8 +63,7 @@ display = (transactions) ->
 
     $('.report tbody').append("""
       <tr>
-        <td>#{this.date}</td>
-        <td>#{this.address}</td>
+        <td>#{moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')}</td>
         <td>#{exchange.toFixed(2)}</td>
         <td>#{received.toFixed(5)}</td>
         <td>#{amount.toFixed(2)}</td>
@@ -73,13 +72,13 @@ display = (transactions) ->
   )
 
   btc = 0
-  $('table.report td:nth-child(4)').each(->
+  $('table.report tbody td:nth-child(3)').each(->
     btc += parseFloat($(this).html())
   )
   $('#btc').html(btc.toFixed(5))
 
   cad = 0
-  $('table.report td:nth-child(5)').each(->
+  $('table.report tbody td:nth-child(4)').each(->
     cad += parseFloat($(this).html())
   )
   $('#cad').html(cad.toFixed(2))
diff --git a/public/js/report.js b/public/js/report.js
index 09d16a6f..69794ad5 100644
--- a/public/js/report.js
+++ b/public/js/report.js
@@ -63,15 +63,15 @@
       received = parseFloat(this.received);
       amount = received * exchange;
       received *= 1000;
-      return $('.report tbody').append("<tr>\n  <td>" + this.date + "</td>\n  <td>" + this.address + "</td>\n  <td>" + (exchange.toFixed(2)) + "</td>\n  <td>" + (received.toFixed(5)) + "</td>\n  <td>" + (amount.toFixed(2)) + "</td>\n</tr>");
+      return $('.report tbody').append("<tr>\n  <td>" + (moment(this.date, 'YYYY-MM-DD h:mm:ss').format('MMM D h:mma')) + "</td>\n  <td>" + (exchange.toFixed(2)) + "</td>\n  <td>" + (received.toFixed(5)) + "</td>\n  <td>" + (amount.toFixed(2)) + "</td>\n</tr>");
     });
     btc = 0;
-    $('table.report td:nth-child(4)').each(function() {
+    $('table.report tbody td:nth-child(3)').each(function() {
       return btc += parseFloat($(this).html());
     });
     $('#btc').html(btc.toFixed(5));
     cad = 0;
-    $('table.report td:nth-child(5)').each(function() {
+    $('table.report tbody td:nth-child(4)').each(function() {
       return cad += parseFloat($(this).html());
     });
     return $('#cad').html(cad.toFixed(2));