From 947f00df3f9dc2eeb1c7132bc1115a5e04553e4f Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Wed, 30 Nov 2016 16:03:58 +1300 Subject: [PATCH] edex dashboard wallet recieve section updated with code --- assets/scripts/dashboard.js | 69 ++++++++++++++++++++++++++-- assets/scripts/iguana_api.js | 6 +-- index.html | 87 +++++++++++++++++++++--------------- 3 files changed, 120 insertions(+), 42 deletions(-) diff --git a/assets/scripts/dashboard.js b/assets/scripts/dashboard.js index 171defb..25325a5 100644 --- a/assets/scripts/dashboard.js +++ b/assets/scripts/dashboard.js @@ -36,6 +36,7 @@ var Dashboard = function() { $('#edexcoin_dashoard_section').show(); $('#edexcoin_dashboardinfo').show(); $('#edexcoin_send').hide(); + $('#edexcoin_recieve').hide(); $('#edexcoin_recieve_section').hide(); $('#edexcoin_settings').hide(); getCoinBalance(active_edexcoin); @@ -52,6 +53,7 @@ var Dashboard = function() { $('#edexcoin_dashboardinfo').hide(); $('#edexcoin_send').show(); + $('#edexcoin_recieve').hide(); $('#edexcoin_recieve_section').hide(); $('#edexcoin_settings').hide(); @@ -177,12 +179,36 @@ var Dashboard = function() { //console.log(tmp_json_data); var tmp_sendtoaddr_output = EDEXSendToAddr(tmp_json_data); console.log(tmp_sendtoaddr_output); + getCoinBalance(active_edexcoin); clearEdexSendFieldData(); NProgress.done(); } }); } + var handle_edex_recieve = function() { + $('#btn_edexcoin_recieve').click(function() { + var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin"); + //console.log('wallet recieve button clicked...'); + $('#edexcoin_dashboardinfo').hide(); + $('#edexcoin_dashoard_section').hide(); + $('#edexcoin_send').hide(); + $('#edexcoin_recieve').show(); + $('#edexcoin_recieve_section').show(); + $('#edexcoin_settings').hide(); + EdexListAllAddr(active_edexcoin); + clearEdexSendFieldData(); + }); + + $('#edexcoin_get_new_addr').click(function() { + var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin"); + console.log('get new T address button clicked...'); + EDEXgetnewaddress(active_edexcoin); + EdexListAllAddr(active_edexcoin); + toastr.info("Recieving Address list updated", "Wallet Notification"); + }); + }; + var handleWalletWidgets = function() { var walletDivContent = ''; @@ -317,6 +343,7 @@ var Dashboard = function() { handle_edex_wallet(); handle_edex_dashboard(); handle_edex_send(); + handle_edex_recieve(); @@ -582,10 +609,6 @@ function ShowCoinHistory(getData) { } function getCoinBalance(coin) { - //console.log(rmd160conv_data); - //return rmd160conv_data; - - //comment var ajax_data = {"agent":"bitcoinrpc","method":"getbalance","coin": coin}; //console.log(ajax_data); $.ajax({ @@ -787,6 +810,8 @@ function ShowCoinProgressBar(coin) { $('div[data-edexcoin="'+coin+'"][id="currency-bundles"]').removeClass( "progress-bar-info" ).addClass( "progress-bar-indicating progress-bar-success" ); $('#edex-footer').css("height", "11px"); resizeDashboardWindow(); + //getCoinBalance(coin); + //EdexfillTxHistory(coin); } if ( parseInt(CoinInfoData.RTheight) == 0 ) { sessionStorage.setItem('Activate'+coin+'History', 'No'); @@ -898,4 +923,40 @@ function clearEdexSendFieldData() { $('#edexcoin_sendto').val(''); $('#edexcoin_total_value').text(''); $('#edexcoin_amount').val(''); +} + +function EdexListAllAddr(coin) { + NProgress.done(true); + NProgress.configure({ + template: '
' + }); + NProgress.start(); + var only_reciving_addr_data = []; + var listAlladdr = EDEXgetaddrbyaccount(coin); + listAlladdr = listAlladdr[0]; + console.log(listAlladdr); + + $.each(listAlladdr, function(index, value) { + tmp_addr_label = ' public'; + //var tmp_addr_action_button = ''; + only_reciving_addr_data.push([tmp_addr_label, listAlladdr[index]]); + }); + //console.log(only_reciving_addr_data); + + var edexcoin_recieve_table = ''; + + edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data, + select: false, + retrieve: true + }); + + edexcoin_recieve_table.destroy(); + + edexcoin_recieve_table = $('#edexcoin-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data, + select: false, + retrieve: true + }); + + NProgress.done(); + return only_reciving_addr_data; } \ No newline at end of file diff --git a/assets/scripts/iguana_api.js b/assets/scripts/iguana_api.js index 1c2f098..cc07980 100644 --- a/assets/scripts/iguana_api.js +++ b/assets/scripts/iguana_api.js @@ -547,7 +547,7 @@ function EDEXSendToAddr(data) { //Get parameters values from confirm dialog and send currency var sendtoaddrvalues = {"coin": confirm_coinname_to_send,"method":"sendtoaddress","params":[confirm_sendto_address,confirm_send_amount,"EasyDEX","EasyDEXTransaction"]}; - console.log(sendtoaddrvalues); + //console.log(sendtoaddrvalues); $.ajax({ async: false, type: 'POST', @@ -578,7 +578,7 @@ function EDEXgetinfo(coin) { //Get parameters values from confirm dialog and send currency var ajax_data = {"coin":coin,"agent":"bitcoinrpc","method":"getinfo","immediate":100,"timeout":4000}; - console.log(ajax_data); + //console.log(ajax_data); $.ajax({ async: false, type: 'POST', @@ -608,7 +608,7 @@ function EDEXgetaddrbyaccount(coin) { //Get parameters values from confirm dialog and send currency var ajax_data = {"coin":coin,"agent":"bitcoinrpc","method":"getaddressesbyaccount","account":"*"} - console.log(ajax_data); + //console.log(ajax_data); $.ajax({ async: false, type: 'POST', diff --git a/index.html b/index.html index 5cd28dc..5d77e09 100755 --- a/index.html +++ b/index.html @@ -638,45 +638,62 @@ - -