diff --git a/Site5/App_GlobalResources/Pages.Ledgers.resx b/Site5/App_GlobalResources/Pages.Ledgers.resx index 4214c098..6f1ace20 100644 --- a/Site5/App_GlobalResources/Pages.Ledgers.resx +++ b/Site5/App_GlobalResources/Pages.Ledgers.resx @@ -735,6 +735,10 @@ Budget vs Actual + + Expected YTD + As in "expected actuals", as in when compared to budget. From the context, just "Expected" will also work. + This page displays the budgeted breakdown compared to a breakdown of the actual outcome so far. diff --git a/Site5/Pages/v5/Ledgers/BudgetActual.aspx b/Site5/Pages/v5/Ledgers/BudgetActual.aspx index 679f0bdb..650b6c66 100644 --- a/Site5/Pages/v5/Ledgers/BudgetActual.aspx +++ b/Site5/Pages/v5/Ledgers/BudgetActual.aspx @@ -32,15 +32,17 @@ { $('span.previousYearsHeader').hide(); $('span.currentYearHeader').show(); + $('#tableBudgetActual').treegrid('showColumn', 'yearExpected'); } else { $('#previousLastActual').text(actualLoc + ' ' + (selectedYear - 1)); $('#previousBudget').text(budgetLoc + ' ' + selectedYear); - $('#previousYtd').text(actualLoc + ' ' + selectedYear); + $('#previousActual').text(actualLoc + ' ' + selectedYear); $('span.currentYearHeader').hide(); $('span.previousYearsHeader').show(); + $('#tableBudgetActual').treegrid('hideColumn', 'yearExpected'); } } }); @@ -88,9 +90,10 @@ — - — - — - — + — + — + — + — @@ -98,16 +101,7 @@ -

- -
-
- -
-
+
diff --git a/Site5/Pages/v5/Ledgers/BudgetActual.aspx.cs b/Site5/Pages/v5/Ledgers/BudgetActual.aspx.cs index bb655ffa..2ac23538 100644 --- a/Site5/Pages/v5/Ledgers/BudgetActual.aspx.cs +++ b/Site5/Pages/v5/Ledgers/BudgetActual.aspx.cs @@ -56,6 +56,7 @@ public partial class Pages_v5_Ledgers_BudgetActual : PageV5Base this.LiteralHeaderLastYearActual.Text = Global.Financial_Actuals + @" " + (year - 1).ToString(CultureInfo.InvariantCulture); this.LiteralHeaderBudget.Text = Global.Financial_Budget + @" " + year.ToString(CultureInfo.InvariantCulture); ; this.LiteralHeaderActual.Text = Global.Financial_Actuals + @" " + Global.Financial_YTD; + this.LiteralHeaderExpected.Text = Ledgers.BudgetActual_ExpectedYtd; this.LiteralActual.Text = Global.Financial_Actuals; this.LiteralBudget.Text = Global.Financial_Budget; this.LiteralHeaderAccountName.Text = Ledgers.ProfitLossStatement_AccountName; diff --git a/Site5/Pages/v5/Ledgers/Json-BudgetActualData.aspx.cs b/Site5/Pages/v5/Ledgers/Json-BudgetActualData.aspx.cs index 9a92763f..a598ce0c 100644 --- a/Site5/Pages/v5/Ledgers/Json-BudgetActualData.aspx.cs +++ b/Site5/Pages/v5/Ledgers/Json-BudgetActualData.aspx.cs @@ -9,6 +9,7 @@ public partial class Pages_v5_Ledgers_Json_BudgetActualData : DataV5Base { private AuthenticationData _authenticationData; private int _year = 2012; + private int _yearProgressionMilli = 0; protected void Page_Load (object sender, EventArgs e) { @@ -16,9 +17,11 @@ public partial class Pages_v5_Ledgers_Json_BudgetActualData : DataV5Base this._authenticationData = GetAuthenticationDataAndCulture(); - // Get current year + // Get current year and part of year - this._year = DateTime.Today.Year; + DateTime utcNow = DateTime.UtcNow; + this._year = utcNow.Year; + this._yearProgressionMilli = utcNow.DayOfYear*1000/365; // Ignore leap years string yearParameter = Request.QueryString["Year"]; @@ -69,6 +72,8 @@ public partial class Pages_v5_Ledgers_Json_BudgetActualData : DataV5Base result += string.Format(CultureInfo.CurrentCulture, ",\"yearActual\":\"{0:N0}\"", (double)totals.ThisYear / -100.0); + result += string.Format(CultureInfo.CurrentCulture, ",\"yearExpected\":\"{0:N0}\"", (double)totals.ThisYearBudget / 100.0 * _yearProgressionMilli / 1000); + return "{" + result + "}"; } @@ -94,6 +99,10 @@ public partial class Pages_v5_Ledgers_Json_BudgetActualData : DataV5Base element += ",\"yearActual\":" + JsonDualString (line.AccountId, line.AccountTreeValues.ThisYear, line.AccountValues.ThisYear); + element += ",\"yearExpected\":" + + JsonDualString(line.AccountId, -line.AccountTreeValues.ThisYearBudget * _yearProgressionMilli / 1000, -line.AccountValues.ThisYearBudget * _yearProgressionMilli / 1000); + + element += ",\"state\":\"closed\",\"children\":" + RecurseReport (line.Children); } @@ -107,6 +116,10 @@ public partial class Pages_v5_Ledgers_Json_BudgetActualData : DataV5Base element += string.Format (CultureInfo.CurrentCulture, ",\"yearActual\":\"{0:N0}\"", (double) line.AccountValues.ThisYear/-100.0); + + element += string.Format(CultureInfo.CurrentCulture, ",\"yearExpected\":\"{0:N0}\"", + (double)line.AccountValues.ThisYearBudget / 100.0 * _yearProgressionMilli / 1000); + } elements.Add ("{" + element + "}");