From 0d083415d8369e2f6a660162ac386af4cb44631a Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Sat, 12 Nov 2016 02:16:02 +1300 Subject: [PATCH] Komodo send coins form update, opid status js code added --- assets/css/dashboard.css | 2 +- assets/scripts/kmd_wallet_dashboard.js | 171 +++++++++++++++++++++++-- index.html | 103 +++++++++++---- 3 files changed, 237 insertions(+), 39 deletions(-) diff --git a/assets/css/dashboard.css b/assets/css/dashboard.css index 1b43a96..fab4992 100644 --- a/assets/css/dashboard.css +++ b/assets/css/dashboard.css @@ -18,7 +18,7 @@ box-shadow: 0 3px 10px 0px rgba(0, 0, 0, 0.32); } -#section-iguana-wallet-settings, #section-iguana-atomic-explorer, #section-komodo { +#section-iguana-wallet-settings, #section-iguana-atomic-explorer, #section-extcoin { padding-top: 0; } diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index 6677fa7..dc09497 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -57,33 +57,100 @@ var KMDWalletDashboard = function() { var sum_val1 = parseFloat($('#kmd_wallet_amount').val()) var sum_val2 = parseFloat($('#kmd_wallet_fee').val()) var total_minus_currency_fee = sum_val1 - sum_val2; - var mdl_send_btn = $('#kmd_wallet_send_btn'); + var mdl_send_btn = $('#kmd_wallet_send_coins_btn'); //console.log($('#kmd_wallet_amount').val()); $('#kmd_wallet_total_value').text(total_minus_currency_fee.toFixed(8)); - if ($('#kmd_wallet_amount').val() != '' && $('#kmd_wallet_sendto') != '' && $('#kmd_wallet_fee') != '' ) { + if ($('#kmd_wallet_send_from').val() != '- Select Transparent or Private KMD Address -' && $('#kmd_wallet_amount').val() != '' && $('#kmd_wallet_sendto') != '' && $('#kmd_wallet_fee') != '' ) { mdl_send_btn.removeClass('disabled'); - mdl_send_btn.attr('data-dismiss','modal'); - mdl_send_btn.attr('data-target','#SendCoinModelStep2'); - mdl_send_btn.attr('onclick','ConfirmsendCurrency($(this).data())') + //mdl_send_btn.attr('data-dismiss','modal'); + //mdl_send_btn.attr('data-target','#SendCoinModelStep2'); } else { mdl_send_btn.addClass('disabled'); mdl_send_btn.removeAttr('data-dismiss'); mdl_send_btn.removeAttr('data-target'); - mdl_send_btn.removeAttr('onclick'); } }); - $('#kmd_wallet_send_coins_btn').click(function() { - console.log('send button clicked in form...') - }); + $('#kmd_wallet_fee').keyup(function() { + var sum_val1 = parseFloat($('#kmd_wallet_amount').val()) + var sum_val2 = parseFloat($('#kmd_wallet_fee').val()) + var total_minus_currency_fee = sum_val1 - sum_val2; + var mdl_send_btn = $('#kmd_wallet_send_coins_btn'); + + //console.log($('#kmd_wallet_amount').val()); + $('#kmd_wallet_total_value').text(total_minus_currency_fee.toFixed(8)); + + if ($('#kmd_wallet_send_from').val() != '- Select Transparent or Private KMD Address -' && $('#kmd_wallet_amount').val() != '' && $('#kmd_wallet_sendto') != '' && $('#kmd_wallet_fee') != '' ) { + mdl_send_btn.removeClass('disabled'); + //mdl_send_btn.attr('data-dismiss','modal'); + //mdl_send_btn.attr('data-target','#SendCoinModelStep2'); + } else { + mdl_send_btn.addClass('disabled'); + mdl_send_btn.removeAttr('data-dismiss'); + mdl_send_btn.removeAttr('data-target'); + } + }); - /*$('.md-refresh-alt').click(function() { - if ( $(this).data('load-callback') === 'KMDSendScreenRefreshCallback' ) { - //handle_KMD_Send(); - } + /*$('#kmd_wallet_send_coins_btn').click(function() { + console.log('send button clicked in form...') });*/ + + $('.extcoin-send-form').validate({ + //errorElement: 'span', //default input error message container + //errorClass: 'help-block', // default input error message class + //focusInvalid: false, // do not focus the last invalid input + rules: { + kmd_wallet_send_from: { + required: true + }, + kmd_wallet_sendto: { + required: true + }, + kmd_wallet_amount: { + required: true + }, + kmd_wallet_fee: { + required: true + }, + kmd_wallet_total_value: { + required: true + } + }, + + messages: { + kmd_wallet_send_from: { + required: "From Address is required." + }, + kmd_wallet_sendto: { + required: "To Address is required." + }, + kmd_wallet_amount: { + required: "Please enter KMD amount to send." + }, + kmd_wallet_fee: { + required: "Make sure you have fee entered. Default value is 0.0001 KMD." + }, + kmd_wallet_total_value: { + required: "Make sure you have both amount and fee entered to calculate final total." + } + }, + + submitHandler: function(form) { + console.log('send sent control here after clicked in form...'); + } + }); + + $('.extcoin-send-form #kmd_wallet_send_coins_btn').keypress(function(e) { + //console.log('send button clicked in form...'); + if (e.which == 13) { + if ($('.extcoin-send-form').validate().form()) { + $('.extcoin-send-form').submit(); //form validation success, call ajax form submit + } + return false; + } + }); } var KMDGetTXIDdetails = function() { @@ -796,4 +863,82 @@ function KMDGetTransactionIDInfo(txid) { }); //console.log(result); return result; +} + + +function KMDGetOPIDInfo(opid) { + var result = []; + var tmpopid_output = ''; + + if ( opid === undefined ) { + tmpopid_output = ''; + } else { + var ajax_data_to_hex = '["'+ opid +'"]' + var tmpopid_output = Iguana_HashHex(ajax_data_to_hex) + //console.log(tmpopid_output); + } + + var ajax_data_txid_input = {"agent":"komodo","method":"passthru","function":"z_getoperationstatus","hex":tmpopid_output} + //console.log(ajax_data_txid_input); + $.ajax({ + async: false, + type: 'POST', + data: JSON.stringify(ajax_data_txid_input), + url: 'http://127.0.0.1:7778', + //dataType: 'text', + success: function(data, textStatus, jqXHR) { + var AjaxOutputData = JSON.parse(data); + //console.log('== Data OutPut of z_getoperationstatus =='); + //console.log(value); + //console.log(AjaxOutputData); + result.push(AjaxOutputData); + }, + error: function(xhr, textStatus, error) { + console.log('failed getting Coin History.'); + console.log(xhr.statusText); + if ( xhr.readyState == 0 ) { + Iguana_ServiceUnavailable(); + } + console.log(textStatus); + console.log(error); + } + }); + //console.log(result); + return result; +} + + +function KMDListAllOPIDs() { + NProgress.done(true); + NProgress.configure({ + template: '
' + }); + NProgress.start(); + var only_reciving_addr_data = []; + var listOPIDs = KMDGetOPIDInfo(); + + $.each(listOPIDs, function(index, value) { + tmp_addr_label = ' public'; + if ( listAlladdr[index].slice(0, 2) == 'zc' ) { tmp_addr_label = ' private'; } + //var tmp_addr_action_button = ''; + only_reciving_addr_data.push([tmp_addr_label, listAlladdr[index]]); + }); + //console.log(only_reciving_addr_data); + + var kmd_recieve_table = ''; + + kmd_recieve_table = $('#kmd-recieve-addr-tbl').DataTable( { data: only_reciving_addr_data, + select: false, + retrieve: true + }); + + kmd_recieve_table.destroy(); + + kmd_recieve_table = $('#kmd-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/index.html b/index.html index 94f7df6..793a969 100755 --- a/index.html +++ b/index.html @@ -798,39 +798,92 @@ -->
-
-
- - -
-
- - -
-
- - -
-
- - -
-
- Total (KMD - txfee): - 0.000 KMD -
-
- +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ Total (KMD - txfee): 0.000 KMD +
+
+ +
-
+
+ + +
+ +
+
+ +
+
+ +
+
+

+ Operations Statuses +

+
+
+ + + + + + + + + + + + + + + + + + + + + +
StatusIDcreation_timeResultExecution Secs
StatusIDcreation_timeResultExecution Secs
+
+
+ +
+ + +
+ + +
+
+ +