From ba1b8bb82cf60439868ce4aa23c66611fd74d93d Mon Sep 17 00:00:00 2001
From: Taegus <taegus.cromis@gmail.com>
Date: Sun, 23 Dec 2018 12:04:49 +0100
Subject: [PATCH] * linux and windows archive name reflect platform + simple
 access to transactions filter

---
 assets/templates/wallets.html |  1 +
 package.json                  |  2 ++
 renderer/maingui.js           |  1 +
 renderer/transactions.js      | 18 ++++++++++++++++--
 renderer/wallets.js           |  6 ++++++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/assets/templates/wallets.html b/assets/templates/wallets.html
index 176e53e..a6dbdbb 100644
--- a/assets/templates/wallets.html
+++ b/assets/templates/wallets.html
@@ -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}}
diff --git a/package.json b/package.json
index a7f843b..9b73c28 100644
--- a/package.json
+++ b/package.json
@@ -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/*"
       ]
diff --git a/renderer/maingui.js b/renderer/maingui.js
index ac53e66..d33ee19 100644
--- a/renderer/maingui.js
+++ b/renderer/maingui.js
@@ -64,6 +64,7 @@ class MainGUI {
 }
 
 $("#mainNavBtnTransactions").click(function() {
+    EthoTransactions.clearFilter();
     EthoMainGUI.changeAppState("transactions");
     EthoTransactions.renderTransactions();
 });                
diff --git a/renderer/transactions.js b/renderer/transactions.js
index e00bc41..342a2d8 100644
--- a/renderer/transactions.js
+++ b/renderer/transactions.js
@@ -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"); 
                         }
                     },
                     {
diff --git a/renderer/wallets.js b/renderer/wallets.js
index 89091e8..68773d7 100644
--- a/renderer/wallets.js
+++ b/renderer/wallets.js
@@ -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');