From b96bf0a011cffd72bb10aaf765cd9d1f488a56ef Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 25 Oct 2014 15:03:36 +0200 Subject: [PATCH] Finished Inspect Ledgers for Red --- Site5/Pages/v5/Ledgers/InspectLedgers.aspx | 25 ++++++++++++++++++- Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs | 3 +++ .../v5/Ledgers/Json-InspectLedgerData.aspx.cs | 9 +++++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx index b0c2710c..29479485 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx @@ -35,6 +35,15 @@ // Footer cells could not be merged in datagrid :( } + + // Enable various actions on icon + + $('img.LocalIconFlag').click(function () { + onFlagTransaction("Add Tx Id here"); + }); + $('img.LocalIconInspect').click(function () { + onInspectTransaction("Add Tx Id here"); + }); } }); @@ -69,6 +78,15 @@ $('#gridOutstandingAccounts').datagrid('reload'); } + function onInspectTransaction(transactionId) { + alertify.log (''); + } + + function onFlagTransaction(transactionId) { + alertify.log(''); + + } + @@ -80,6 +98,11 @@ font-weight: 500; } + .LocalIconInspect, .LocalIconFlag { + cursor:pointer; + position: relative; + top: 4px; + } @@ -94,7 +117,7 @@ idField="id"> - + diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs index b6a6df7e..0e5399b4 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs @@ -66,6 +66,9 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers this.LabelGridHeaderDeltaPositive.Text = Resources.Global.Ledgers_Debit; this.LabelGridHeaderDescription.Text = Resources.Global.Global_Description; this.LabelGridHeaderId.Text = Resources.Pages.Ledgers.InspectLedgers_TransactionId; + + this.LabelFlagNotAvailable.Text = Resources.Pages.Ledgers.InspectLedgers_FlaggingNotAvailable; + this.LabelInspectNotAvailable.Text = Resources.Pages.Ledgers.InspectLedgers_InspectNotAvailable; } } } \ No newline at end of file diff --git a/Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx.cs index 7011ceb6..2d620af6 100644 --- a/Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-InspectLedgerData.aspx.cs @@ -156,15 +156,20 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers runningBalance += row.AmountCents; + string actionHtml = String.Format( + " ", + row.FinancialTransactionId.ToString(CultureInfo.InvariantCulture)); + result.Append("{" + String.Format( "\"id\":\"{0}\",\"datetime\":\"{1:MMM-dd HH:mm}\",\"description\":\"{2}\"," + - "\"deltaPos\":\"{3}\",\"deltaNeg\":\"{4}\",\"balance\":\"{5:N0}\"", + "\"deltaPos\":\"{3}\",\"deltaNeg\":\"{4}\",\"balance\":\"{5:N0}\",\"action\":\"{6}\"", row.FinancialTransactionId, row.TransactionDateTime, JsonSanitize(row.Description), debitString, creditString, - runningBalance / 100.0) + "},"); + runningBalance / 100.0, + JsonSanitize(actionHtml)) + "},"); } if (rows.Count == 0)