Converted JSON data for P&L, Balance

This commit is contained in:
Rick Falkvinge
2021-07-05 10:05:40 +02:00
parent 5b5131bd0b
commit a2e4efd3b4
3 changed files with 19 additions and 17 deletions
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Globalization;
using Swarmops.Common.Enums;
using Swarmops.Localization;
using Swarmops.Logic.Financial;
namespace Swarmops.Frontend.Pages.v5.Ledgers
@@ -45,10 +46,10 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
{
Dictionary<string, string> localizeMap = new Dictionary<string, string>();
localizeMap["%ASSET_ACCOUNTGROUP%"] = Resources.Global.Financial_Asset;
localizeMap["%DEBT_ACCOUNTGROUP%"] = Resources.Global.Financial_Debt;
localizeMap["%INCOME_ACCOUNTGROUP%"] = Resources.Global.Financial_Income;
localizeMap["%COST_ACCOUNTGROUP%"] = Resources.Global.Financial_Cost;
localizeMap["%ASSET_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Asset");
localizeMap["%DEBT_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Debt");
localizeMap["%INCOME_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Income");
localizeMap["%COST_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Cost");
foreach (AnnualReportLine line in lines)
{
@@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Web.UI.WebControls;
using Swarmops.Common.Enums;
using Swarmops.Localization;
using Swarmops.Logic.Financial;
namespace Swarmops.Frontend.Pages.v5.Ledgers
@@ -56,7 +57,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
private string WriteFooter()
{
string line1 = string.Format("\"name\":\"{0}\"", Resources.Global.Global_Total);
string line1 = string.Format("\"name\":\"{0}\"", LocalizedStrings.Get(LocDomain.Global, "Global_Total"));
line1 += string.Format(CultureInfo.CurrentCulture, ",\"assets\":\"{0:N0}\"",
_totals.AssetsCents / 100.0);
@@ -69,7 +70,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
}
else if (_totals.AssetsCents > -_totals.LiabilitiesCents) // Predicted profit
{
string line2 = string.Format("\"name\":\"{0}\"", string.Format(Resources.Pages.Ledgers.BalanceSheet_ProfitToDate, _year));
string line2 = string.Format("\"name\":\"{0}\"", string.Format(LocalizedStrings.Get(LocDomain.PagesLedgers, "BalanceSheet_ProfitToDate"), _year));
line2 += string.Format(CultureInfo.CurrentCulture, ",\"liabilities\":\"{0:N0}\"",
(_totals.AssetsCents + _totals.LiabilitiesCents) / 100.0);
@@ -78,7 +79,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
}
else
{
string line2 = string.Format("\"name\":\"{0}\"", string.Format(Resources.Pages.Ledgers.BalanceSheet_LossToDate, _year));
string line2 = string.Format("\"name\":\"{0}\"", string.Format(LocalizedStrings.Get(LocDomain.PagesLedgers, "BalanceSheet_LossToDate"), _year));
line2 += string.Format(CultureInfo.CurrentCulture, ",\"assets\":\"{0:N0}\"",
(_totals.LiabilitiesCents + _totals.AssetsCents) / -100.0);
@@ -92,10 +93,10 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
{
Dictionary<string, string> localizeMap = new Dictionary<string, string>();
localizeMap["%ASSET_ACCOUNTGROUP%"] = Resources.Global.Financial_Asset;
localizeMap["%DEBT_ACCOUNTGROUP%"] = Resources.Global.Financial_Debt;
localizeMap["%INCOME_ACCOUNTGROUP%"] = Resources.Global.Financial_Income;
localizeMap["%COST_ACCOUNTGROUP%"] = Resources.Global.Financial_Cost;
localizeMap["%ASSET_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Asset");
localizeMap["%DEBT_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Debt");
localizeMap["%INCOME_ACCOUNTGROUP%"] = LocalizedStrings.Get (LocDomain.Global, "Financial_Income");
localizeMap["%COST_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Cost");
foreach (AnnualReportLine line in lines)
{
@@ -1,9 +1,9 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using Resources.Pages;
using Swarmops.Common.Enums;
using Swarmops.Frontend;
using Swarmops.Localization;
using Swarmops.Logic.Financial;
public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base
@@ -44,10 +44,10 @@ public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base
{
Dictionary<string, string> localizeMap = new Dictionary<string, string>();
localizeMap["%ASSET_ACCOUNTGROUP%"] = Resources.Global.Financial_Asset;
localizeMap["%DEBT_ACCOUNTGROUP%"] = Resources.Global.Financial_Debt;
localizeMap["%INCOME_ACCOUNTGROUP%"] = Resources.Global.Financial_Income;
localizeMap["%COST_ACCOUNTGROUP%"] = Resources.Global.Financial_Cost;
localizeMap["%ASSET_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Asset");
localizeMap["%DEBT_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Debt");
localizeMap["%INCOME_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Income");
localizeMap["%COST_ACCOUNTGROUP%"] = LocalizedStrings.Get(LocDomain.Global, "Financial_Cost");
foreach (AnnualReportLine line in lines)
{
@@ -62,7 +62,7 @@ public partial class Pages_v5_Ledgers_Json_ProfitLossData : DataV5Base
private string WriteFooter (AnnualReportNode totals)
{
string result = string.Format ("\"name\":\"{0}\"", Ledgers.ProfitLossStatement_Results);
string result = string.Format ("\"name\":\"{0}\"", LocalizedStrings.Get(LocDomain.PagesLedgers, "ProfitLossStatement_Results"));
result += string.Format (CultureInfo.CurrentCulture, ",\"lastYear\":\"{0:N0}\"",
(double) totals.PreviousYear/-100.0);