BTCPrivate
/
BarterDEX
mirror of https://github.com/BTCPrivate/BarterDEX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

uglygui changed to simplegui, inventory total calc update

This commit is contained in:
Satinder Grewal 2017-10-27 22:08:57 +13:00
parent 61ad3d78b4
commit ca98c44fb8
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/index.html
View File

@ -282,12 +282,12 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-9 col-sm-3"> <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> </div>
<div class="form-group"> <div class="form-group">
<div class="" style="text-align: center;"> <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>
</div> </div>
</form> </form>

28
gui/js/simpledexactions.js
View File

@ -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').html('Manage Inventory ('+$('.balance.pair-'+$(this).data('pair')+'').html()+' '+$(this).data('coin')+')');
$('.inventory-title').data('coin', $(this).data('coin')); $('.inventory-title').data('coin', $(this).data('coin'));
$('.coininventory[data-coin]').attr('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')); 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) { function check_coin_balance(sig) {
if (sig == false) { if (sig == false) {
clearInterval(check_coin_balance_Interval); clearInterval(check_coin_balance_Interval);
@ -703,6 +711,12 @@ $("#inventory-slider1").on("slide", function(slideEvt) {
utxo_input = $("#inventory_slider_input1").val(); utxo_input = $("#inventory_slider_input1").val();
$("#inventory-slider1Total").text(slideEvt.value*utxo_input); $("#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(); $("#inventory-slider2").slider();
@ -711,6 +725,12 @@ $("#inventory-slider2").on("slide", function(slideEvt) {
utxo_input = $("#inventory_slider_input2").val(); utxo_input = $("#inventory_slider_input2").val();
$("#inventory-slider2Total").text(slideEvt.value*utxo_input); $("#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(); $("#inventory-slider3").slider();
@ -719,6 +739,12 @@ $("#inventory-slider3").on("slide", function(slideEvt) {
utxo_input = $("#inventory_slider_input3").val(); utxo_input = $("#inventory_slider_input3").val();
$("#inventory-slider3Total").text(slideEvt.value*utxo_input); $("#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); var slider_total = parseFloat(slider_input1*utxo_input1) + parseFloat(slider_input2*utxo_input2) + parseFloat(slider_input3*utxo_input3);
console.log(slider_total); console.log(slider_total);
$('.inventory-sliderTotal').text(slider_total); $('.inventory-sliderTotal').text(slider_total.toFixed(8));
} }

2
ipc/shepherd-ipc.js
View File

@ -186,7 +186,7 @@ ExecMarketMaker = function(data) {
}*/ }*/
const _customParam = { const _customParam = {
'gui':'uglygui', 'gui':'simplegui',
'client':1, 'client':1,
'userhome':`${process.env.HOME}`, 'userhome':`${process.env.HOME}`,
'passphrase': data.passphrase, 'passphrase': data.passphrase,