#96 fixes

zold-io · Dec 11, 2018 · cb8de60 · cb8de60
1 parent 6fb5351
commit cb8de60
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 40 deletions.
diff --git a/html/ledger.html b/html/ledger.html
@@ -38,25 +38,35 @@
     <script src="https://cdn.rawgit.com/yegor256/colorizejs/gh-pages/colorizejs.min.js">
       // Should be empty
     </script>
-    <script src="file:///code/zold-browser/js/ledger.js">
+    <script src="@@VERSION/js/ledger.js">
         // Should be empty
     </script>
   </head>
   <body onload="ledger_init();">
-    <p>
+    <section>
       <p>
         <img class="logo" src="https://www.zold.io/logo.svg" width="64px" style="vertical-align: middle"/>
         <input name="wallet" size="25" placeholder="Enter Zold wallet ID"/>
         <input type="submit" value="Search"/>
       </p>
-      </p>
-      <div id="results" style="display:none;">
+      <div>
         <p>
-          Wallet ID:
-          <b id="wallet">?</b>
-        </p>
-        <p id="transactions">
+          Wallet:
+          <span id="wallet">?</span>
         </p>
+        <table>
+          <thead>
+            <tr>
+              <th>No.</th>
+              <th>Time</th>
+              <th>Amount</th>
+              <th>Beneficiary</th>
+              <th>Details</th>
+            </tr>
+          </thead>
+          <tbody id="txns">
+          </tbody>
+        </table>
       </div>
       <p class="footnotes">
         @@VERSION

diff --git a/js/ledger.js b/js/ledger.js
@@ -23,43 +23,44 @@ SOFTWARE.
 */
 
 function ledger_init() {
-    var url = window.location.href;
-    var wallet = url.split('?')[1].split('=')[1];
-    ledger_refresh(wallet);
+  root = new URLSearchParams(window.location.search).get('wallet');
+  if (root == null) {
+    root = '0000000000000000';
+  }
+  ledger_refresh(root);
 }
 
 function ledger_refresh(wallet) {
-    $.getJSON('http://b2.zold.io:4096/wallet/' + wallet, function(json) {
-        $('#results').show();
-        $('#wallet').text(json.id);
-        var txns = json.body.split("\n");
-        var txns_lines = '<table>';
-        for (var i = 5; i < txns.length - 1; i++) {
-            var tx = txns[i].split(';');
-            txns_lines += '<tr><td><b>' + tx[0] + '</b></td><td>' +
-                human_date(tx[1]) + '</td><td>' + zold_amount(tx[2]) + '</td><td>' +
-                "<a href='ledger.html?wallet=" + tx[4] + "'>" + tx[4] +  '</a></td><td>' +
-                tx[5] + '</i>' + '</a></td></tr>';
-        }
-        $('#transactions').html(txns_lines + '</table>');
-    }).fail(function() { console.log('Failed to load the JSON'); });
+  $.getJSON('http://b2.zold.io:4096/wallet/' + wallet + '/txns.json', function(json) {
+    $('#wallet').html('<code>' + wallet + '</code>');
+    var $tbody = $('#txns');
+    for (var i = 0; i < json.length; i++) {
+      var txn = json[i];
+      $tbody.append(
+        '<tr>' +
+        '<td>' + txn['id'] + '</td>' +
+        '<td>' + zold_date(txn['date']) + '</td>' +
+        '<td style="text-align:right;color:' + (txn['amount'] < 0 ? 'darkred' : 'darkgreen') + '">' +
+          zold_amount(txn['amount']) + '</td>' +
+        '<td><code><a href="?wallet=' + txn['bfn'] + '">' + txn['bfn'] + '</a></code></td>' +
+        '<td>' + txn['details'] + '</td>' +
+        '</tr>'
+      );
+    }
+  }).fail(function() { $('#wallet').text('Failed to load the wallet ' + wallet); });
 }
 
 function zold_amount(am) {
-    return parseFloat(am / Math.pow(2, 32)).toFixed(7) + ' ZLD';
+  return parseFloat(am / Math.pow(2, 32)).toFixed(4);
 }
 
-function human_date(d) {
-    var monthNames = [
-        "Jan", "Feb", "Mar",
-        "Apr", "May", "Jun", "Jul",
-        "Aug", "Sep", "Oct",
-        "Nov", "Dec"
-    ];
-    var day = new Date(Date.parse(d));
-    var monthIndex = day.getMonth();
-    var year = day.getFullYear();
-    var hour = day.getHours();
-    var minutes = day.getMinutes();
-    return monthNames[monthIndex] + ' ' + year + ' ' + hour + ':' + minutes;
-}
+function zold_date(d) {
+  var monthNames = [
+    "Jan", "Feb", "Mar",
+    "Apr", "May", "Jun", "Jul",
+    "Aug", "Sep", "Oct",
+    "Nov", "Dec"
+  ];
+  var day = new Date(Date.parse(d));
+  return day.getMonth() + '/' + day.getDay() + '/' + day.getFullYear() + ' ' + day.getHours() + ':' + day.getMinutes();
+}