matt/paperclip-wallet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ block sorting even for unconfirmed empty blocks

Browse Source 
* code for transactions table moved to separate unit
This commit is contained in:
Taegus
2018-12-25 15:27:02 +01:00
parent a32b746e4f
commit ff68252e62
8 changed files with 288 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
renderer/send.js
View File

@@ -145,13 +145,14 @@ $(document).on("render_send", function() {
EthoMainGUI.showGeneralError(error);
},
function(transaction) {
console.log(JSON.stringify(transaction));
ipcRenderer.send('storeTransaction', {
block: element.block.toString(),
txhash: element.hash.toLowerCase(),
fromaddr: element.fromaddr.toLowerCase(),
timestamp: element.timestamp,
toaddr: element.toaddr.toLowerCase(),
value: element.value
block: transaction.blockNumber,
txhash: transaction.hash.toLowerCase(),
fromaddr: transaction.from.toLowerCase(),
timestamp: moment().format('YYYY-MM-DD HH:mm:ss'),
toaddr: transaction.to.toLowerCase(),
value: transaction.value
});
}
);

73
renderer/tableTransactions.js Normal file
View File

@@ -0,0 +1,73 @@
class tableTransactions {
constructor() {
this.appState = "account";
}
initialize(id, data) {
// register the sort datetime format
$.fn.dataTable.moment('MMM Do YYYY HH:mm:ss');
var namesType = $.fn.dataTable.absoluteOrder(
[
{ value: null, position: 'top' }
]);
// render the transactions
$(id).DataTable({
"paging": false,
"scrollY": "calc(100vh - 115px)",
"responsive": true,
"processing": true,
"order": [[ 1, "desc" ]],
"data": data,
"oSearch": {"sSearch": EthoTransactions.getFilter() },
"columnDefs": [
{
"targets": 0,
"render": function ( data, type, row ) {
if (data == 0) {
return '<i class="fas fa-arrow-left"></i>';
} else if (data == 1) {
return '<i class="fas fa-arrow-right"></i>';
} else {
return '<i class="fas fa-arrows-alt-h"></i>';
}
}
},
{
"className": "transactionsBlockNum",
"type": namesType,
"targets": 1
},
{
"targets": 2,
"render": function ( data, type, row ) {
return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss");
}
},
{
"targets": 5,
"render": function ( data, type, row ) {
return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), 'ether')).toFixed(2);
}
},
{
"targets": 6,
"defaultContent": "",
"render": function ( data, type, row ) {
if (row[1]) {
return '<i class="fas fa-check"></i>';
} else {
return '<i class="fas fa-question"></i>';
}
}
}
],
"drawCallback": function( settings ) {
$("#loadingTransactionsOverlay").css("display", "none");
}
});
}
}
// create new tables variable
EthoTableTransactions = new tableTransactions();

62
renderer/transactions.js
View File

@@ -104,64 +104,8 @@ class Transactions {
element.unshift(2);
}
});
// register the sort datetime format
$.fn.dataTable.moment('MMM Do YYYY HH:mm:ss');
// render the transactions
$('#tableTransactionsForAll').DataTable({
"paging": false,
"scrollY": "calc(100vh - 115px)",
"responsive": true,
"processing": true,
"order": [[ 1, "desc" ]],
"data": dataTransactions,
"oSearch": {"sSearch": EthoTransactions.getFilter() },
"columnDefs": [
{
"targets": 0,
"render": function ( data, type, row ) {
if (data == 0) {
return '<i class="fas fa-arrow-left"></i>';
} else if (data == 1) {
return '<i class="fas fa-arrow-right"></i>';
} else {
return '<i class="fas fa-arrows-alt-h"></i>';
}
}
},
{
"className": "transactionsBlockNum",
"targets": 1
},
{
"targets": 2,
"render": function ( data, type, row ) {
return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss");
}
},
{
"targets": 5,
"render": function ( data, type, row ) {
return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), 'ether')).toFixed(2);
}
},
{
"targets": 6,
"defaultContent": "",
"render": function ( data, type, row ) {
if (row[1]) {
return '<i class="fas fa-check"></i>';
} else if (data == 1) {
return '<i class="fas fa-question"></i>';
}
}
}
],
"drawCallback": function( settings ) {
$("#loadingTransactionsOverlay").css("display", "none");
}
});
EthoTableTransactions.initialize('#tableTransactionsForAll', dataTransactions);
}, 200);
}
@@ -206,6 +150,10 @@ $(document).on("onSyncInterval", function() {
// store transaction and notify about new transactions
ipcRenderer.send('storeTransaction', Transaction);
$(document).trigger("onNewAccountTransaction");
if (EthoMainGUI.getAppState() == "transactions") {
//$('#tableTransactionsForAll').DataTable().ajax.reload();
}
}
});
}