From 12832b3b63d68e30ff2b8d89c7f4e916c8b0e80f Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 11 Nov 2016 00:26:57 +1300 Subject: [PATCH] txid modal linked to tx history box. need to fix, it's buggy --- assets/scripts/kmd_wallet_dashboard.js | 19 ++++++-- index.html | 61 +++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index ea2ab67..f327472 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -92,6 +92,19 @@ var KMDWalletDashboard = function() { var kmd_addr_txid_info = KMDGetTransactionIDInfo($(this).data('txid')); console.log(kmd_addr_txid_info); + $('#kmd_txid_info_amount').text(kmd_addr_txid_info[0].amount); + $('#kmd_txid_info_fee').text(kmd_addr_txid_info[0].fee); + $('#kmd_txid_info_confirmations').text(kmd_addr_txid_info[0].confirmations); + $('#kmd_txid_info_blockhash').text(kmd_addr_txid_info[0].blockhash); + $('#kmd_txid_info_blockindex').text(kmd_addr_txid_info[0].blockindex); + $('#kmd_txid_info_blocktime').text(kmd_addr_txid_info[0].blocktime); + $('#kmd_txid_info_txid').text(kmd_addr_txid_info[0].txid); + $('#kmd_txid_info_walletconflicts').text(kmd_addr_txid_info[0].walletconflicts); + $('#kmd_txid_info_time').text(kmd_addr_txid_info[0].time); + $('#kmd_txid_info_timereceived').text(kmd_addr_txid_info[0].timereceived); + $('#kmd_txid_info_vjoinsplit').text(kmd_addr_txid_info[0].vjoinsplit); + $('#kmd_txid_info_details').text(kmd_addr_txid_info[0].details); + $('#kmd_txid_info_hex').val(kmd_addr_txid_info[0].hex); }); }; @@ -456,7 +469,7 @@ function KMDGetPublicTransactions() { } //console.log(tmp_addr); //tmplisttransactions = {"type":"public","category": AjaxOutputData[index].category,"confirmations": AjaxOutputData[index].confirmations,"amount": AjaxOutputData[index].amount,"time": AjaxOutputData[index].time,"address": AjaxOutputData[index].address,"txid": AjaxOutputData[index].txid} - tmplisttransactions = [' public',tmp_category,AjaxOutputData[index].confirmations,AjaxOutputData[index].amount,tmp_secondsToString,tmp_addr,''] + tmplisttransactions = [' public',tmp_category,AjaxOutputData[index].confirmations,AjaxOutputData[index].amount,tmp_secondsToString,tmp_addr,''] //console.log(tmplisttransactions); result.push(tmplisttransactions); }); @@ -524,7 +537,7 @@ function KMDGetProtectedTransactions() { - tmplistZtransactions = [' private',tmp_category,tmp_confirmations,tmp_amount,tmp_secondsToString,tmp_addr,''] + tmplistZtransactions = [' private',tmp_category,tmp_confirmations,tmp_amount,tmp_secondsToString,tmp_addr,''] //console.log(tmplistZtransactions); result.push(tmplistZtransactions); }); @@ -555,7 +568,7 @@ function KMDfillTxHistoryT() { var txhistorydataZ = KMDGetProtectedTransactions(); var txhistorydata = $.merge( txhistorydataT, txhistorydataZ ); //console.log(txhistorydata); - + if ( $.fn.dataTable.isDataTable( '#kmd-tx-history-tbl' ) ) { $('#kmd-tx-history-tbl').DataTable( { data: txhistorydata, "order": [[ 4, "desc" ]], diff --git a/index.html b/index.html index 4c11ecc..c377dd1 100755 --- a/index.html +++ b/index.html @@ -829,7 +829,66 @@ - + + +