(WIP) First steps to #32

This commit is contained in:
FallenGravity
2019-10-22 17:32:38 +02:00
parent 03330f3776
commit a3a3a4092b
5 changed files with 77 additions and 73 deletions

View File

@@ -5099,7 +5099,7 @@ small {
} }
.btn:focus, .btn-large:focus, .btn-small:focus, .btn-floating:focus { .btn:focus, .btn-large:focus, .btn-small:focus, .btn-floating:focus {
background-color: #1d7d74 background-color: #c3300f
} }
.btn, .btn-large, .btn-small { .btn, .btn-large, .btn-small {

View File

@@ -2,8 +2,7 @@
fill: #aaa; fill: #aaa;
} }
.select-dropdown .select-dropdown {
{
color: #aaa; color: #aaa;
} }
@@ -23,7 +22,11 @@
color: #aaa; color: #aaa;
} }
#tableTransactionsForAll .fa-arrow-right { #tableTransactionsForAll .fa-sign-in-alt {
color: green;
}
#tableTransactionsForAll .fa-sign-out-alt {
color: red; color: red;
} }

View File

@@ -4651,7 +4651,7 @@ small {
} }
.btn:focus, .btn-large:focus, .btn-small:focus, .btn-floating:focus { .btn:focus, .btn-large:focus, .btn-small:focus, .btn-floating:focus {
background-color: #1d7d74 background-color: #c3300f
} }
.btn, .btn-large, .btn-small { .btn, .btn-large, .btn-small {

View File

@@ -1,5 +1,4 @@
<div id="transactionsWrapper"> <div id="transactionsWrapper">
<!----<button type="button" class="btn btn-etho" id="btnRefreshTransactions">Refresh</button>-->
<table id="tableTransactionsForAll" class="display tableTransactions" style="width:100%"> <table id="tableTransactionsForAll" class="display tableTransactions" style="width:100%">
<thead> <thead>
<tr> <tr>

View File

@@ -1,4 +1,6 @@
const {ipcRenderer} = require("electron"); const {
ipcRenderer
} = require("electron");
class tableTransactions { class tableTransactions {
constructor() { constructor() {
@@ -9,12 +11,10 @@ class tableTransactions {
// register the sort datetime format // register the sort datetime format
$.fn.dataTable.moment("MMM Do YYYY HH:mm:ss"); $.fn.dataTable.moment("MMM Do YYYY HH:mm:ss");
var namesType = $.fn.dataTable.absoluteOrderNumber([ var namesType = $.fn.dataTable.absoluteOrderNumber([{
{
value: null, value: null,
position: "top" position: "top"
} }]);
]);
// render the transactions // render the transactions
$(id).DataTable({ $(id).DataTable({
dom: "Bfrtip", dom: "Bfrtip",
@@ -29,24 +29,27 @@ class tableTransactions {
oSearch: { oSearch: {
sSearch: EthoTransactions.getFilter() sSearch: EthoTransactions.getFilter()
}, },
buttons: [ buttons: [{
{
text: '<i class="fas fa-sync-alt"></i>', text: '<i class="fas fa-sync-alt"></i>',
action: function (e, dt, node, config) { action: function(e, dt, node, config) {
EthoTransactions.renderTransactions(); EthoTransactions.renderTransactions();
} }
} }],
], columnDefs: [{
columnDefs: [
{
targets: 0, targets: 0,
render: function (data, type, row) { render: function(data, type, row) {
if (data == 0) { if (data == 0) {
return '<i class="fas fa-arrow-left"></i>'; var AccLogic1 = document.getElementById("txValue");
AccLogic1.style.color = "green";
return '<i class="fas fa-sign-out-alt"></i>';
} else if (data == 1) { } else if (data == 1) {
return '<i class="fas fa-arrow-right"></i>'; var AccLogic1 = document.getElementById("txValue");
AccLogic1.style.color = "red";
return '<i class="fas fa-sign-in-alt"></i>';
} else { } else {
return '<i class="fas fa-arrow-right"></i>'; var AccLogic1 = document.getElementById("txValue");
AccLogic1.style.color = "red";
return '<i class="fas fa-sign-in-alt"></i>';
} }
} }
}, { }, {
@@ -55,7 +58,7 @@ class tableTransactions {
targets: 1 targets: 1
}, { }, {
targets: 2, targets: 2,
render: function (data, type, row) { render: function(data, type, row) {
return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss"); return moment(data, "YYYY-MM-DD HH:mm:ss").format("MMM Do YYYY HH:mm:ss");
} }
}, { }, {
@@ -63,27 +66,26 @@ class tableTransactions {
visible: false visible: false
}, { }, {
targets: 6, targets: 6,
render: function (data, type, row) { render: function(data, type, row) {
return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), "ether")).toFixed(2); return parseFloat(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(data)).toString(), "ether")).toFixed(2);
} }
}, { }, {
targets: 7, targets: 7,
defaultContent: "", defaultContent: "",
render: function (data, type, row) { render: function(data, type, row) {
if (row[1]) { if (row[1]) {
return '<i class="fas fa-check"></i>'; return '<i class="fas fa-check"></i>';
} else { } else {
return '<i class="fas fa-question"></i>'; return '<i class="fas fa-times" style="color:red"></i>';
} }
} }
} }],
], drawCallback: function(settings) {
drawCallback: function (settings) {
$("#loadingTransactionsOverlay").css("display", "none"); $("#loadingTransactionsOverlay").css("display", "none");
} }
}); });
$(id + " tbody").off("click").on("click", "td", function () { $(id + " tbody").off("click").on("click", "td", function() {
if ($(id).DataTable().cell(this).index().column == 1) { if ($(id).DataTable().cell(this).index().column == 1) {
var rowIdx = $(id).DataTable().cell(this).index().row; var rowIdx = $(id).DataTable().cell(this).index().row;
var rowData = $(id).DataTable().rows(rowIdx).data()[0]; var rowData = $(id).DataTable().rows(rowIdx).data()[0];
@@ -99,12 +101,12 @@ class tableTransactions {
$("#txToAddress").attr("href", vsprintf("https://explorer.ether1.org/addr/%s", [rowData[5]])); $("#txToAddress").attr("href", vsprintf("https://explorer.ether1.org/addr/%s", [rowData[5]]));
$("#txValue").html(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(rowData[6])).toString(), "ether")); $("#txValue").html(web3Local.utils.fromWei(EthoUtils.toFixed(parseFloat(rowData[6])).toString(), "ether"));
$("#dlgTransactionInfo a").off("click").on("click", function (even) { $("#dlgTransactionInfo a").off("click").on("click", function(even) {
event.preventDefault(); event.preventDefault();
ipcRenderer.send("openURL", $(this).attr("href")); ipcRenderer.send("openURL", $(this).attr("href"));
}); });
$("#btnTxInfoClose").off("click").on("click", function () { $("#btnTxInfoClose").off("click").on("click", function() {
$("#dlgTransactionInfo").iziModal("close"); $("#dlgTransactionInfo").iziModal("close");
}); });