diff --git a/Site5/Images/Icons/iconshock-warning-16px.png b/Site5/Images/Icons/iconshock-warning-16px.png new file mode 100644 index 00000000..4565af53 Binary files /dev/null and b/Site5/Images/Icons/iconshock-warning-16px.png differ diff --git a/Site5/Images/Icons/iconshock-warning-16x12px.png b/Site5/Images/Icons/iconshock-warning-16x12px.png new file mode 100644 index 00000000..12d1755c Binary files /dev/null and b/Site5/Images/Icons/iconshock-warning-16x12px.png differ diff --git a/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs index a1138823..600563b1 100644 --- a/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-AccountPlanData.aspx.cs @@ -78,6 +78,28 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers continue; } + string ownerString = " "; + if (account.AccountType == FinancialAccountType.Income || account.AccountType == FinancialAccountType.Cost) + { + if (account.OwnerPersonId != 0) + { + // TODO: add zoom, write capability + + ownerString = + "" + + JsonSanitize(Server.HtmlEncode(account.Owner.Canonical)) + ""; + } + else + { + // TODO: add write capability + + ownerString = + "" + + JsonSanitize(Server.HtmlEncode(Resources.Global.Global_NoOwner)) + ""; + } + } + string grandChildren = GetAccountsRecurse(accountType, account.Identity); if (!string.IsNullOrEmpty(grandChildren)) { @@ -88,7 +110,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers childStrings.Add('{' + String.Format("\"id\":\"{0}\",\"accountName\":\"{1}\",\"owner\":\"{2}\",\"balance\":\"{3}\",\"budget\":\"{4}\"", account.Identity, Server.HtmlEncode(JsonSanitize(account.Name)), - account.OwnerPersonId != 0? "" + JsonSanitize(Server.HtmlEncode(account.Owner.Canonical)) + "" : JsonSanitize(Resources.Global.Global_NoOwner), + ownerString, _hashedAccounts[account.Identity].Count > 1 ? JsonDualString(account.Identity, _treeBalanceLookup[account.Identity], _singleBalanceLookup[account.Identity]) : (_singleBalanceLookup [account.Identity] / 100.0).ToString("N0"), account.AccountType == FinancialAccountType.Income || account.AccountType == FinancialAccountType.Cost? _hashedAccounts[account.Identity].Count > 1 ? (JsonDualString(account.Identity, _treeBudgetLookup[account.Identity], _singleBudgetLookup[account.Identity])) :