From fd7ab05a2d877e1605c8a507867035edf73f0963 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 2 Jan 2018 10:45:30 +0100 Subject: [PATCH] Colspan works, moving on --- Site/Pages/v5/Ledgers/InspectLedgers.aspx | 8 ++++---- Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Site/Pages/v5/Ledgers/InspectLedgers.aspx b/Site/Pages/v5/Ledgers/InspectLedgers.aspx index fa8de218..06235a5d 100644 --- a/Site/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site/Pages/v5/Ledgers/InspectLedgers.aspx @@ -88,10 +88,6 @@ $('#treeGeneralLedger').treegrid( { onLoadSuccess: function() { - alertify.success("OnLoadSuccess"); - - //$("td field:txDescription").attr("colSpan", 4); - $("td > div > span.tx-description").each(function() { var parent = $(this).parent(); var grandParent = parent.parent(); @@ -332,6 +328,10 @@ table.datagrid-ftable { font-weight: 500; } + .datagrid-body td{ + vertical-align: text-top; + } + .spanAnnoyingBlink { -webkit-animation: blink 0.5s linear infinite; animation: blink 0.5s linear infinite; diff --git a/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs b/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs index dae3e8b8..b762a7a5 100644 --- a/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs @@ -211,7 +211,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } result.Append ("{" + String.Format ( - "\"id\":\"{0:N0}:{6:N0}\",\"datetime\":\"{1}\",\"description\":\"{2}\"," + + "\"id\":\"{0:N0}:{6:N0}\",\"datetime\":\"{1}\",\"txDescription\":\"{2}\"," + "\"deltaPos\":\"{3}\",\"deltaNeg\":\"{4}\",\"balance\":\"{5:N2}\"", row.Transaction.OrganizationSequenceId, JsonSanitize (accountClass),