lukechilds
/
EasyDEX-GUI
mirror of https://github.com/lukechilds/EasyDEX-GUI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

another experimental commit with send form bug fix

master
Satinder Grewal 8 years ago
parent
65bd9135ef
commit
1a42238fc7
3 changed files with 64 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      assets/scripts/dashboard.js
  2. 36
      assets/scripts/iguana_api.js
  3. 53
      index.html

18
assets/scripts/dashboard.js
View File

@ -227,6 +227,7 @@ var Dashboard = function() {
$('.edexcoin-send-form')[0].reset();
$('#edexcoin_send_coins_btn').click(function() {
$('#edexcoin_send_coins_btn').prop('disabled', true);
console.log('==> After confirming tx to send')
console.log(active_edexcoin)
console.log(tmp_send_to_addr)
@ -234,20 +235,9 @@ var Dashboard = function() {
var tmp_json_data = {'coin':active_edexcoin,'sendtoaddr':tmp_send_to_addr,'amount':tmp_send_total_amount};
console.log(tmp_json_data);
var tmp_sendtoaddr_output = EDEXSendToAddr(tmp_json_data);
console.log(tmp_sendtoaddr_output);
console.log(tmp_sendtoaddr_output[0]);
var edexcoin_sendto_result_tbl = '';
if ( tmp_sendtoaddr_output[0].error !== undefined ) {
//console.log(tmp_sendtoaddr_output[0].error);
edexcoin_sendto_result_tbl += '<tr class="active"><td>error</td><td><span class="label label-danger">' + tmp_sendtoaddr_output[0].error + '</span></td></tr>';
}
if ( tmp_sendtoaddr_output[0].complete !== undefined ) {
edexcoin_sendto_result_tbl += '<tr class=""><td>complete</td><td><span class="label label-info">' + tmp_sendtoaddr_output[0].complete + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr><td>result</td><td><a href="javascript:void(0)" data-edexcoin="' + active_edexcoin + '" data-sendtotxresult="' + tmp_sendtoaddr_output[0].result + '" class="edexcoin_sendto_output_result">' + tmp_sendtoaddr_output[0].result + '</a></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>sendrawtransaction</td><td><span class="label label-primary">' + tmp_sendtoaddr_output[0].sendrawtransaction + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>signedtx</td><td><span style="display: block; width: 400px;word-wrap: break-word;">' + tmp_sendtoaddr_output[0].signedtx + '</span></td></tr>'
}
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
//console.log(tmp_sendtoaddr_output);
//console.log(tmp_sendtoaddr_output[0]);
getCoinBalance(active_edexcoin);
//clearEdexSendFieldData();
});

36
assets/scripts/iguana_api.js
View File

@ -666,9 +666,43 @@ function EDEXSendToAddr(data) {
//dataType: 'text',
success: function(data, textStatus, jqXHR) {
var SendToAddrData = JSON.parse(data);
console.log('== Data OutPut ==');
//console.log('== Data OutPut ==');
//console.log(SendToAddrData);
//console.log(SendToAddrData.error);
result.push(SendToAddrData);
var edexcoin_sendto_result_tbl = '';
if ( SendToAddrData.error !== undefined ) {
//console.log(SendToAddrData.error);
edexcoin_sendto_result_tbl += '<tr class="active"><td>error</td><td><span class="label label-danger">' + SendToAddrData.error + '</span></td></tr>';
}
if ( SendToAddrData.complete !== undefined ) {
edexcoin_sendto_result_tbl += '<tr class=""><td>complete</td><td><span class="label label-info">' + SendToAddrData.complete + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr><td>result</td><td><a href="javascript:void(0)" data-edexcoin="' + active_edexcoin + '" data-sendtotxresult="' + SendToAddrData.result + '" class="edexcoin_sendto_output_result">' + SendToAddrData.result + '</a></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>sendrawtransaction</td><td><span class="label label-primary">' + SendToAddrData.sendrawtransaction + '</span></td></tr>'
edexcoin_sendto_result_tbl += '<tr class=""><td>signedtx</td><td><span style="display: block; width: 400px;word-wrap: break-word;">' + SendToAddrData.signedtx + '</span></td></tr>'
}
$('#edexcoin_sendto_result tbody').html(edexcoin_sendto_result_tbl);
var active_edexcoin = $('[data-edexcoin]').attr("data-edexcoin");
var selected_coinmode = sessionStorage.getItem('edexTmpMode')
if ( selected_coinmode == 'Basilisk' ) {
var coinwalletbalance = getDEXCoinBalance(active_edexcoin)
console.log(coinwalletbalance)
//coinwalletbalance = coinwalletbalance.total
$('#edex_total_balance').text(coinwalletbalance.total);
} else {
var tmp_get_coin_balance = EDEXlistunspent(active_edexcoin)
if (tmp_get_coin_balance[0] != undefined) {
//console.log(tmp_get_coin_balance[0])
$('#edex_total_balance').text(tmp_get_coin_balance[0].total.toFixed(8));
//console.log(tmp_get_coin_balance[0].total)
} else {
$('#edex_total_balance').text('0');
}
}
$('#edexcoin_send_coins_btn').prop('disabled', false);
},
error: function(xhr, textStatus, error) {
console.log(xhr.statusText);

53
index.html
View File

@ -805,35 +805,32 @@
<!-- EasyDEX Panel send -->
<!-- Example Default -->
<div class="example-wrap">
<div class="example">
<div class="steps row">
<div class="step col-md-4">
<span class="step-number">1</span>
<div class="step-desc">
<span class="step-title">Shopping</span>
<p>Choose what you want</p>
</div>
</div>
<div class="step col-md-4 current">
<span class="step-number">2</span>
<div class="step-desc">
<span class="step-title">Billing</span>
<p>Pay for the bill</p>
</div>
</div>
<div class="step col-md-4">
<span class="step-number">3</span>
<div class="step-desc">
<span class="step-title">Getting</span>
<p>Waiting for the goods</p>
</div>
</div>
</div>
</div>
<!-- Sending EDEXCoin Steps Default -->
<div class="steps row" style="margin-top: 10px;">
<div class="step col-md-4 current">
<span class="step-number">1</span>
<div class="step-desc">
<span class="step-title">Fill Send Form</span>
<p>Fill sending transaction details</p>
</div>
<!-- End Example Default -->
</div>
<div class="step col-md-4">
<span class="step-number">2</span>
<div class="step-desc">
<span class="step-title">Confirming</span>
<p>Confirm if detials are correct</p>
</div>
</div>
<div class="step col-md-4">
<span class="step-number">3</span>
<div class="step-desc">
<span class="step-title">Processing Tx</span>
<p>Processing and showing details</p>
</div>
</div>
</div>
<!-- End Sending EDEXCoin Steps Default -->
<div class="panel" id="projects">
<div class="panel-heading">
<h3 data-edexcoin="COIN" class="panel-title">Send <span data-edexcoin="COIN"></span></h3>

Write Preview
Loading…
Cancel
Save