diff --git a/Site/Pages/v5/Ledgers/InspectLedgers.aspx b/Site/Pages/v5/Ledgers/InspectLedgers.aspx index fe597c5a..6e822ab3 100644 --- a/Site/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site/Pages/v5/Ledgers/InspectLedgers.aspx @@ -85,12 +85,27 @@ } }); + $('#treeGeneralLedger').treegrid( + { + onLoadSuccess: function() { + alertify.success("OnLoadSuccess"); + + $("td field:txDescription").attr("colSpan", 4); + /* + $("td > span.tx-description").each(function() { + var parent = $(this).parent(); + + })*/ + } + } + ); + $('#<%= DropYears.ClientID %>').change(function() { - reloadData(); + reloadInspectData(); }); $('#<%= DropMonths.ClientID %>').change(function() { - reloadData(); + reloadInspectData(); }); $('#ButtonAddTransactionRow').click(function() { @@ -146,7 +161,7 @@ function onAccountSelected(newAccountId) { accountId = newAccountId; - reloadData(); + reloadInspectData(); } function addTransactionRow() { @@ -189,7 +204,7 @@ } } - function reloadData() { + function reloadInspectData() { var selectedYear = $('#<%= DropYears.ClientID %>').val(); var selectedMonth = $('#<%= DropMonths.ClientID %>').val(); @@ -352,7 +367,7 @@ - + diff --git a/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs b/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs index bb09cc99..dae3e8b8 100644 --- a/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs +++ b/Site/Pages/v5/Ledgers/Json-GeneralLedgerData.aspx.cs @@ -126,7 +126,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers string description = transaction.Description; result.Append("{" + String.Format( - "\"id\":\"{0:N0}\",\"datetime\":\"{1:MMM-dd HH:mm}\",\"description\":\"{2}\"," + + "\"id\":\"{0:N0}\",\"datetime\":\"{1:MMM-dd HH:mm}\",\"txDescription\":\"{2}\"," + "\"state\":\"open\",\"children\":[", row.Transaction.OrganizationSequenceId, row.TransactionDateTime,