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

[bugfix] trade history and debug doesn't let settings show on screen properly

This commit is contained in:
satindergrewal 2017-12-15 01:39:50 +13:00
parent ed5f61ab77
commit be5a755683
3 changed files with 50 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/css/custom.css
View File

@ -349,7 +349,7 @@ table tbody tr:first-child td {
width: 100%;
height: 100%;
background: #fff;
z-index: 1100;
/*z-index: 1100;*/
padding: 20px;
overflow-y: scroll;
height: calc(100% - 60px);
@ -375,7 +375,7 @@ table tbody tr:first-child td {
width: 100%;
height: 100%;
background: #fff;
z-index: 1100;
/*z-index: 1100;*/
padding: 20px;
overflow-y: scroll;
height: calc(100% - 60px);

54
gui/js/ipc-actions.js
View File

@ -81,7 +81,29 @@ $('.dexdashboard-btn').click(function(e){
$('.dextradeshistory-btn').click(function(e) {
if ($('.dextradeshistory').is(":visible")) {
$('.screen-portfolio').hide();
$('.screen-coindashboard').hide();
$('.screen-exchange').hide();
$('.dexdebug').hide();
$('.dextradeshistory').show();
$('.navbar-right').children().removeClass('active');
$('.dextradeshistory-btn').parent().addClass( "active" );
constructTradesHistory();
CheckPortfolioFn(false);
CheckOrderBookFn(false);
check_swap_status(false);
check_bot_list(false);
check_my_prices(false);
bot_screen_coin_balance(false);
bot_screen_sellcoin_balance(false);
check_coin_balance(false);
Refresh_active_StockChart(false);
/*if ($('.dextradeshistory').is(":visible")) {
$('body').css('overflow', 'inherit');
$('.dextradeshistory').hide();
$('.dextradeshistory-btn').html('Trades history');
@ -93,7 +115,7 @@ $('.dextradeshistory-btn').click(function(e) {
$('.navbar-right').children().removeClass('active');
$('.dextradeshistory-btn').parent().addClass( "active" );
constructTradesHistory();
}
}*/
});
$('.dexlogout-btn').click(function(e) {
@ -120,15 +142,31 @@ $('.dexlogout-btn').click(function(e) {
$('.dexdebug-btn').click(function(e) {
$('.navbar-right').children().removeClass('active');
$('.dexdebug').show();
$('.dexlogout-btn').hide();
$('.dexdebug-close-btn').show();
$('.dexdebug-btn').hide();
$('.dextradeshistory-btn').hide();
$('.dexdashboard-btn').hide();
$('.dexsettings-btn').hide();
//$('.dexlogout-btn').hide();
//$('.dexdebug-close-btn').show();
//$('.dexdebug-btn').hide();
//$('.dextradeshistory-btn').hide();
//$('.dexdashboard-btn').hide();
//$('.dexsettings-btn').hide();
$('.screen-portfolio').hide();
$('.screen-coindashboard').hide();
$('.screen-exchange').hide();
$('.navbar-right').children().removeClass('active');
$('.dexdebug-btn').parent().addClass( "active" );
CheckPortfolioFn(false);
CheckOrderBookFn(false);
check_swap_status(false);
check_bot_list(false);
check_my_prices(false);
bot_screen_coin_balance(false);
bot_screen_sellcoin_balance(false);
check_coin_balance(false);
Refresh_active_StockChart(false);
});
$('.dexdebug-close-btn').click(function(e) {

3
gui/js/simpledexactions.js
View File

@ -2601,7 +2601,7 @@ function manual_buy_sell(mt_data) {
//$('.relvol_basevol').html('');
if (!mt_output_data.error === false) {
toastr.error(mt_output_data.error, 'Bot Info');
toastr.error(mt_output_data.error, 'Trade Info');
if (mt_output_data.error == 'not enough funds') {
//toastr.info(mt_output_data.error + '<br>Balance: ' + mt_output_data.balance + ' ' + mt_output_data.coin, 'Bot Info');
bootbox.alert({
@ -5060,6 +5060,7 @@ function constructTradesHistory() {
type: 'POST',
url: url,
}).done(function(data) {
console.log(data);
let out = '';
let tradesCounter = 0;