Refactor: Organization.HasCurrentLedgers

This commit is contained in:
Falkvinge
2017-10-30 09:39:28 +01:00
parent d2a0864dd9
commit edfd8af9cf
7 changed files with 55 additions and 16 deletions
+12
View File
@@ -40,6 +40,18 @@ namespace Swarmops.Logic.Financial
return FromBasic(SwarmDb.GetDatabaseForWriting().GetVatReport(vatReportId));
}
public static VatReport FromGuid(string guid)
{
int vatReportId = SwarmDb.GetDatabaseForReading().GetVatReportIdFromGuid(guid);
if (vatReportId == 0)
{
throw new ArgumentException("No such report");
}
return FromIdentity(vatReportId);
}
private static VatReport CreateDbRecord (Organization organization, int year, int startMonth, int monthCount)
{
System.Guid guid = System.Guid.NewGuid();
+5
View File
@@ -683,6 +683,11 @@ namespace Swarmops.Logic.Structure
}
}
public bool HasOpenLedgers
{
get { return !String.IsNullOrEmpty(OpenLedgersDomain); }
}
#endregion
#region UptakeGeographies
+1 -1
View File
@@ -20,7 +20,7 @@ namespace Swarmops.Frontend.Pages.Ledgers
// Security: If the org has open ledgers, then anyone may read. Otherwise, Financials.Read.
if (!String.IsNullOrEmpty (CurrentOrganization.OpenLedgersDomain))
if (CurrentOrganization.HasOpenLedgers)
{
PageAccessRequired = new Access (AccessAspect.Null, AccessType.Read);
}
@@ -23,7 +23,7 @@ namespace Swarmops.Frontend.Pages.Ledgers
// Security: If the org has open ledgers, then anyone may read. Otherwise, Financials.Read.
if (!String.IsNullOrEmpty (CurrentOrganization.OpenLedgersDomain))
if (CurrentOrganization.HasOpenLedgers)
{
PageAccessRequired = new Access (AccessAspect.Null, AccessType.Read);
}
@@ -39,6 +39,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
VatReport report = VatReport.FromIdentity(_reportId);
// TODO: AUTH CHECK
Response.ContentType = "application/json";
Int64 turnoverCentsTotal = 0;
@@ -23,7 +23,7 @@ namespace Swarmops.Frontend.Pages.Ledgers
// Security: If the org has open ledgers, then anyone may read. Otherwise, Financials.Read.
if (!String.IsNullOrEmpty (CurrentOrganization.OpenLedgersDomain))
if (CurrentOrganization.HasOpenLedgers)
{
PageAccessRequired = new Access (AccessAspect.Null, AccessType.Read);
}
+33 -13
View File
@@ -23,9 +23,18 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
PageTitle = Resources.Pages.Ledgers.ViewVatReports_PageTitle;
InfoBoxLiteral = Resources.Pages.Ledgers.ViewVatReports_Info;
// Security: If the org has open ledgers, then anyone may read. Otherwise, Financials.Read.
// Security: If the org has open ledgers, or key was given, then anyone may read. Otherwise, Financials.Read.
if (!String.IsNullOrEmpty(CurrentOrganization.OpenLedgersDomain))
int specificReportId = 0;
VatReport specificReport = null;
string reportKey = Request.QueryString["ReportKey"];
if (!string.IsNullOrEmpty(reportKey))
{
specificReport = VatReport.FromGuid(reportKey);
specificReportId = specificReport.Identity;
}
if (CurrentOrganization.HasOpenLedgers || specificReportId > 0)
{
PageAccessRequired = new Access(AccessAspect.Null, AccessType.Read);
}
@@ -37,23 +46,34 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
if (!Page.IsPostBack)
{
Localize();
// Populate VAT report dropdown
// TODO: Disable if viewing specific report and not open ledgers
VatReports reports = VatReports.ForOrganization(CurrentOrganization, true);
reports.Sort(VatReports.VatReportSorterByDate);
foreach (VatReport report in reports)
if (specificReportId > 0 && !CurrentOrganization.HasOpenLedgers)
{
this.DropReports.Items.Add(new ListItem(report.Description,
report.Identity.ToString(CultureInfo.InvariantCulture)));
// Show one single report
this.LabelContentHeader.Text = specificReport.Description;
this.DropReports.Visible = false;
this.InitialReportId = specificReport.Identity;
}
else
{
// Populate dropdown
this.InitialReportId = reports.Last().Identity;
this.DropReports.SelectedValue = this.InitialReportId.ToString(CultureInfo.InvariantCulture);
VatReports reports = VatReports.ForOrganization(CurrentOrganization, true);
reports.Sort(VatReports.VatReportSorterByDate);
Localize();
foreach (VatReport report in reports)
{
this.DropReports.Items.Add(new ListItem(report.Description,
report.Identity.ToString(CultureInfo.InvariantCulture)));
}
this.InitialReportId = reports.Last().Identity;
this.DropReports.SelectedValue = this.InitialReportId.ToString(CultureInfo.InvariantCulture);
}
}
RegisterControl(EasyUIControl.DataGrid | EasyUIControl.Tree);