From bdc3fb61b4b5e07e9352ea3c4d74104b6905250f Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Wed, 4 Mar 2015 22:22:56 +0100 Subject: [PATCH] Fast-forwarding to build 858 to find mystery bug --- Site5/Pages/v5/Ledgers/InspectLedgers.aspx | 170 +++++++++++++----- Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs | 139 ++++++++++++-- 2 files changed, 244 insertions(+), 65 deletions(-) diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx index 3f50ae53..f10db9ab 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx @@ -1,5 +1,7 @@ <%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" CodeFile="InspectLedgers.aspx.cs" Inherits="Swarmops.Frontend.Pages.v5.Ledgers.InspectLedgers" %> +<%@ Import Namespace="System.Net.Mime" %> <%@ Register TagPrefix="Swarmops5" TagName="ComboBudgets" Src="~/Controls/v5/Financial/ComboBudgets.ascx" %> +<%@ Register TagPrefix="Swarmops5" TagName="CurrencyTextBox" Src="~/Controls/v5/Financial/CurrencyTextBox.ascx" %> @@ -68,10 +70,10 @@ }); $('#<%=DropYears.ClientID %>').change(function () { - reloadData(); - }); + reloadData(); + }); - $('#<%=DropMonths.ClientID %>').change(function () { + $('#<%=DropMonths.ClientID %>').change(function () { reloadData(); }); @@ -79,11 +81,15 @@ $('#divModalCover').fadeOut(); if (transactionDirty) { - $('#tableAccountPlan').treegrid('reload'); + $('#gridLedgers').datagrid('reload'); transactionDirty = false; } }); + $('#ButtonAddTransactionRow').click(function() { + addTransactionRow(); + }); + $('div.datagrid').css('opacity', 0.4); }); @@ -96,9 +102,49 @@ reloadData(); } - function reloadData() - { - var selectedYear = $('#<%=DropYears.ClientID %>').val(); + function addTransactionRow() { + var amountString = $('#<%=TextInsertAmount.ClientID%>_Input').val(); + var rowAccountId = 0; + var selectedAccountNode = $('#<%=this.BudgetAddRow.ClientID%>_DropBudgets').combotree('tree').tree('getSelected'); + + if (selectedAccountNode == null || selectedAccountNode.id < 1) { + alertify.error (unescape('')); + return; + } + + if (canWriteRows) { + + transactionDirty = true; + + var jsonData = {}; + jsonData.txId = transactionId; + jsonData.accountId = selectedAccountNode.id; + jsonData.amountString = amountString; + + $.ajax({ + type: "POST", + url: "/Pages/v5/Ledgers/InspectLedgers.aspx/AddTransactionRow", + data: $.toJSON(jsonData), + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function(msg) { + if (msg.d) { // true = success + $('#gridTransaction').datagrid('reload'); + prefillUnbalancedAmount(); + } else { + alertify.error("<%= Resources.Global.Error_AjaxCallException %>"); + } + }, + error: function(msg) { + alertify.error("<%= Resources.Global.Error_AjaxCallException %>"); + } + }); + } + } + + function reloadData() + { + var selectedYear = $('#<%=DropYears.ClientID %>').val(); var selectedMonth = $('#<%=DropMonths.ClientID %>').val(); $('#gridLedgers').datagrid({ url: 'Json-InspectLedgerData.aspx?Year=' + selectedYear + "&Month=" + selectedMonth + "&AccountId=" + accountId}); @@ -106,58 +152,92 @@ $('#imageLoadIndicator').show(); $('div.datagrid').css('opacity', 0.4); - $('#gridOutstandingAccounts').datagrid('reload'); + // $('#gridOutstandingAccounts').datagrid('reload'); } - function onInspectTransaction(transactionId) { - window.scrollTo(0, 0); - $('body').css('overflow-y', 'hidden'); - $('#divModalCover').fadeIn(); - - $('#gridTransaction').datagrid({ url: 'Json-InspectLedgerTxData.aspx?TxId=' + transactionId }); + function prefillUnbalancedAmount() { var jsonData = {}; jsonData.txId = transactionId; - $('span#spanModalTransactionId').text(transactionId); $.ajax({ type: "POST", - url: "/Pages/v5/Ledgers/InspectLedgers.aspx/GetTransactionTracking", + url: "/Pages/v5/Ledgers/InspectLedgers.aspx/GetUnbalancedAmount", data: $.toJSON(jsonData), contentType: "application/json; charset=utf-8", dataType: "json", - success: function (msg) { + success: function(msg) { if (msg.d.length > 1) { - $('#divTransactionTrackingDetails').html(msg.d); - $('#divTransactionTrackingDetails').show(); - $('#divEditTransaction').hide(); - - $("a.FancyBox_Gallery").fancybox({ - 'overlayShow': true, - 'transitionIn': 'fade', - 'transitionOut': 'fade', - 'type': 'image', - 'opacity': true - }); - - $("a.linkViewDox").click(function () { - $("a.FancyBox_Gallery[rel='" + $(this).attr("objectId") + "']").first().click(); - }); - - + $('#<%=this.TextInsertAmount.ClientID%>_Input').val(msg.d); } else { - $('#divTransactionTrackingDetails').hide(); - $('#divEditTransaction').show(); + alertify.error("<%= Resources.Global.Error_AjaxCallException %>"); } }, - error: function (msg) { + error: function(msg) { alertify.error("<%= Resources.Global.Error_AjaxCallException %>"); - } + } }); - } + } - function onTransactionTrackingLoaded(data) { - console.log(data); + function onInspectTransaction(transactionId) { + window.scrollTo(0, 0); + $('body').css('overflow-y', 'hidden'); + $('#divModalCover').fadeIn(); + $('span#spanModalTransactionId').text(transactionId); + + $('#gridTransaction').datagrid({ url: 'Json-InspectLedgerTxData.aspx?TxId=' + transactionId }); + + var jsonData = {}; + jsonData.txId = transactionId; + + if (canWriteRows) { + prefillUnbalancedAmount(); + } + + if (canSeeDetail || canWriteRows) { + $.ajax({ + type: "POST", + url: "/Pages/v5/Ledgers/InspectLedgers.aspx/GetTransactionTracking", + data: $.toJSON(jsonData), + contentType: "application/json; charset=utf-8", + dataType: "json", + success: function(msg) { + if (msg.d.length > 1) { + $('#divTransactionTrackingDetails').html(msg.d); + $('#divTransactionTrackingDetails').show(); + $('#divEditTransaction').hide(); + + $("a.FancyBox_Gallery").fancybox({ + 'overlayShow': true, + 'transitionIn': 'fade', + 'transitionOut': 'fade', + 'type': 'image', + 'opacity': true + }); + + $("a.linkViewDox").click(function() { + $("a.FancyBox_Gallery[rel='" + $(this).attr("objectId") + "']").first().click(); + }); + + + } else { + $('#divTransactionTracking').hide(); + + if (canWriteRows) { + $('#divEditTransaction').show(); + } else { + $('#divEditTransaction').hide(); + } + } + }, + error: function(msg) { + alertify.error("<%= Resources.Global.Error_AjaxCallException %>"); + } + }); + } else { + $('#divEditTransaction').hide(); + $('#divTransactionTracking').hide(); + } } function onFlagTransaction(transactionId) { @@ -251,12 +331,8 @@

-
- ModalFields -
- +

,

+

diff --git a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs index 349f5fdf..59e6401f 100644 --- a/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs +++ b/Site5/Pages/v5/Ledgers/InspectLedgers.aspx.cs @@ -95,6 +95,11 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers AccessType.Write))) { this.LiteralEditHeader.Text = Resources.Pages.Ledgers.InspectLedgers_EditingTransactionX; + this.LabelAddRowAccount.Text = Resources.Global.Financial_Account; + this.LabelAddRowAmount.Text = Resources.Global.Financial_Amount; + this.LiteralErrorAddRowSelectAccount.Text = + Resources.Pages.Ledgers.InspectLedgers_TxDetail_ErrorAddRowNoAccount; + this.LiteralAddRowButton.Text = Resources.Global.Global_Add; } else // read access, at a minimum of AccessAspect.Bookkeeping { @@ -117,6 +122,56 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers : "false"; } + [WebMethod] + public static bool AddTransactionRow(int txId, int accountId, string amountString) + { + AuthenticationData authData = GetAuthenticationDataAndCulture(); + + if ( + !authData.CurrentUser.HasAccess(new Access(authData.CurrentOrganization, + AccessAspect.Bookkeeping, AccessType.Write))) + { + return false; // fail + } + + FinancialTransaction transaction = FinancialTransaction.FromIdentity(txId); + FinancialAccount account = FinancialAccount.FromIdentity(accountId); + + Double amountFloat = Double.Parse(amountString); + Int64 amountCents = (Int64)(amountFloat * 100.0); + + if (account.OrganizationId != authData.CurrentOrganization.Identity) + { + throw new InvalidOperationException("Account/Organization mismatch"); + } + + if (amountCents == 0) + { + return false; + } + + transaction.AddRow(account, amountCents, authData.CurrentUser); + + return true; + } + + [WebMethod] + public static string GetUnbalancedAmount(int txId) + { + AuthenticationData authData = GetAuthenticationDataAndCulture(); + + if ( + !authData.CurrentUser.HasAccess(new Access(authData.CurrentOrganization, + AccessAspect.Bookkeeping, AccessType.Read))) + { + return string.Empty; // leave no clue to an attacker why the call failed + } + + FinancialTransaction transaction = FinancialTransaction.FromIdentity(txId); + + return (-transaction.Rows.AmountCentsTotal / 100.0).ToString("N2"); + } + [WebMethod] public static string GetTransactionTracking(int txId) { @@ -169,7 +224,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers foreach (ExpenseClaim claim in payout.DependentExpenseClaims) { - subValidations.Add("" + String.Format(Resources.Global.Financial_ExpenseClaimLongSpecification, claim.Identity) + ": " + claim.Organization.Currency.Code + " " + (claim.AmountCents / 100.0).ToString("N2") + ". " + HttpUtility.HtmlEncode(GetValidationDetails(claim.Validations)) + " " + GetDocumentDetails(claim.Documents, claim)); + subValidations.Add(GetObjectDetails(claim)); } } @@ -200,7 +255,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers foreach (CashAdvance advance in payout.DependentCashAdvancesPayout) { - subValidations.Add("" + String.Format(Resources.Global.Financial_CashAdvanceSpecification, advance.Identity) + ": " + advance.Organization.Currency.Code + " " + (advance.AmountCents / 100.0).ToString("N2") + ". " + HttpUtility.HtmlEncode(GetValidationDetails(advance.Validations))); + subValidations.Add(GetObjectDetails(advance)); } } @@ -214,8 +269,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers Resources.Global.Financial_InboundInvoiceSpecificationWithSender, invoice.Identity, invoice.Supplier) + ""); - subValidations.Add("" + String.Format(Resources.Global.Financial_InboundInvoiceSpecification, invoice.Identity) + ": " + invoice.Organization.Currency.Code + " " + (invoice.AmountCents / 100.0).ToString("N2") + ". " + GetValidationDetails(invoice.Validations) + " " + - GetDocumentDetails(invoice.Documents, invoice)); + subValidations.Add(GetObjectDetails(invoice)); } if (payout.DependentSalariesNet.Count > 0) @@ -229,19 +283,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers salary.Identity, salary.PayoutDate, HttpUtility.HtmlEncode(salary.PayrollItem.PersonCanonical)) + ""); - subValidations.Add("" + - String.Format(Resources.Global.Financial_SalaryIdentity, salary.Identity) + - ": " + - String.Format(Resources.Pages.Ledgers.InspectLedgers_TxDetail_SalaryDetail, - salary.PayrollItem.Organization.Currency.Code, - salary.BaseSalaryCents / 100.0, // base salary - (salary.GrossSalaryCents - salary.BaseSalaryCents) / 100.0, // before-tax adjustments - salary.GrossSalaryCents / 100.0, // before-tax adjusted salary - salary.SubtractiveTaxCents / 100.0, // tax deduction - (salary.NetSalaryCents + salary.SubtractiveTaxCents - - salary.GrossSalaryCents) / 100.0, // after-tax adjustments - salary.NetSalaryCents / 100.0) + // actual payout amount - " " + GetValidationDetails(salary.Validations)); + subValidations.Add(GetObjectDetails(salary)); } if (payout.DependentSalariesTax.Count > 0) @@ -267,7 +309,12 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers return "

" + result + "

" + String.Join("

", subValidations) + "

"; - break; + case "ExpenseClaim": + case "CashAdvance": + case "InboundInvoice": + case "Salary": + return "

" + GetObjectDetails((IHasIdentity)someObject) + "

"; + default: return "Unimplemented dependency type: " + objectType; } @@ -309,5 +356,61 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers documents[0].UploadedDateTime.ToString("yyyy-MMM-dd HH:mm") + ". View documents." + docLink + ""; } + + private static string GetObjectDetails(IHasIdentity identifiableObject) + { + switch (identifiableObject.GetType().Name) + { + case "ExpenseClaim": + ExpenseClaim claim = (ExpenseClaim)identifiableObject; + + return "" + + String.Format(Resources.Global.Financial_ExpenseClaimLongSpecification, claim.Identity) + + ": " + claim.Organization.Currency.Code + " " + + (claim.AmountCents / 100.0).ToString("N2") + ". " + + HttpUtility.HtmlEncode(GetValidationDetails(claim.Validations)) + " " + + GetDocumentDetails(claim.Documents, claim); + + case "CashAdvance": + CashAdvance advance = (CashAdvance)identifiableObject; + + return "" + + String.Format(Resources.Global.Financial_CashAdvanceSpecification, advance.Identity) + + ": " + advance.Organization.Currency.Code + " " + + (advance.AmountCents / 100.0).ToString("N2") + ". " + + HttpUtility.HtmlEncode(GetValidationDetails(advance.Validations)); + + case "InboundInvoice": + InboundInvoice invoice = (InboundInvoice)identifiableObject; + + return "" + + String.Format(Resources.Global.Financial_InboundInvoiceSpecification, invoice.Identity) + + ": " + invoice.Organization.Currency.Code + " " + + (invoice.AmountCents / 100.0).ToString("N2") + ". " + + GetValidationDetails(invoice.Validations) + " " + + GetDocumentDetails(invoice.Documents, invoice); + + case "Salary": + Salary salary = (Salary)identifiableObject; + + return "" + + String.Format(Resources.Global.Financial_SalaryIdentity, salary.Identity) + + ": " + + String.Format(Resources.Pages.Ledgers.InspectLedgers_TxDetail_SalaryDetail, + salary.PayrollItem.Organization.Currency.Code, + salary.BaseSalaryCents / 100.0, // base salary + (salary.GrossSalaryCents - salary.BaseSalaryCents) / 100.0, // before-tax adjustments + salary.GrossSalaryCents / 100.0, // before-tax adjusted salary + salary.SubtractiveTaxCents / 100.0, // tax deduction + (salary.NetSalaryCents + salary.SubtractiveTaxCents - + salary.GrossSalaryCents) / 100.0, // after-tax adjustments + salary.NetSalaryCents / 100.0) + // actual payout amount + " " + GetValidationDetails(salary.Validations); + + default: + throw new NotImplementedException("Unhandled object type in GetObjectDetails: " + + identifiableObject.GetType().Name); + } + } } } \ No newline at end of file