From fd7fa680ad46f82e7cfe7179364044b11af4331f Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sun, 15 Apr 2018 16:20:52 +0200 Subject: [PATCH] Work on account automation profiles --- Common/Enums/ObjectOptionalDataType.cs | 12 +- Logic/Financial/FinancialAccount.cs | 21 +++ .../Pages.Ledgers.designer.cs | 2 +- Site/App_GlobalResources/Pages.Ledgers.resx | 2 +- Site/Pages/v5/Ledgers/AccountPlan.aspx | 111 ++++++++------ Site/Pages/v5/Ledgers/AccountPlan.aspx.cs | 138 +++++++++++++++--- .../v5/Ledgers/AccountPlan.aspx.designer.cs | 66 ++++++++- Site/web.config | 1 + 8 files changed, 274 insertions(+), 79 deletions(-) diff --git a/Common/Enums/ObjectOptionalDataType.cs b/Common/Enums/ObjectOptionalDataType.cs index e045dafb..3a790c85 100644 --- a/Common/Enums/ObjectOptionalDataType.cs +++ b/Common/Enums/ObjectOptionalDataType.cs @@ -432,6 +432,16 @@ namespace Swarmops.Common.Enums OrgSignupLastPage, OrgApplicationCompleteMail, OrgParticipationAcceptedMail, - OrgApplicationQualifyingScore + OrgApplicationQualifyingScore, + + /// + /// Profile identifier for asset tracking automation + /// + AutomationProfileId, + + /// + /// If custom automation, the XML for it, in string format + /// + AutomationProfileCustomXml } } \ No newline at end of file diff --git a/Logic/Financial/FinancialAccount.cs b/Logic/Financial/FinancialAccount.cs index 5719ebea..d957217f 100644 --- a/Logic/Financial/FinancialAccount.cs +++ b/Logic/Financial/FinancialAccount.cs @@ -646,5 +646,26 @@ namespace Swarmops.Logic.Financial return result; } + + + public int AutomationProfileId + { + get { return ObjectOptionalData.ForObject(this).GetOptionalDataInt(ObjectOptionalDataType.AutomationProfileId); } + set { ObjectOptionalData.ForObject(this).SetOptionalDataInt(ObjectOptionalDataType.AutomationProfileId, value); } + } + + public string AutomationProfileCustomXml + { + get + { + return + ObjectOptionalData.ForObject(this) + .GetOptionalDataString(ObjectOptionalDataType.AutomationProfileCustomXml); + } + set + { + ObjectOptionalData.ForObject(this).SetOptionalDataString(ObjectOptionalDataType.AutomationProfileCustomXml, value); + } + } } } \ No newline at end of file diff --git a/Site/App_GlobalResources/Pages.Ledgers.designer.cs b/Site/App_GlobalResources/Pages.Ledgers.designer.cs index df3e4284..87373d60 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.designer.cs +++ b/Site/App_GlobalResources/Pages.Ledgers.designer.cs @@ -160,7 +160,7 @@ namespace Resources.Pages { } /// - /// Looks up a localized string similar to File upload profile. + /// Looks up a localized string similar to Automation Profile. /// internal static string AccountPlan_Edit_FileUploadProfile { get { diff --git a/Site/App_GlobalResources/Pages.Ledgers.resx b/Site/App_GlobalResources/Pages.Ledgers.resx index eee777a7..acc278b7 100644 --- a/Site/App_GlobalResources/Pages.Ledgers.resx +++ b/Site/App_GlobalResources/Pages.Ledgers.resx @@ -431,7 +431,7 @@ Expensable - File upload profile + Automation Profile Editing Account diff --git a/Site/Pages/v5/Ledgers/AccountPlan.aspx b/Site/Pages/v5/Ledgers/AccountPlan.aspx index 27cef737..b1795637 100644 --- a/Site/Pages/v5/Ledgers/AccountPlan.aspx +++ b/Site/Pages/v5/Ledgers/AccountPlan.aspx @@ -1,9 +1,5 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.v5.Ledgers.AccountPlan" Codebehind="AccountPlan.aspx.cs" CodeFile="AccountPlan.aspx.cs" %> <%@ Import Namespace="Swarmops.Logic.Financial" %> -<%@ Register TagPrefix="Swarmops5" TagName="ComboBudgets" Src="~/Controls/v5/Financial/ComboBudgets.ascx" %> -<%@ Register TagPrefix="Swarmops5" TagName="ComboPeople" Src="~/Controls/v5/Swarm/ComboPeople.ascx" %> -<%@ Register TagPrefix="Swarmops5" TagName="TextCurrency" Src="~/Controls/v5/Financial/CurrencyTextBox.ascx" %> -<%@ Register TagPrefix="Swarmops5" TagName="ModalDialog" Src="~/Controls/v5/Base/ModalDialog.ascx" %> @@ -397,55 +393,47 @@ }, 100); } - $.ajax({ - type: "POST", - url: "/Pages/v5/Ledgers/AccountPlan.aspx/GetAccountData", - data: "{'accountId': '" + escape(accountId) + "'}", - contentType: "application/json; charset=utf-8", - dataType: "json", - success: function(msg) { + SwarmopsJS.ajaxCall( + "/Pages/v5/Ledgers/AccountPlan.aspx/GetAccountData", + { accountId: accountId }, + function(data) { suppressSwitchChangeAction = true; - $("#CheckAccountActive").prop("checked", msg.d.Active).change(); - $("#CheckAccountExpensable").prop("checked", msg.d.Expensable).change(); - $("#CheckAccountAdministrative").prop("checked", msg.d.Administrative).change(); + $("#CheckAccountActive").prop("checked", data.Active).change(); + $("#CheckAccountExpensable").prop("checked", data.Expensable).change(); + $("#CheckAccountAdministrative").prop("checked", data.Administrative).change(); suppressSwitchChangeAction = false; - modalAccountName = msg.d.AccountName; - $('#TextAccountName').val(msg.d.AccountName).css('background-color', '#FFF'); + modalAccountName = data.AccountName; + $('#TextAccountName').val(data.AccountName).css('background-color', '#FFF'); - modalAccountBudget = msg.d.Budget; - $('#TextAccountBudget').val(msg.d.Budget).css('background-color', '#FFF'); + modalAccountBudget = data.Budget; + $('#TextAccountBudget').val(data.Budget).css('background-color', '#FFF'); - modalAccountInitialBalance = msg.d.InitialBalance; - $('#<%=CurrencyInitialBalance.ClientID%>_TextInput').val(msg.d.InitialBalance).css('background-color', '#FFF'); + modalAccountInitialBalance = data.InitialBalance; + $('#<%=CurrencyInitialBalance.ClientID%>_TextInput').val(data.InitialBalance).css('background-color', '#FFF'); - $('#SpanTextCurrency').text(msg.d.CurrencyCode); - $('#SpanEditBalance').text(msg.d.Balance); - parentAccountName = msg.d.ParentAccountName; - setAccountTreeId(msg.d.ParentAccountId); + $('#SpanTextCurrency').text(data.CurrencyCode); + $('#SpanEditBalance').text(data.Balance); + parentAccountName = data.ParentAccountName; + setAccountTreeId(data.ParentAccountId); $('span#<%= DropOwner.ClientID %>_SpanPeople span input.textbox-text').css('background-color', '#FFF'); - $('span#<%= DropOwner.ClientID %>_SpanPeople span input.textbox-text').css('background-image', "url('" + msg.d.AccountOwnerAvatarUrl + "')"); - $('span#<%= DropOwner.ClientID %>_SpanPeople span input.textbox-text').attr('placeholder', msg.d.AccountOwnerName); + $('span#<%= DropOwner.ClientID %>_SpanPeople span input.textbox-text').css('background-image', "url('" + data.AccountOwnerAvatarUrl + "')"); + $('span#<%= DropOwner.ClientID %>_SpanPeople span input.textbox-text').attr('placeholder', data.AccountOwnerName); $('span#<%= DropOwner.ClientID %>_SpanPeople span input.textbox-text').val(''); - } - }); + }); } function updateInactiveCount() { - $.ajax({ - type: "POST", - url: "/Pages/v5/Ledgers/AccountPlan.aspx/GetInactiveAccountCount", - data: "{}", - contentType: "application/json; charset=utf-8", - dataType: "json", - success: function(msg) { - $("#SpanInactiveCount").text(msg.d); - } - }); + SwarmopsJS.ajaxCall ( + "/Pages/v5/Ledgers/AccountPlan.aspx/GetInactiveAccountCount", + {}, + function(msg) { + $("#SpanInactiveCount").text(msg); + }); } function modalShow() { @@ -625,11 +613,24 @@

 
-
-
-  
 
 
+
+
+
+
+ +
+ +
+ +
+
+ +
+ + +
+
+
-
-

- TODO
- TODO
+
+
Initial Balance (XXX)
+
+
+

+ Enable account automation
+
+
+
+ Custom Profile XML
+
+
+ Automatic Retrieval
+
+ Autoretrieval Username
+ Autoretrieval Password
+
+
+
+
diff --git a/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs b/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs index 912a775c..fa46f6a6 100644 --- a/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs +++ b/Site/Pages/v5/Ledgers/AccountPlan.aspx.cs @@ -77,8 +77,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers this.LiteralLabelBudgetBalance.Text = Resources.Pages.Ledgers.AccountPlan_Edit_BudgetBalance; this.LiteralLabelExpensableLong.Text = Resources.Pages.Ledgers.AccountPlan_Edit_ExpensableLong; this.LiteralLabelExpensableShort.Text = Resources.Pages.Ledgers.AccountPlan_Edit_ExpensableShort; - this.LiteralLabelFileUploadProfile.Text = Resources.Pages.Ledgers.AccountPlan_Edit_FileUploadProfile; - this.LiteralLabelHeaderAutomation.Text = Resources.Pages.Ledgers.AccountPlan_Edit_HeaderAutomation; + this.LabelFileUploadProfile.Text = Resources.Pages.Ledgers.AccountPlan_Edit_FileUploadProfile; + this.LabelHeaderAutomation.Text = Resources.Pages.Ledgers.AccountPlan_Edit_HeaderAutomation; this.LiteralLabelHeaderConfiguration.Text = Resources.Pages.Ledgers.AccountPlan_Edit_HeaderConfiguration; this.LiteralLabelHeaderDailyOperations.Text = Resources.Pages.Ledgers.AccountPlan_Edit_HeaderDailyOperations; @@ -104,7 +104,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers [WebMethod] - public static JsonAccountData GetAccountData (int accountId) + public static AjaxCallAccountData GetAccountData (int accountId) { AuthenticationData authData = GetAuthenticationDataAndCulture(); @@ -118,7 +118,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers FinancialAccounts accountTree = account.ThisAndBelow(); int year = DateTime.Today.Year; - JsonAccountData result = new JsonAccountData(); + AjaxCallAccountData result = new AjaxCallAccountData(); if (account.ParentIdentity == 0) { @@ -276,9 +276,16 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers return false; } - // TODO SECURITY: Verify that authdata.AuthenticatedPerson can see personId, or this can be exploited to enumerate all people + Person newOwner = Person.FromIdentity(newOwnerId); - account.Owner = Person.FromIdentity (newOwnerId); + // Verify that authdata.AuthenticatedPerson can see personId, or this can be exploited to enumerate all people + + if (!authData.Authority.CanSeePerson(newOwner)) + { + throw new ArgumentException("No such person identity"); + } + + account.Owner = newOwner; return true; } @@ -287,6 +294,8 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { try { + const string initialBalanceTransactionTitle = "Initial Balances"; + AuthenticationData authData = GetAuthenticationDataAndCulture(); FinancialAccount account = FinancialAccount.FromIdentity (accountId); @@ -314,7 +323,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers foreach (FinancialAccountRow row in testRows) { - if (row.Transaction.Description == "Initial Balances") + if (row.Transaction.Description == initialBalanceTransactionTitle) { initialBalancesTransaction = row.Transaction; break; @@ -326,7 +335,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers // create transaction initialBalancesTransaction = FinancialTransaction.Create (authData.CurrentOrganization.Identity, - new DateTime (authData.CurrentOrganization.FirstFiscalYear - 1, 12, 31), "Initial Balances"); + new DateTime (authData.CurrentOrganization.FirstFiscalYear - 1, 12, 31), initialBalanceTransactionTitle); } Dictionary recalcBase = initialBalancesTransaction.GetRecalculationBase(); @@ -358,6 +367,85 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } } + [WebMethod] + public static ChangeAccountDataResult SetAccountInitialBalanceForex(int accountId, string newInitialBalanceString) + { + try + { + const string initialBalanceTransactionTitle = "Initial Balances"; + + AuthenticationData authData = GetAuthenticationDataAndCulture(); + FinancialAccount account = FinancialAccount.FromIdentity(accountId); + + if (!PrepareAccountChange(account, authData, false) || authData.CurrentOrganization.Parameters.FiscalBooksClosedUntilYear >= authData.CurrentOrganization.FirstFiscalYear) + { + return new ChangeAccountDataResult + { + Result = ChangeAccountDataOperationsResult.NoPermission + }; + } + + Int64 desiredInitialBalanceCents = Formatting.ParseDoubleStringAsCents(newInitialBalanceString); + + Int64 currentInitialBalanceCents = account.GetDeltaCents(new DateTime(1900, 1, 1), + new DateTime(authData.CurrentOrganization.FirstFiscalYear, 1, 1)); + + Int64 deltaCents = desiredInitialBalanceCents - currentInitialBalanceCents; + + // Find or create "Initial Balances" transaction + + FinancialAccountRows testRows = FinancialAccountRows.ForOrganization(authData.CurrentOrganization, + new DateTime(1900, 1, 1), new DateTime(authData.CurrentOrganization.FirstFiscalYear, 1, 1)); + + FinancialTransaction initialBalancesTransaction = null; + + foreach (FinancialAccountRow row in testRows) + { + if (row.Transaction.Description == initialBalanceTransactionTitle) + { + initialBalancesTransaction = row.Transaction; + break; + } + } + + if (initialBalancesTransaction == null) + { + // create transaction + + initialBalancesTransaction = FinancialTransaction.Create(authData.CurrentOrganization.Identity, + new DateTime(authData.CurrentOrganization.FirstFiscalYear - 1, 12, 31), initialBalanceTransactionTitle); + } + + Dictionary recalcBase = initialBalancesTransaction.GetRecalculationBase(); + int equityAccountId = authData.CurrentOrganization.FinancialAccounts.DebtsEquity.Identity; + + if (!recalcBase.ContainsKey(accountId)) + { + recalcBase[accountId] = 0; + } + if (!recalcBase.ContainsKey(equityAccountId)) + { + recalcBase[equityAccountId] = 0; + } + + recalcBase[accountId] += deltaCents; + recalcBase[equityAccountId] -= deltaCents; + initialBalancesTransaction.RecalculateTransaction(recalcBase, authData.CurrentUser); + return new ChangeAccountDataResult + { + Result = ChangeAccountDataOperationsResult.Changed, + NewData = (desiredInitialBalanceCents / 100.0).ToString("N2", CultureInfo.CurrentCulture) + }; + } + catch (Exception weirdException) + { + SupportFunctions.LogException("AccountPlan-SetInitBalance", weirdException); + + throw; + } + } + + [WebMethod] public static ChangeAccountDataResult SetAccountBudget (int accountId, string budget) { @@ -464,6 +552,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } + [Serializable] public class ChangeAccountDataResult { public ChangeAccountDataOperationsResult Result { set; get; } @@ -471,22 +560,25 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers } - public struct JsonAccountData + [Serializable] + public class AjaxCallAccountData: AjaxCallResult { - public string AccountName; - public string AccountOwnerAvatarUrl; - public string AccountOwnerName; - public bool Active; - public bool Administrative; - public string InitialBalance; - public string Balance; - public string Budget; - public string ClosedYear; - public string CurrencyCode; - public bool Expensable; - public bool Open; - public int ParentAccountId; - public string ParentAccountName; + public string AccountName { get; set; } + public string AccountOwnerAvatarUrl { get; set; } + public string AccountOwnerName { get; set; } + public bool Active { get; set; } + public bool Administrative { get; set; } + public int AutomationProfileId { get; set; } + public string AutomationProfileCustomXml { get; set; } + public string InitialBalance { get; set; } + public string Balance { get; set; } + public string Budget { get; set; } + public string ClosedYear { get; set; } + public string CurrencyCode { get; set; } + public bool Expensable { get; set; } + public bool Open { get; set; } + public int ParentAccountId { get; set; } + public string ParentAccountName { get; set; } } } } \ No newline at end of file diff --git a/Site/Pages/v5/Ledgers/AccountPlan.aspx.designer.cs b/Site/Pages/v5/Ledgers/AccountPlan.aspx.designer.cs index a487311e..1324800c 100644 --- a/Site/Pages/v5/Ledgers/AccountPlan.aspx.designer.cs +++ b/Site/Pages/v5/Ledgers/AccountPlan.aspx.designer.cs @@ -166,13 +166,67 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { protected global::Swarmops.Frontend.Controls.Financial.CurrencyTextBox CurrencyInitialBalance; /// - /// DropAccountUploadFormats control. + /// CurrencyInitialBalanceForex control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.DropDownList DropAccountUploadFormats; + protected global::Swarmops.Frontend.Controls.Financial.CurrencyTextBox CurrencyInitialBalanceForex; + + /// + /// ToggleAssetAutomation control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxToggleSlider ToggleAssetAutomation; + + /// + /// DropAccountAutomationProfile control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxDropDown DropAccountAutomationProfile; + + /// + /// TextCustomAutomationProfile control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxTextBox TextCustomAutomationProfile; + + /// + /// ToggleAutoRetrieval control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxToggleSlider ToggleAutoRetrieval; + + /// + /// TextRetrievalLogin control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxTextBox TextRetrievalLogin; + + /// + /// TextRetrievalPassword control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.AjaxTextBox TextRetrievalPassword; /// /// LiteralLabelAccountName control. @@ -265,22 +319,22 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { protected global::System.Web.UI.WebControls.Literal LiteralLabelInitialAmount; /// - /// LiteralLabelHeaderAutomation control. + /// LabelHeaderAutomation control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Literal LiteralLabelHeaderAutomation; + protected global::System.Web.UI.WebControls.Label LabelHeaderAutomation; /// - /// LiteralLabelFileUploadProfile control. + /// LabelFileUploadProfile control. /// /// /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::System.Web.UI.WebControls.Literal LiteralLabelFileUploadProfile; + protected global::System.Web.UI.WebControls.Label LabelFileUploadProfile; /// /// LabelSidebarOptions control. diff --git a/Site/web.config b/Site/web.config index d462cf60..de8cf814 100644 --- a/Site/web.config +++ b/Site/web.config @@ -45,6 +45,7 @@ +