Web view improvements (update interval, settings)

www/lendingbot.html

@@ -26,15 +26,15 @@
 
     <!-- Bootstrap Core CSS -->
     <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" rel="stylesheet">
-    
+
     <!-- jQuery Version 1.12.2 -->
     <script src="https://code.jquery.com/jquery-1.12.2.min.js"></script>
 
     <!-- Bootstrap Core JavaScript -->
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
-    
+
     <script src="lendingbot.js" ></script>
-    
+
     <style>
         body {
 		padding-top: 50px;

www/lendingbot.js

@@ -2,11 +2,12 @@
 
 var localFile, reader;
 
-var Hour = new Timespan("Hour",1/24);
-var Day = new Timespan("Day",1);
-var Week = new Timespan("Week",7);
-var Month = new Timespan("Month",30);
-var timespans = [Month, Week, Day, Hour];
+var Hour = new Timespan("Hour", 1/24);
+var Day = new Timespan("Day", 1);
+var Week = new Timespan("Week", 7);
+var Month = new Timespan("Month", 30);
+var Year = new Timespan("Year", 365);
+var timespans = [Year, Month, Week, Day, Hour];
 var summaryCoinRate, summaryCoin;
 var earningsOutputCoinRate, earningsOutputCoin;
 var outputCurrencyDisplayMode = 'all'
@@ -69,6 +70,7 @@ function updateRawValues(rawData){
     table.innerHTML = "";
     var currencies = Object.keys(rawData);
     var totalBTCEarnings = {};
+    var totalCoinsOverall = 0;
     for (var keyIndex = 0; keyIndex < currencies.length; ++keyIndex)
     {
         var currency = currencies[keyIndex];
@@ -78,6 +80,7 @@ function updateRawValues(rawData){
         var totalCoins = parseFloat(rawData[currency]['totalCoins']);
         var maxToLend = parseFloat(rawData[currency]['maxToLend']);
         var highestBidBTC = parseFloat(rawData[currency]['highestBid']);
+
         if (currency == 'BTC') {
             // no bids for BTC provided by poloniex
             // this is added so BTC can be handled like other coins for conversions
@@ -181,11 +184,20 @@ function updateRawValues(rawData){
                 }
             }
         }
+        totalCoinsOverall += earningsOutputCoinRate * maxToLend * highestBidBTC;
     }
 
     // add headers
     var thead = table.createTHead();
 
+    // total
+    var total_row = thead.insertRow(0);
+    var total_cell = total_row.appendChild(document.createElement("th"));
+    total_cell.innerHTML = "Total holdings";
+    total_cell = total_row.appendChild(document.createElement("th"));
+    total_cell.setAttribute("colspan", 2);
+    total_cell.innerHTML = prettyFloat(totalCoinsOverall, 2) + " USD";
+
     // show account summary
     if (currencies.length > 1 || summaryCoin != earningsOutputCoin) {
         earnings = '';
@@ -214,18 +226,18 @@ function handleLocalFile(file) {
 function loadData() {
     if (localFile) {
         reader.readAsText(localFile, 'utf-8');
-        setTimeout('loadData()',30000)
+        setTimeout('loadData()', 10000)
     } else {
         // expect the botlog.json to be in the same folder on the webserver
         var file = 'botlog.json';
         $.getJSON(file, function (data) {
             updateJson(data);
             // reload every 30sec
-            setTimeout('loadData()',30000)
+            setTimeout('loadData()', 10000)
         }).fail( function(d, textStatus, error) {
             $('#status').text("getJSON failed, status: " + textStatus + ", error: "+error);
             // retry after 60sec
-            setTimeout('loadData()',60000)
+            setTimeout('loadData()', 60000)
         });;
     }
 }
@@ -246,6 +258,8 @@ function Timespan(name, multiplier) {
             }
             if (currency == "BTC") {
                 return displayUnit.formatValue(earnings) + " <span class=" + currencyClass + ">" + displayUnit.name + "</span> / " + name + "<br/>"
+            } else if (currency == "USD" || currency == "USDT") {
+                return printFloat(earnings, 2) + " <span class=" + currencyClass + ">" + currency + "</span> / "+  name + "<br/>";
             } else {
                 return printFloat(earnings, 8) + " <span class=" + currencyClass + ">" + currency + "</span> / "+  name + "<br/>";
             }