Updates in exchange UI
This commit is contained in:
parent
32f95c3700
commit
0758facc0c
|
@ -429,7 +429,13 @@
|
|||
<button class="btn btn-xs btn-swapstatusrefresh coinexchange" data-coin="COIN" style="float: right; margin: -20px -8px 0px 0px"><span class="glyphicon glyphicon-refresh"></span></button>
|
||||
</div>
|
||||
<div class="exchange_trade_status_body"> <!-- panel-body -->
|
||||
<table class="table table-striped exchange_swap_status" style="margin-bottom: 0;">
|
||||
<table class="table table-striped exchange_swap_status_tbl" width="100%" style="margin-bottom: 0;">
|
||||
<thead>
|
||||
<th>Status</th>
|
||||
<th>Quote ID</th>
|
||||
<th>Request ID</th>
|
||||
<th>Action</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<th><div style="text-align: center;">Loading...</div></th>
|
||||
</tbody>
|
||||
|
@ -461,7 +467,8 @@
|
|||
</div>
|
||||
<div class="input-group col-sm-12">
|
||||
<select class="selectpicker trading_pair_coin" data-live-search="true" data-hide-disabled="true" data-width="30%"></select>
|
||||
<input type="text" class="form-control " placeholder="0.01" style="height: 64px; font-size: 20px;">
|
||||
<input type="text" class="form-control trading_pair_coin_price" placeholder="0.01" style="height: 64px; font-size: 20px;">
|
||||
<span class="input-group-addon" id="trading_pair_coin_price_for1" style="font-size: 20px;">1 <span class="coin_ticker"></span></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -475,10 +482,16 @@
|
|||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title"><strong>My Orders</strong></h3>
|
||||
<button class="btn btn-xs btn-swapstatusrefresh coinexchange" data-coin="COIN" style="float: right; margin: -20px -8px 0px 0px"><span class="glyphicon glyphicon-refresh"></span></button>
|
||||
<button class="btn btn-xs btn-myordersrefresh coinexchange" data-coin="COIN" style="float: right; margin: -20px -8px 0px 0px"><span class="glyphicon glyphicon-refresh"></span></button>
|
||||
</div>
|
||||
<div class=""> <!-- panel-body -->
|
||||
<table class="table table-striped exchange_my_orders" style="margin-bottom: 0;">
|
||||
<thead>
|
||||
<th>Base</th>
|
||||
<th>Rel</th>
|
||||
<th>Bid</th>
|
||||
<th>Ask</th>
|
||||
</thead>
|
||||
<tbody>
|
||||
<th><div style="text-align: center;">Loading...</div></th>
|
||||
</tbody>
|
||||
|
|
|
@ -3,6 +3,8 @@
|
|||
var CheckOrderbook_Interval = null;
|
||||
var CheckPortfolio_Interval = null;
|
||||
var check_coin_balance_Interval = null;
|
||||
var check_swap_status_Internal = null;
|
||||
var check_my_prices_Internal = null;
|
||||
|
||||
var coin_pair = ["BTC","KMD"]
|
||||
|
||||
|
@ -456,8 +458,10 @@ $('.btn_coindashboard_exchange').click(function(e) {
|
|||
$('.coin_ticker').html(coin);
|
||||
$('.btn-exchangeclose').attr('data-coin', coin);
|
||||
$('.btn-exchangerefresh').attr('data-coin', coin);
|
||||
$('.btn-myordersrefresh').attr('data-coin', coin);
|
||||
check_coin_balance(false);
|
||||
CheckOrderbook_Interval = setInterval(CheckOrderBookFn,3000);
|
||||
check_swap_status_Internal = setInterval(check_swap_status,5000);
|
||||
});
|
||||
|
||||
$('.btn-exchangeclose').click(function(e){
|
||||
|
@ -468,6 +472,7 @@ $('.btn-exchangeclose').click(function(e){
|
|||
$('.screen-coindashboard').show()
|
||||
$('.screen-exchange').hide();
|
||||
CheckOrderBookFn(false);
|
||||
check_swap_status(false);
|
||||
check_coin_balance_Interval = setInterval(check_coin_balance($(this).data()),3000);
|
||||
check_coin_balance($(this).data());
|
||||
});
|
||||
|
@ -481,6 +486,16 @@ $('.btn-exchangerefresh').click(function(e){
|
|||
CheckOrderBookFn();
|
||||
});
|
||||
|
||||
|
||||
$('.btn-myordersrefresh').click(function(e){
|
||||
e.preventDefault();
|
||||
console.log('btn-myordersrefresh clicked');
|
||||
console.log($(this).data());
|
||||
|
||||
check_my_prices();
|
||||
});
|
||||
|
||||
|
||||
function check_coin_balance(coin_data) {
|
||||
console.log(coin_data);
|
||||
if (coin_data == false) {
|
||||
|
@ -1448,16 +1463,33 @@ function CheckOrderBookFn(sig) {
|
|||
return 'Check orderbook calls stopped.';
|
||||
}
|
||||
|
||||
/* Auto Trading Bot END */
|
||||
|
||||
function check_my_prices(sig){
|
||||
if (sig == false) {
|
||||
clearInterval(check_my_prices_Internal);
|
||||
return
|
||||
} else {
|
||||
console.log('checking my prices');
|
||||
}
|
||||
|
||||
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin'));
|
||||
var coin = selected_coin.coin;
|
||||
console.log(coin);
|
||||
|
||||
/* Swap Status */
|
||||
buying_or_selling = $('input[name=trading_pair_options]:checked').val();
|
||||
|
||||
if(buying_or_selling == 'buying') {
|
||||
var base_coin = coin;
|
||||
var rel_coin = $('.trading_pair_coin').selectpicker('val');
|
||||
}
|
||||
if(buying_or_selling == 'selling') {
|
||||
var base_coin = $('.trading_pair_coin').selectpicker('val');
|
||||
var rel_coin = coin;
|
||||
}
|
||||
|
||||
$('.btn-swapstatusrefresh').click(function() {
|
||||
var userpass = sessionStorage.getItem('mm_userpass');
|
||||
var mypubkey = sessionStorage.getItem('mm_mypubkey');
|
||||
var ajax_data = {"userpass":userpass,"method":"swapstatus"};
|
||||
var ajax_data = {"userpass":userpass,"method":"myprice","base":base_coin,"rel":rel_coin};
|
||||
console.log(ajax_data)
|
||||
var url = "http://127.0.0.1:7783";
|
||||
|
||||
$.ajax({
|
||||
|
@ -1468,11 +1500,124 @@ $('.btn-swapstatusrefresh').click(function() {
|
|||
}).done(function(data) {
|
||||
// If successful
|
||||
console.log(data);
|
||||
//$('.checkswaplist-output').html(JSON.stringify(data, null, 2));
|
||||
if (!data.userpass === false) {
|
||||
console.log('first marketmaker api call execution after marketmaker started.')
|
||||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
} else {
|
||||
//console.log(data);
|
||||
$('.exchange_my_orders tbody').empty();
|
||||
if (!data.error === false) {
|
||||
var exchange_my_orders_tr = '';
|
||||
exchange_my_orders_tr += '<tr>';
|
||||
exchange_my_orders_tr += '<td><div style="text-align: center;">' + data.error + ' for pair ' + base_coin + '/' + rel_coin + '</div></td>';
|
||||
exchange_my_orders_tr += '</tr>';
|
||||
$('.exchange_my_orders tbody').append(exchange_my_orders_tr);
|
||||
} else {
|
||||
/*$.each(data, function(index, val) {
|
||||
console.log(index);
|
||||
console.log(val);
|
||||
|
||||
var base_coin_name = return_coin_name(val.base)
|
||||
var rel_coin_name = return_coin_name(val.rel)
|
||||
|
||||
var exchange_my_orders_tr = '';
|
||||
exchange_my_orders_tr += '<tr>';
|
||||
exchange_my_orders_tr += '<td>'+ val.base + ' (' + base_coin_name + ')</td>';
|
||||
exchange_my_orders_tr += '<td>'+ val.rel + ' (' + rel_coin_name + ')</td>';
|
||||
exchange_my_orders_tr += '<td>' + val.bid + '</td>';
|
||||
exchange_my_orders_tr += '<td>' + val.ask + '</td>';
|
||||
exchange_my_orders_tr += '</tr>';
|
||||
$('.exchange_my_orders tbody').append(exchange_my_orders_tr);
|
||||
});*/
|
||||
|
||||
var base_coin_name = return_coin_name(data.base)
|
||||
var rel_coin_name = return_coin_name(data.rel)
|
||||
|
||||
var exchange_my_orders_tr = '';
|
||||
exchange_my_orders_tr += '<tr>';
|
||||
exchange_my_orders_tr += '<td>'+ data.base + ' (' + base_coin_name + ')</td>';
|
||||
exchange_my_orders_tr += '<td>'+ data.rel + ' (' + rel_coin_name + ')</td>';
|
||||
exchange_my_orders_tr += '<td>' + data.bid + '</td>';
|
||||
exchange_my_orders_tr += '<td>' + data.ask + '</td>';
|
||||
exchange_my_orders_tr += '</tr>';
|
||||
$('.exchange_my_orders tbody').append(exchange_my_orders_tr);
|
||||
}
|
||||
}
|
||||
}).fail(function(jqXHR, textStatus, errorThrown) {
|
||||
// If fail
|
||||
console.log(textStatus + ': ' + errorThrown);
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
$('.trading_pair_coin').on('change', function (e) {
|
||||
var optionSelected = $("option:selected", this);
|
||||
var valueSelected = this.value;
|
||||
console.log(valueSelected);
|
||||
|
||||
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin'));
|
||||
var coin = selected_coin.coin;
|
||||
console.log(coin);
|
||||
|
||||
buying_or_selling = $('input[name=trading_pair_options]:checked').val();
|
||||
|
||||
if(buying_or_selling == 'buying') {
|
||||
var base_coin = coin;
|
||||
var rel_coin = $('.trading_pair_coin').selectpicker('val');
|
||||
}
|
||||
if(buying_or_selling == 'selling') {
|
||||
var base_coin = $('.trading_pair_coin').selectpicker('val');
|
||||
var rel_coin = coin;
|
||||
}
|
||||
|
||||
var userpass = sessionStorage.getItem('mm_userpass');
|
||||
var mypubkey = sessionStorage.getItem('mm_mypubkey');
|
||||
|
||||
$('.orderbook_rel_coin').html(rel_coin);
|
||||
$('.orderbook_base_coin').html(base_coin);
|
||||
|
||||
var ajax_data = {"userpass":userpass,"method":"orderbook","base":base_coin,"rel":rel_coin};
|
||||
//console.log(ajax_data)
|
||||
var url = "http://127.0.0.1:7783";
|
||||
|
||||
$.ajax({
|
||||
data: JSON.stringify(ajax_data),
|
||||
dataType: 'json',
|
||||
type: 'POST',
|
||||
url: url
|
||||
}).done(function(data) {
|
||||
// If successful
|
||||
console.log(data);
|
||||
if (!data.userpass === false) {
|
||||
console.log('first marketmaker api call execution after marketmaker started.')
|
||||
sessionStorage.setItem('mm_usercoins', JSON.stringify(data.coins));
|
||||
sessionStorage.setItem('mm_userpass', data.userpass);
|
||||
sessionStorage.setItem('mm_mypubkey', data.mypubkey);
|
||||
//get_coins_list(data.coins);
|
||||
} else {
|
||||
//console.log(data.asks);
|
||||
$('.trading_pair_coin_price').val(data.asks[0].price);
|
||||
}
|
||||
|
||||
//$('.initcoinswap-output').html(JSON.stringify(data, null, 2));
|
||||
}).fail(function(jqXHR, textStatus, errorThrown) {
|
||||
// If fail
|
||||
console.log(textStatus + ': ' + errorThrown);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
/* Auto Trading Bot END */
|
||||
|
||||
|
||||
|
||||
/* Swap Status */
|
||||
|
||||
$('.btn-swapstatusrefresh').click(function() {
|
||||
check_swap_status();
|
||||
})
|
||||
|
||||
|
||||
|
@ -1500,4 +1645,68 @@ $('.check_swap_status_btn').click(function() {
|
|||
});
|
||||
})
|
||||
|
||||
|
||||
|
||||
$('.exchange_swap_status_tbl tbody').on('click', '.swapstatus_details', function() {
|
||||
console.log('swapstatus details button clicked')
|
||||
console.log($(this).data());
|
||||
});
|
||||
|
||||
|
||||
function check_swap_status(sig) {
|
||||
if (sig == false) {
|
||||
clearInterval(check_swap_status_Internal);
|
||||
return
|
||||
} else {
|
||||
console.log('checking swat status');
|
||||
}
|
||||
|
||||
var selected_coin = JSON.parse(sessionStorage.getItem('mm_selectedcoin'));
|
||||
var coin = selected_coin.coin;
|
||||
//console.log(coin);
|
||||
|
||||
var userpass = sessionStorage.getItem('mm_userpass');
|
||||
var mypubkey = sessionStorage.getItem('mm_mypubkey');
|
||||
var ajax_data = {"userpass":userpass,"method":"swapstatus"};
|
||||
var url = "http://127.0.0.1:7783";
|
||||
|
||||
$.ajax({
|
||||
data: JSON.stringify(ajax_data),
|
||||
dataType: 'json',
|
||||
type: 'POST',
|
||||
url: url
|
||||
}).done(function(data) {
|
||||
// If successful
|
||||
//console.log(data);
|
||||
|
||||
$('.exchange_swap_status_tbl tbody').empty();
|
||||
$.each(data.swaps, function(index, val) {
|
||||
//console.log(index);
|
||||
//console.log(val);
|
||||
if(!val.error === false) {
|
||||
var exchange_swap_status_tr = '';
|
||||
exchange_swap_status_tr += '<tr>';
|
||||
exchange_swap_status_tr += '<td><div>error</div></td>';
|
||||
exchange_swap_status_tr += '<td>-</td>';
|
||||
exchange_swap_status_tr += '<td>-</td>';
|
||||
exchange_swap_status_tr += '<td>-</td>';
|
||||
exchange_swap_status_tr += '</tr>';
|
||||
$('.exchange_swap_status_tbl tbody').append(exchange_swap_status_tr);
|
||||
} else {
|
||||
var exchange_swap_status_tr = '';
|
||||
exchange_swap_status_tr += '<tr>';
|
||||
exchange_swap_status_tr += '<td>' + val.status + '</td>';
|
||||
exchange_swap_status_tr += '<td>' + val.quoteid + '</td>';
|
||||
exchange_swap_status_tr += '<td>' + val.requestid + '</td>';
|
||||
exchange_swap_status_tr += '<td><button class="btn btn-default swapstatus_details" data-quoteid="' + val.quoteid + '" data-requestid="' + val.requestid + '">Details</button></td>';
|
||||
exchange_swap_status_tr += '</tr>';
|
||||
$('.exchange_swap_status_tbl tbody').append(exchange_swap_status_tr);
|
||||
}
|
||||
})
|
||||
}).fail(function(jqXHR, textStatus, errorThrown) {
|
||||
// If fail
|
||||
console.log(textStatus + ': ' + errorThrown);
|
||||
});
|
||||
}
|
||||
|
||||
/* Swap Status END */
|
Loading…
Reference in New Issue