- You are currently logged into
Sandbox. Would you like to switch to another organization?
+
diff --git a/Site5/Master-v5.master.cs b/Site5/Master-v5.master.cs
index 765f90f8..45dee627 100644
--- a/Site5/Master-v5.master.cs
+++ b/Site5/Master-v5.master.cs
@@ -118,12 +118,13 @@ namespace Activizr
this.DropSwitchOrganizations.Items.Clear();
this.DropSwitchOrganizations.Items.Add(new ListItem(Resources.Global.Global_DropInits_SelectOrganization, "0"));
+ this.DropSwitchOrganizations.Items.Add(new ListItem("Sandbox", Organization.SandboxIdentity.ToString()));
- Organizations organizations = Organizations.GetAll();
+ Memberships memberships = _currentUser.GetMemberships();
- foreach (Organization organization in organizations)
+ foreach (Activizr.Logic.Pirates.Membership membership in memberships)
{
- this.DropSwitchOrganizations.Items.Add(new ListItem(organization.Name, organization.Identity.ToString(CultureInfo.InvariantCulture)));
+ this.DropSwitchOrganizations.Items.Add(new ListItem(membership.Organization.Name, membership.OrganizationId.ToString(CultureInfo.InvariantCulture)));
}
}
@@ -163,6 +164,7 @@ namespace Activizr
this.LinkLogout.Text = Resources.Global.CurrentUserInfo_Logout;
this.LabelPreferences.Text = Resources.Global.CurrentUserInfo_Preferences;
+ this.LiteralCurrentlyLoggedIntoSwitch.Text = string.Format(Resources.Global.Master_SwitchOrganizationDialog, _currentOrganization.Name);
if (cultureStringLower != "en-gb" && cultureStringLower != "sv-se" && cultureString.Trim().Length > 0)
{
@@ -398,8 +400,23 @@ namespace Activizr
if (desiredOrganizationId != 0)
{
- FormsAuthentication.RedirectFromLoginPage(string.Format(CultureInfo.InvariantCulture, "{0},{1}", currentUserId, desiredOrganizationId), true);
- Response.Redirect("/");
+ bool foundMembership = false;
+ Memberships currentUserMemberships = _currentUser.GetMemberships();
+ foreach (Activizr.Logic.Pirates.Membership membership in currentUserMemberships)
+ {
+ if (membership.OrganizationId == desiredOrganizationId)
+ {
+ foundMembership = true;
+ }
+ }
+
+ if (foundMembership)
+ {
+ FormsAuthentication.RedirectFromLoginPage(
+ string.Format(CultureInfo.InvariantCulture, "{0},{1}", currentUserId, desiredOrganizationId),
+ true);
+ Response.Redirect("/");
+ }
}
}
diff --git a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx
index ad818586..4d0d1e18 100644
--- a/Site5/Pages/v5/Ledgers/BalanceSheet.aspx
+++ b/Site5/Pages/v5/Ledgers/BalanceSheet.aspx
@@ -30,7 +30,7 @@
var selectedYear = $('#<%=DropYears.ClientID %>').val();
- $('div#linkDownloadReport').attr("onclick", "document.location='Csv-ProfitLossData.aspx?Year=" + selectedYear + "';");
+ $('div#linkDownloadReport').attr("onclick", "document.location='Csv-BalanceData.aspx?Year=" + selectedYear + "';");
$('#spanDownloadText').text('<%=Resources.Pages.Ledgers.BalanceSheet_DownloadFileName %>' + selectedYear + "-<%=DateTime.Today.ToString("yyyyMMdd") %>.csv");
$('#headerStartYear').text('<%=Resources.Pages.Ledgers.BalanceSheet_StartYear %>'.replace('XXXX',selectedYear));
@@ -107,7 +107,7 @@
-
BalanceSheetxxxx-yyyymmdd.csv
+
Balancexxxx-yyyymmdd.csv
diff --git a/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs
index 5ceca6c5..c7b6cf3f 100644
--- a/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/CloseLedgers.aspx.cs
@@ -108,7 +108,7 @@ public partial class Pages_v5_Ledgers_CloseLedgers : PageV5Base
{
FinancialTransaction resultTransaction = FinancialTransaction.Create(this.CurrentOrganization.Identity, new DateTime(closingYear, 12, 31, 23, 59, 00), "Årets resultat " + closingYear.ToString()); // TODO: Localize string
resultTransaction.AddRow(this.CurrentOrganization.FinancialAccounts.CostsYearlyResult, -resultsDeltaCents, null);
- resultTransaction.AddRow(this.CurrentOrganization.FinancialAccounts.DebtsCapital, -balanceDeltaCents, null);
+ resultTransaction.AddRow(this.CurrentOrganization.FinancialAccounts.DebtsEquity, -balanceDeltaCents, null);
// Ledgers are now at zero-sum for the year's result accounts and from the start up until end-of-closing-year for the balance accounts.
diff --git a/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx b/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx
new file mode 100644
index 00000000..810eb821
--- /dev/null
+++ b/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx
@@ -0,0 +1 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Csv-BalanceData.aspx.cs" Inherits="Pages_v5_Ledgers_Csv_BalanceData" %>
diff --git a/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs b/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs
new file mode 100644
index 00000000..bd991558
--- /dev/null
+++ b/Site5/Pages/v5/Ledgers/Csv-BalanceData.aspx.cs
@@ -0,0 +1,96 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using Activizr.Basic.Enums;
+using Activizr.Logic.Financial;
+using Activizr.Logic.Pirates;
+using Activizr.Logic.Security;
+using Activizr.Logic.Structure;
+
+public partial class Pages_v5_Ledgers_Csv_BalanceData : System.Web.UI.Page
+{
+ protected void Page_Load(object sender, EventArgs e)
+ {
+ // Current authentication
+
+ string identity = HttpContext.Current.User.Identity.Name;
+ string[] identityTokens = identity.Split(',');
+
+ string userIdentityString = identityTokens[0];
+ string organizationIdentityString = identityTokens[1];
+
+ int currentUserId = Convert.ToInt32(userIdentityString);
+ int currentOrganizationId = Convert.ToInt32(organizationIdentityString);
+
+ Person currentUser = Person.FromIdentity(currentUserId);
+ Authority authority = currentUser.GetAuthority();
+ Organization currentOrganization = Organization.FromIdentity(currentOrganizationId);
+
+ // Get culture
+
+ string cultureString = "en-US";
+ HttpCookie cookie = Request.Cookies["PreferredCulture"];
+
+ if (cookie != null)
+ {
+ cultureString = cookie.Value;
+ }
+
+ _renderCulture = new CultureInfo(cultureString);
+
+ // Get current year
+
+ _year = DateTime.Today.Year;
+
+ string yearParameter = Request.QueryString["Year"];
+
+ if (!string.IsNullOrEmpty(yearParameter))
+ {
+ _year = Int32.Parse(yearParameter); // will throw if non-numeric - don't matter for app
+ }
+
+ YearlyReport report = YearlyReport.Create(currentOrganization, _year, FinancialAccountType.Result);
+
+ Response.ClearContent();
+ Response.ClearHeaders();
+ Response.ContentType = "text/plain";
+ Response.AppendHeader("Content-Disposition", "attachment;filename=" + Resources.Pages.Ledgers.BalanceSheet_DownloadFileName + _year.ToString(CultureInfo.InvariantCulture) + "-" + DateTime.Today.ToString("yyyyMMdd") + ".csv");
+
+ Response.Output.WriteLine("\"{0}\",\"{1}\",\"{2}\",\"{3}\",\"{4}\",\"{5}\",\"{6}\"", Resources.Pages.Ledgers.ProfitLossStatement_AccountName, Resources.Pages.Ledgers.BalanceSheet_StartYear.Replace("XXXX", _year.ToString(CultureInfo.InvariantCulture)),
+ Resources.Pages.Ledgers.BalanceSheet_Q1, Resources.Pages.Ledgers.BalanceSheet_Q2, Resources.Pages.Ledgers.BalanceSheet_Q3, Resources.Pages.Ledgers.BalanceSheet_Q4,
+ (_year == DateTime.Today.Year? Resources.Pages.Ledgers.BalanceSheet_Current : Resources.Pages.Ledgers.BalanceSheet_EndYear.Replace("XXXX", _year.ToString(CultureInfo.InvariantCulture))));
+
+ RecurseCsvReport(report.ReportLines, string.Empty);
+
+ Response.End();
+ }
+
+ private int _year = 2012;
+ private CultureInfo _renderCulture;
+
+ private void RecurseCsvReport(List