* linux and windows archive name reflect platform

+ simple access to transactions filter
This commit is contained in:
Taegus
2018-12-23 12:04:49 +01:00
parent 107eafa741
commit ba1b8bb82c
5 changed files with 26 additions and 2 deletions

View File

@@ -21,6 +21,7 @@
<th scope="row" class="colEdit"><button type="button" class="btn btn-etho btnChangWalletName" data-wallet="{{address}}" data-name="{{name}}">Edit</button></th>
<td>{{name}}</td>
<td><span class="textAddress">{{address}}</span></td>
<td><button type="button" class="btn btn-etho btnShowAddressTransactions" data-wallet="{{address}}"><i class="fas fa-exchange-alt"></i></button></td>
<td>{{balance}}</td>
</tr>
{{/addressData}}

View File

@@ -21,12 +21,14 @@
"win": {
"icon": "build/icon.png",
"target": "7z",
"artifactName": "Windows-${productName}-${version}.${ext}",
"extraResources": [
"bin/win/*"
]
},
"linux": {
"target": "tar.gz",
"artifactName": "Linux-${productName}-${version}.${ext}",
"extraResources": [
"bin/linux/*"
]

View File

@@ -64,6 +64,7 @@ class MainGUI {
}
$("#mainNavBtnTransactions").click(function() {
EthoTransactions.clearFilter();
EthoMainGUI.changeAppState("transactions");
EthoTransactions.renderTransactions();
});

View File

@@ -2,6 +2,7 @@ const {ipcRenderer} = require('electron');
class Transactions {
constructor() {
this.filter = "";
this.isSyncing = false;
}
@@ -13,6 +14,18 @@ class Transactions {
return this.isSyncing;
}
setFilter(text) {
this.filter = text;
}
getFilter() {
return this.filter;
}
clearFilter() {
this.filter = "";
}
syncTransactionsForSingleAddress(addressList, counters, lastBlock, counter) {
if (counter < addressList.length - 1) {
SyncProgress.setText(vsprintf("Syncing address transactions %d/%d, please wait...", [counter, addressList.length]));
@@ -94,7 +107,7 @@ class Transactions {
});
// register the sort datetime format
$.fn.dataTable.moment('MMM Do YYYY');
$.fn.dataTable.moment('MMM Do YYYY HH:mm:ss');
// render the transactions
$('#tableTransactionsForAll').DataTable({
@@ -104,6 +117,7 @@ class Transactions {
"processing": true,
"order": [[ 1, "desc" ]],
"data": dataTransactions,
"oSearch": {"sSearch": EthoTransactions.getFilter() },
"columnDefs": [
{
"targets": 0,
@@ -124,7 +138,7 @@ class Transactions {
{
"targets": 2,
"render": function ( data, type, row ) {
return moment(data).format("MMM Do YYYY");
return moment(data).format("MMM Do YYYY HH:mm:ss");
}
},
{

View File

@@ -116,6 +116,12 @@ $(document).on("render_wallets", function() {
});
});
$(".btnShowAddressTransactions").off('click').on('click', function() {
EthoTransactions.setFilter($(this).attr('data-wallet'));
EthoMainGUI.changeAppState("transactions");
EthoTransactions.renderTransactions();
});
$(".btnChangWalletName").off('click').on('click', function() {
var walletAddress = $(this).attr('data-wallet');
var walletName = $(this).attr('data-name');