Fast-forwarding to build 858 to find mystery bug

This commit is contained in:
Rick Falkvinge
2015-03-04 22:22:56 +01:00
parent 7e745c1299
commit bdc3fb61b4
2 changed files with 244 additions and 65 deletions
+123 -47
View File
@@ -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" %>
<asp:Content ID="Content1" ContentPlaceHolderID="PlaceHolderHead" Runat="Server">
@@ -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('<asp:Literal ID="LiteralErrorAddRowSelectAccount" runat="server" />'));
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 @@
<div id="divEditTransaction">
<h2><asp:Label ID="LabelAddTransactionRowsHeader" runat="server" /></h2>
<div id="divModalFields" class="entryFields">
ModalFields
</div>
<div class="entryLabels">
entryLabels
</div>
<span class="content"><h2 style="border-bottom: none"><asp:Label ID="LabelAddRowAccount" runat="server" /><Swarmops5:ComboBudgets ID="BudgetAddRow" ListType="All" runat="server" />, <asp:Label ID="LabelAddRowAmount" runat="server" /> <Swarmops5:CurrencyTextBox ID="TextInsertAmount" runat="server" /> <span class="elementFloatFar"><input id="ButtonAddTransactionRow" type="button" value=' <asp:Literal ID="LiteralAddRowButton" runat="server" /> '/></span></h2></span>
</div>
<div id="divTransactionTracking">
<h2><asp:Label ID="LabelTrackedTransactionHeader" runat="server" /></h2>
+121 -18
View File
@@ -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("<strong>" + String.Format(Resources.Global.Financial_ExpenseClaimLongSpecification, claim.Identity) + ":</strong> " + 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("<strong>" + String.Format(Resources.Global.Financial_CashAdvanceSpecification, advance.Identity) + ":</strong> " + 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) + "</strong>");
subValidations.Add("<strong>" + String.Format(Resources.Global.Financial_InboundInvoiceSpecification, invoice.Identity) + ":</strong> " + 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)) +
"</strong>");
subValidations.Add("<strong>" +
String.Format(Resources.Global.Financial_SalaryIdentity, salary.Identity) +
":</strong> " +
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 "<p>" + result + "</p><p>" + String.Join("</p><p>", subValidations) + "</p>";
break;
case "ExpenseClaim":
case "CashAdvance":
case "InboundInvoice":
case "Salary":
return "<p>" + GetObjectDetails((IHasIdentity)someObject) + "</p>";
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") +
". <a href='#' class='linkViewDox' objectId='" + objectIdString + "'>View documents.</a><span class='hiddenDocLinks'>" + docLink + "</span>";
}
private static string GetObjectDetails(IHasIdentity identifiableObject)
{
switch (identifiableObject.GetType().Name)
{
case "ExpenseClaim":
ExpenseClaim claim = (ExpenseClaim)identifiableObject;
return "<strong>" +
String.Format(Resources.Global.Financial_ExpenseClaimLongSpecification, claim.Identity) +
":</strong> " + 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 "<strong>" +
String.Format(Resources.Global.Financial_CashAdvanceSpecification, advance.Identity) +
":</strong> " + advance.Organization.Currency.Code + " " +
(advance.AmountCents / 100.0).ToString("N2") + ". " +
HttpUtility.HtmlEncode(GetValidationDetails(advance.Validations));
case "InboundInvoice":
InboundInvoice invoice = (InboundInvoice)identifiableObject;
return "<strong>" +
String.Format(Resources.Global.Financial_InboundInvoiceSpecification, invoice.Identity) +
":</strong> " + invoice.Organization.Currency.Code + " " +
(invoice.AmountCents / 100.0).ToString("N2") + ". " +
GetValidationDetails(invoice.Validations) + " " +
GetDocumentDetails(invoice.Documents, invoice);
case "Salary":
Salary salary = (Salary)identifiableObject;
return "<strong>" +
String.Format(Resources.Global.Financial_SalaryIdentity, salary.Identity) +
":</strong> " +
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);
}
}
}
}