From ca98c44fb8f332eec04a7dfc010dece86f6deaf6 Mon Sep 17 00:00:00 2001
From: Satinder Grewal <>
Date: Fri, 27 Oct 2017 22:08:57 +1300
Subject: [PATCH] uglygui changed to simplegui, inventory total calc update

---
 gui/index.html             |  4 ++--
 gui/js/simpledexactions.js | 28 +++++++++++++++++++++++++++-
 ipc/shepherd-ipc.js        |  2 +-
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/gui/index.html b/gui/index.html
index a54061f..2724457 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -282,12 +282,12 @@
               </div>
               <div class="form-group">
                 <div class="col-sm-offset-9 col-sm-3">
-                  <span style="font-weight: 300; font-size: 25px;">Total <span class="inventory-sliderTotal" style="font-weight: 300; font-size: 25px;"></span></span>
+                  <span style="font-weight: 300; font-size: 25px;">Total <span class="inventory-sliderTotal" style="font-weight: 300; font-size: 25px;"></span><span class="coininventory inventory-sliderTotalCoin"></span></span>
                 </div>
               </div>
               <div class="form-group">
                 <div class="" style="text-align: center;">
-                  <button class="btn btn-default">Make Inventory</button>
+                  <button class="btn btn-default coininventory btn-makeinventory" data-coin="COIN">Make Inventory</button>
                 </div>
               </div>
             </form>
diff --git a/gui/js/simpledexactions.js b/gui/js/simpledexactions.js
index d70e076..90c48a0 100644
--- a/gui/js/simpledexactions.js
+++ b/gui/js/simpledexactions.js
@@ -214,6 +214,7 @@ $('.btn-inventory').click(function(e) {
 	$('.inventory-title').html('Manage Inventory ('+$('.balance.pair-'+$(this).data('pair')+'').html()+' '+$(this).data('coin')+')');
 	$('.inventory-title').data('coin', $(this).data('coin'));
 	$('.coininventory[data-coin]').attr('data-coin', $(this).data('coin'));
+	$('.inventory-sliderTotalCoin').html(' '+$(this).data('coin'));
 
 	check_coin_inventory($(this).data('coin'));
 
@@ -314,6 +315,13 @@ $('.dex_showinv_alice_tbl tbody').on('click', '.btn_coiniventory_detail', functi
 });
 
 
+
+$('.btn-makeinventory').click(function(e) {
+	e.preventDefault();
+	console.log('btn-makeinventory clicked');
+	console.log($(this).data());
+});
+
 function check_coin_balance(sig) {
 	if (sig == false) {
 		clearInterval(check_coin_balance_Interval);
@@ -703,6 +711,12 @@ $("#inventory-slider1").on("slide", function(slideEvt) {
 
 	utxo_input = $("#inventory_slider_input1").val();
 	$("#inventory-slider1Total").text(slideEvt.value*utxo_input);
+
+	var slider_input2 = $('#inventory-slider2').val();
+	var slider_input3 = $('#inventory-slider3').val();
+	var slider_total = parseFloat(slideEvt.value*utxo_input1) + parseFloat(slider_input2*utxo_input2) + parseFloat(slider_input3*utxo_input3);
+
+	$('.inventory-sliderTotal').text(slider_total.toFixed(8));
 });
 
 $("#inventory-slider2").slider();
@@ -711,6 +725,12 @@ $("#inventory-slider2").on("slide", function(slideEvt) {
 
 	utxo_input = $("#inventory_slider_input2").val();
 	$("#inventory-slider2Total").text(slideEvt.value*utxo_input);
+
+	var slider_input1 = $('#inventory-slider1').val();
+	var slider_input3 = $('#inventory-slider3').val();
+	var slider_total = parseFloat(slider_input1*utxo_input1) + parseFloat(slideEvt.value*utxo_input2) + parseFloat(slider_input3*utxo_input3);
+
+	$('.inventory-sliderTotal').text(slider_total.toFixed(8));
 });
 
 $("#inventory-slider3").slider();
@@ -719,6 +739,12 @@ $("#inventory-slider3").on("slide", function(slideEvt) {
 
 	utxo_input = $("#inventory_slider_input3").val();
 	$("#inventory-slider3Total").text(slideEvt.value*utxo_input);
+
+	var slider_input1 = $('#inventory-slider1').val();
+	var slider_input2 = $('#inventory-slider2').val();
+	var slider_total = parseFloat(slider_input1*utxo_input1) + parseFloat(slider_input2*utxo_input2) + parseFloat(slideEvt.value*utxo_input3);
+
+	$('.inventory-sliderTotal').text(slider_total.toFixed(8));
 });
 
 
@@ -747,5 +773,5 @@ function clac_coin_inventory(data) {
 	var slider_total = parseFloat(slider_input1*utxo_input1) + parseFloat(slider_input2*utxo_input2) + parseFloat(slider_input3*utxo_input3);
 	console.log(slider_total);
 
-	$('.inventory-sliderTotal').text(slider_total);
+	$('.inventory-sliderTotal').text(slider_total.toFixed(8));
 }
\ No newline at end of file
diff --git a/ipc/shepherd-ipc.js b/ipc/shepherd-ipc.js
index 605115c..d86c72c 100644
--- a/ipc/shepherd-ipc.js
+++ b/ipc/shepherd-ipc.js
@@ -186,7 +186,7 @@ ExecMarketMaker = function(data) {
       }*/
 
       const _customParam = {
-              'gui':'uglygui',
+              'gui':'simplegui',
               'client':1,
               'userhome':`${process.env.HOME}`,
               'passphrase': data.passphrase,