From 666c52df2d5d31f4d1830920fe7da434a04751cd Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 15 Feb 2018 18:13:22 +0100 Subject: [PATCH] More Expensify output tests --- Site/Pages/v5/Financial/FileExpenseClaim.aspx | 6 +++--- .../v5/Financial/FileExpenseClaim.aspx.cs | 14 +++++++++++--- .../FileExpenseClaim.aspx.designer.cs | 18 +++++++++--------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx b/Site/Pages/v5/Financial/FileExpenseClaim.aspx index 6ae9285f..6e385c72 100644 --- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx +++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx @@ -224,10 +224,10 @@ idField="expenseId"> + - - - + + diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs index e2798c1f..b06abfe9 100644 --- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs +++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.cs @@ -383,6 +383,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial newRecord.ReceiptUrl = csvReader.GetField(fieldMap[ExpensifyColumns.ReceiptUrl]); newRecord.Timestamp = DateTime.Parse(csvReader.GetField(fieldMap[ExpensifyColumns.Timestamp])); + newRecord.Guid = Guid.NewGuid().ToString(); if (vatEnabled) { @@ -456,7 +457,7 @@ namespace Swarmops.Frontend.Pages.v5.Financial string expensifyFileName = (string) txInfo["receiptFilename"]; string actualReceiptUrl = "https://s3.amazonaws.com/receipts.expensify.com/" + expensifyFileName; - string newGuidString = Guid.NewGuid().ToString(); + string newGuidString = recordList[loop].Guid; string fullyQualifiedFileName = Document.DailyStorageFolder + newGuidString; string relativeFileName = relativePath + newGuidString; @@ -514,8 +515,11 @@ namespace Swarmops.Frontend.Pages.v5.Financial { outputRecords.Add(new ExpensifyOutputRecord { - Description = record.Description, - Amount = (record.AmountCents / 100.0).ToString("N2") + Description = record.CategoryCustom + " / " + record.CategoryStandard + " / " + record.Description, + CreatedDateTime = record.Timestamp.ToString("MMM dd"), + Amount = (record.AmountCents / 100.0).ToString("N2"), + AmountVat = (record.VatCents / 100.0).ToString("N2"), + Guid = record.Guid }); } @@ -573,6 +577,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial public string ExtendedInfo { get; set; } public string ReceiptFileNameHere { get; set; } public Documents Documents { get; set; } + + public string Guid { get; set; } } @@ -719,6 +725,8 @@ namespace Swarmops.Frontend.Pages.v5.Financial public string Budget { get; set; } public string Amount { get; set; } public string AmountVat { get; set; } + public string CreatedDateTime { get; set; } + public string Guid { get; set; } } diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.designer.cs b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.designer.cs index a8c9a101..b1ff7393 100644 --- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx.designer.cs +++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx.designer.cs @@ -237,15 +237,6 @@ namespace Swarmops.Frontend.Pages.v5.Financial { /// protected global::System.Web.UI.WebControls.Label LabelExpensifyProcessingComplete; - /// - /// LabelGridHeaderCreatedDate control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label LabelGridHeaderCreatedDate; - /// /// LabelGridHeaderBudget control. /// @@ -255,6 +246,15 @@ namespace Swarmops.Frontend.Pages.v5.Financial { /// protected global::System.Web.UI.WebControls.Label LabelGridHeaderBudget; + /// + /// LabelGridHeaderCreatedDate control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelGridHeaderCreatedDate; + /// /// LabelExpensifyHeaderDescription control. ///