From 3b44768e946cd5b9b3753bf9b7e39b7ddca793db Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Tue, 10 Jan 2012 04:46:49 +0000 Subject: [PATCH] Committing bookkeeping integrity checks --- .../OrganizationFinancialAccounts.cs | 13 ++- .../PageIcons/iconshock-tester-16px.png | Bin 0 -> 913 bytes .../PageIcons/iconshock-tester-40px.png | Bin 0 -> 2943 bytes Site5/Tests/LeanModal-Master.master | 47 ---------- Site5/Tests/LeanModal-Master.master.cs | 13 --- Site5/Tests/LeanModal-NoMaster.aspx | 47 ---------- Site5/Tests/LeanModal-NoMaster.aspx.cs | 13 --- Site5/Tests/LeanModal.aspx | 34 ------- Site5/Tests/LeanModal.aspx.cs | 13 --- Site5/Tests/TestBookkeepingIntegrity.aspx | 33 +++++++ Site5/Tests/TestBookkeepingIntegrity.aspx.cs | 84 ++++++++++++++++++ 11 files changed, 129 insertions(+), 168 deletions(-) create mode 100644 Site5/Images/PageIcons/iconshock-tester-16px.png create mode 100644 Site5/Images/PageIcons/iconshock-tester-40px.png delete mode 100644 Site5/Tests/LeanModal-Master.master delete mode 100644 Site5/Tests/LeanModal-Master.master.cs delete mode 100644 Site5/Tests/LeanModal-NoMaster.aspx delete mode 100644 Site5/Tests/LeanModal-NoMaster.aspx.cs delete mode 100644 Site5/Tests/LeanModal.aspx delete mode 100644 Site5/Tests/LeanModal.aspx.cs create mode 100644 Site5/Tests/TestBookkeepingIntegrity.aspx create mode 100644 Site5/Tests/TestBookkeepingIntegrity.aspx.cs diff --git a/Logic/Financial/OrganizationFinancialAccounts.cs b/Logic/Financial/OrganizationFinancialAccounts.cs index 361860cd..a01a853e 100644 --- a/Logic/Financial/OrganizationFinancialAccounts.cs +++ b/Logic/Financial/OrganizationFinancialAccounts.cs @@ -29,6 +29,7 @@ namespace Activizr.Logic.Financial organizationAccounts[OrganizationFinancialAccountType.AssetsOutboundInvoices] = 28; organizationAccounts[OrganizationFinancialAccountType.DebtsCapital] = 96; organizationAccounts[OrganizationFinancialAccountType.AssetsPaypal] = 2; + organizationAccounts[OrganizationFinancialAccountType.CostsYearResult] = 97; } public OrganizationFinancialAccounts (int organizationId) @@ -120,6 +121,15 @@ namespace Activizr.Logic.Financial organizationAccounts[OrganizationFinancialAccountType.CostsLocalDonationTransfers]); } } + public FinancialAccount CostsYearResult + { + get + { + return + FinancialAccount.FromIdentity(organizationAccounts[OrganizationFinancialAccountType.CostsYearResult]); + } + } + public FinancialAccounts CostsConferences { get @@ -153,6 +163,7 @@ namespace Activizr.Logic.Financial CostsInfrastructure, CostsLocalDonationTransfers, CostsAllocatedFunds, - CostsConferences // multi-account type + CostsConferences, + CostsYearResult // multi-account type } } diff --git a/Site5/Images/PageIcons/iconshock-tester-16px.png b/Site5/Images/PageIcons/iconshock-tester-16px.png new file mode 100644 index 0000000000000000000000000000000000000000..7c730f3fba435ac3cb2c6b0f471a8d2b9fb3ebb9 GIT binary patch literal 913 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 - - - - - - - - - - - - - - Activizr - Pirate Edition - - - - - - - - - - - -
- - - - - - - - - - - - - - diff --git a/Site5/Tests/LeanModal-Master.master.cs b/Site5/Tests/LeanModal-Master.master.cs deleted file mode 100644 index 6cf4749d..00000000 --- a/Site5/Tests/LeanModal-Master.master.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -public partial class Tests_LeanModal_Master : System.Web.UI.MasterPage -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} diff --git a/Site5/Tests/LeanModal-NoMaster.aspx b/Site5/Tests/LeanModal-NoMaster.aspx deleted file mode 100644 index 9beaa566..00000000 --- a/Site5/Tests/LeanModal-NoMaster.aspx +++ /dev/null @@ -1,47 +0,0 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeFile="LeanModal-NoMaster.aspx.cs" Inherits="Tests_LeanModal_NoMaster" %> - - - - - - - - - - - - - - -
-
- Test! -
-
- - - - - - diff --git a/Site5/Tests/LeanModal-NoMaster.aspx.cs b/Site5/Tests/LeanModal-NoMaster.aspx.cs deleted file mode 100644 index aa98400a..00000000 --- a/Site5/Tests/LeanModal-NoMaster.aspx.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -public partial class Tests_LeanModal_NoMaster : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} \ No newline at end of file diff --git a/Site5/Tests/LeanModal.aspx b/Site5/Tests/LeanModal.aspx deleted file mode 100644 index e162c034..00000000 --- a/Site5/Tests/LeanModal.aspx +++ /dev/null @@ -1,34 +0,0 @@ -<%@ Page Title="" Language="C#" MasterPageFile="LeanModal-Master.master" AutoEventWireup="true" CodeFile="LeanModal.aspx.cs" Inherits="Tests_LeanModal" %> - - - - - - - - - - Test! - - - - - - - - diff --git a/Site5/Tests/LeanModal.aspx.cs b/Site5/Tests/LeanModal.aspx.cs deleted file mode 100644 index 670973e4..00000000 --- a/Site5/Tests/LeanModal.aspx.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; - -public partial class Tests_LeanModal : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} \ No newline at end of file diff --git a/Site5/Tests/TestBookkeepingIntegrity.aspx b/Site5/Tests/TestBookkeepingIntegrity.aspx new file mode 100644 index 00000000..99a815c2 --- /dev/null +++ b/Site5/Tests/TestBookkeepingIntegrity.aspx @@ -0,0 +1,33 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="TestBookkeepingIntegrity.aspx.cs" Inherits="Tests_TestBookkeepingIntegrity" %> + + + + +
+ +
+
+  
 
+
+
+
+
+
+
+ +
+ +
+ +
+ +

INFO

+ +
+
+ This page is for diagnostic tests of the integrity of the Activizr system. It is not intended for everyday use and is not accessible from the menu. +
+
+ +
+ diff --git a/Site5/Tests/TestBookkeepingIntegrity.aspx.cs b/Site5/Tests/TestBookkeepingIntegrity.aspx.cs new file mode 100644 index 00000000..53585873 --- /dev/null +++ b/Site5/Tests/TestBookkeepingIntegrity.aspx.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; +using Activizr.Basic.Enums; +using Activizr.Logic.Financial; + +public partial class Tests_TestBookkeepingIntegrity : PageV5Base +{ + protected void Page_Load(object sender, EventArgs e) + { + this.PageTitle = "Test Bookkeeping Integrity"; + this.PageIcon = "iconshock-tester"; + + if (!Page.IsPostBack) + { + this.DropYear.Items.Add(new ListItem("--Select--", "0")); + this.DropYear.Items.Add(new ListItem("2008", "2008")); + this.DropYear.Items.Add(new ListItem("2009", "2009")); + this.DropYear.Items.Add(new ListItem("2010", "2010")); + this.DropYear.Items.Add(new ListItem("2011", "2011")); + } + + this.LabelThisOrganization.Text = _currentOrganization.Name; + } + + protected void DropYear_SelectedIndexChanged(object sender, EventArgs e) + { + int year = Int32.Parse(this.DropYear.SelectedValue); + + if (year < 2000) return; + + FinancialAccounts balanceAccounts = FinancialAccounts.ForOrganization(_currentOrganization, + FinancialAccountType.Balance); + + FinancialAccounts resultAccounts = FinancialAccounts.ForOrganization(_currentOrganization, + FinancialAccountType.Result); + + FinancialAccount ownCapital = _currentOrganization.FinancialAccounts.DebtsCapital; + FinancialAccount resultAsNoted = _currentOrganization.FinancialAccounts.CostsYearResult; + + FinancialAccounts balancesWithoutCapital = + FinancialAccounts.ForOrganization(_currentOrganization, FinancialAccountType.Balance); + balancesWithoutCapital.Remove(ownCapital); + + FinancialAccounts resultAccountsWithoutNotedResult = FinancialAccounts.ForOrganization(_currentOrganization, + FinancialAccountType.Result); + resultAccountsWithoutNotedResult.Remove(_currentOrganization.FinancialAccounts.CostsYearResult); + + Currency currency = _currentOrganization.DefaultCountry.Currency; + + this.LabelResultsAll.Text = String.Format("{0} {1:N2}", currency.Code, + resultAccounts.GetDeltaCents(new DateTime(year, 1, 1), + new DateTime(year + 1, 1, 1)) / 100.0); + + this.LabelResultsNoted.Text = String.Format("{0} {1:N2}", currency.Code, + resultAsNoted.GetDeltaCents(new DateTime(year, 1, 1), + new DateTime(year + 1, 1, 1))/100.0); + + this.LabelEoyBalance.Text = String.Format("{0} {1:N2}", currency.Code, + balanceAccounts.GetDeltaCents(new DateTime(1900, 1, 1), + new DateTime(year + 1, 1, 1)) / 100.0); + + Int64 endOfLastYearCapital = ownCapital.GetDeltaCents(new DateTime(1900, 1, 1), + new DateTime(year, 1, 1)); + + Int64 endOfSelectedYearCapital = ownCapital.GetDeltaCents(new DateTime(1900, 1, 1), + new DateTime(year + 1, 1, 1)); + + this.LabelEolyOwnCapital.Text = String.Format("{0} {1:N2}", currency.Code, endOfLastYearCapital / 100.0); + + this.LabelEocyOwnCapital.Text = String.Format("{0} {1:N2}", currency.Code, + endOfSelectedYearCapital / 100.0); + + this.LabelOwnCapitalDiff.Text = String.Format("{0} {1:N2}", currency.Code, + (endOfSelectedYearCapital - endOfLastYearCapital) / 100.0); + + this.LabelOwnCapitalDelta.Text = String.Format("{0} {1:N2}", currency.Code, + ownCapital.GetDeltaCents(new DateTime(year, 1, 1), + new DateTime(year + 1, 1, 1)) / 100.0); + + } +} \ No newline at end of file