From ea05b7937006aa2fd108416dcd1df696faef0bc7 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 28 Sep 2017 17:16:14 +0200 Subject: [PATCH] Work on PDF conversion --- Logic/Financial/ExternalBankData.cs | 29 +++++++- Logic/Financial/ExternalBankDataProfile.cs | 30 ++++++++ Logic/Financial/FinancialAccount.cs | 6 ++ Logic/Financial/StockBankDataReaders.cs | 5 ++ Site/Controls/v5/Base/FileUpload.ascx | 70 +++++++++++++++--- Site/Images/Icons/iconshock-pdf-128px.png | Bin 0 -> 12260 bytes Site/Pages/v5/Financial/FileExpenseClaim.aspx | 2 +- Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs | 3 + .../v5/Security/ChangeOrganizations.aspx | 2 +- .../v5/Security/ChangeOrganizations.aspx.cs | 12 ++- Site/Site.csproj | 1 + 11 files changed, 143 insertions(+), 17 deletions(-) create mode 100644 Site/Images/Icons/iconshock-pdf-128px.png diff --git a/Logic/Financial/ExternalBankData.cs b/Logic/Financial/ExternalBankData.cs index b2af63d5..b5e33409 100644 --- a/Logic/Financial/ExternalBankData.cs +++ b/Logic/Financial/ExternalBankData.cs @@ -46,7 +46,32 @@ namespace Swarmops.Logic.Financial string organizationCurrencyCode = organization.Currency.Code; - int crlfIndex = data.IndexOfAny (new[] {'\n', '\r'}); + + // Replace any strings initially to force the bank data into readability (per profile) + + string[] replacements = Profile.InitialReplacements.Split('|'); + + for (int loop = 0; loop < replacements.Length/2; loop++) + { + data = data.Replace(replacements[loop*2], replacements[loop*2 + 1]); + } + + int crlfIndex; + + for (int loop = 0; loop < Profile.IgnoreInitialLines && !String.IsNullOrEmpty(data); loop++) + { + crlfIndex = data.IndexOfAny(new[] { '\n', '\r' }); + if (crlfIndex > 0) + { + data = data.Substring(crlfIndex).Trim(); + } + else + { + data = string.Empty; + } + } + + crlfIndex = data.IndexOfAny (new[] {'\n', '\r'}); string fieldKeyLine = data.Substring (0, crlfIndex); @@ -61,7 +86,7 @@ namespace Swarmops.Logic.Financial { for (int index = 0; index < dataKeyFields.Length; index++) { - if (dataKeyFields[index].Trim() == Profile.FieldNames[fieldName]) + if (StripQuotes(dataKeyFields[index]).Trim() == Profile.FieldNames[fieldName]) { fieldNameLookup[fieldName] = index; break; diff --git a/Logic/Financial/ExternalBankDataProfile.cs b/Logic/Financial/ExternalBankDataProfile.cs index c4039383..dae3f697 100644 --- a/Logic/Financial/ExternalBankDataProfile.cs +++ b/Logic/Financial/ExternalBankDataProfile.cs @@ -45,12 +45,19 @@ namespace Swarmops.Logic.Financial get { return 2; } } + public static int DEPostbankId + { + get { return 3; } + } + public string Name { get; set; } public Country Country { get; set; } public string Culture { get; set; } public string Currency { get; set; } public string BankDataAccountReader { get; set; } public string BankDataPaymentsReader { get; set; } + public int IgnoreInitialLines { get; set; } + public string InitialReplacements { get; set; } public Dictionary FieldNames { get; private set; } @@ -109,6 +116,29 @@ namespace Swarmops.Logic.Financial return result; } + if (externalBankDataProfileId == DEPostbankId) + { + result.Name = "DE Postbank"; + result.Country = Country.FromCode("DE"); + result.Culture = "de-DE"; + result.IgnoreInitialLines = 8; + result.InitialReplacements = ";|\t| €| (€)|"; + + result.FieldNames[ExternalBankDataFieldName.Date] = "Buchungstag"; + result.FieldNames[ExternalBankDataFieldName.Description] = "Buchungsdetails"; + result.FieldNames[ExternalBankDataFieldName.TransactionNet] = "Betrag"; + result.FieldNames[ExternalBankDataFieldName.AccountBalance] = "Saldo"; + + result.LatestTransactionLocation = LatestTransactionLocation.Top; + result.FeeSignage = FeeSignage.Unknown; // no inline fees + result.Precision = ExternalBankDateTimePrecision.Day; + + result.BankDataAccountReader = StockBankDataReaders.TabSeparatedValuesAccountReader; + result.BankDataPaymentsReader = null; // No aggregated payments with Paypal + + return result; + } + throw new ArgumentException ("Unrecognized profile Id"); } } diff --git a/Logic/Financial/FinancialAccount.cs b/Logic/Financial/FinancialAccount.cs index a7d12fd4..5719ebea 100644 --- a/Logic/Financial/FinancialAccount.cs +++ b/Logic/Financial/FinancialAccount.cs @@ -212,6 +212,12 @@ namespace Swarmops.Logic.Financial return ExternalBankDataProfile.FromIdentity (ExternalBankDataProfile.SESebId); } + if (OrganizationId == 8 && PilotInstallationIds.IsPilot(PilotInstallationIds.SwarmopsLive) && + FinancialAccountId == 150) + { + return ExternalBankDataProfile.FromIdentity(ExternalBankDataProfile.DEPostbankId); + } + return null; } } diff --git a/Logic/Financial/StockBankDataReaders.cs b/Logic/Financial/StockBankDataReaders.cs index 8112f9d2..906c63fa 100644 --- a/Logic/Financial/StockBankDataReaders.cs +++ b/Logic/Financial/StockBankDataReaders.cs @@ -8,6 +8,11 @@ get { return "TabSeparatedValuesReader"; } } + public static string SemicolonSeparatedValuesAccountReader + { + get { return "SemicolonSeparatedValuesReader"; } + } + public static string SEPaymentsBankgiroReader { get { return "SEPaymentsBankgiroReader"; } diff --git a/Site/Controls/v5/Base/FileUpload.ascx b/Site/Controls/v5/Base/FileUpload.ascx index dc387ba0..c6bccec8 100644 --- a/Site/Controls/v5/Base/FileUpload.ascx +++ b/Site/Controls/v5/Base/FileUpload.ascx @@ -18,18 +18,11 @@ $('#<%=this.ClientID %>_ButtonUploadHidden').fileupload({ url: '/Automation/UploadFileHandler.ashx?Guid=<%= GuidString %>&Filter=<%=Filter %>', dataType: 'json', - done: function(e, data) { + done: function (e, data) { + var pdfConversionNeeded = false; $.each(data.result, function(index, file) { if (file.error == null || file.error.length < 1) { $('#<%=this.ClientID %>_DivUploadCount').append(imageUploadSuccess); - - <% if (!String.IsNullOrEmpty(this.ClientUploadCompleteCallback)) - { %> - - <%= this.ClientUploadCompleteCallback %>("<%= GuidString%>", "<%= Cookie%>"); - - <% } %> - } else { $('#<%=this.ClientID %>_DivUploadCount').append(imageUploadFail); // Assume ERR_NOT_IMAGE alertify.error('File "' + file.name + '" could not be uploaded. Is it really an image?'); @@ -37,7 +30,20 @@ }); $('#<%=this.ClientID %>_DivProgressUpload').progressbar({ value: 100 }); - $('#<%=this.ClientID %>_DivProgressUpload').fadeOut('400', function () { $('#<%=this.ClientID %>_DivUploadCount').fadeIn(); }); + if (pdfConversionNeeded) { + $('#<%=this.ClientID %>_DivProgressPdfConversion').progressbar({ value: 1 }); + $('#<%=this.ClientID %>_DivMainControlArea').fadeOut('400', function() { $('#<%=this.ClientID %>_DivPdfConverting').fadeIn(); }); + } else { + + <% if (!String.IsNullOrEmpty(this.ClientUploadCompleteCallback)) + { %> + + <%= this.ClientUploadCompleteCallback %>("<%= GuidString%>", "<%= Cookie%>"); + + <% } %> + + $('#<%=this.ClientID %>_DivProgressUpload').fadeOut('400', function() { $('#<%=this.ClientID %>_DivUploadCount').fadeIn(); }); + } }, progressall: function(e, data) { var progress = parseInt(data.loaded / data.total * 100, 10); @@ -49,6 +55,7 @@ add: function(e, data) { $('#<%=this.ClientID %>_DivUploadCount').css('display', 'none'); $('#<%=this.ClientID %>_DivProgressUpload').progressbar({ value: 0 }); // reset in case of previous uploads on this page + $('#<%=this.ClientID %>_DivProgressPdfConvert').progressbar({ value: 0 }); $('#<%=this.ClientID %>_DivProgressUpload').fadeIn(); data.submit(); @@ -66,12 +73,51 @@ $('#<%=this.ClientID %>_ButtonUploadHidden').click(); }); - $('#<%=this.ClientID %>_DivProgressUpload').progressbar({ value: 0, max: 100 }); + $('#<%=this.ClientID %>_DivProgressPdfConvert').progressbar({ value: 0, max: 100 }); }); + function <%=this.ClientID%>_repingPdfProgress() { + + var jsonData = {}; + jsonData.guid = "Pdf-<%=GuidString%>"; + + SwarmopsJS.ajaxCall( + "/Automation/Json-ByGuid.aspx/GetProgress2", + jsonData, + function(result) { + }, + function(error) { + } + ); + + SwarmopsJS.ajaxCall() + setTimeout(function() { <%=this.ClientID%>_repingPdfProgress(); }, 500); + } + -
/>
+
+
+
+ /> +
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+ +
diff --git a/Site/Images/Icons/iconshock-pdf-128px.png b/Site/Images/Icons/iconshock-pdf-128px.png new file mode 100644 index 0000000000000000000000000000000000000000..45f361195850b1da95a86440929eae07b846abfd GIT binary patch literal 12260 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 H^#lJOS}+M& literal 0 HcmV?d00001 diff --git a/Site/Pages/v5/Financial/FileExpenseClaim.aspx b/Site/Pages/v5/Financial/FileExpenseClaim.aspx index d820e9ee..f7824152 100644 --- a/Site/Pages/v5/Financial/FileExpenseClaim.aspx +++ b/Site/Pages/v5/Financial/FileExpenseClaim.aspx @@ -1,4 +1,4 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.v5.Financial.FileExpenseClaim" Codebehind="FileExpenseClaim.aspx.cs" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Master-v5.master" AutoEventWireup="true" Inherits="Swarmops.Frontend.Pages.v5.Financial.FileExpenseClaim" CodeFile="FileExpenseClaim.aspx.cs" Codebehind="FileExpenseClaim.aspx.cs" %> <%@ Register src="~/Controls/v5/Base/FileUpload.ascx" tagname="FileUpload" tagprefix="Swarmops5" %> <%@ Register TagPrefix="Swarmops5" TagName="ComboBudgets" Src="~/Controls/v5/Financial/ComboBudgets.ascx" %> <%@ Register TagPrefix="Swarmops5" TagName="Currency" Src="~/Controls/v5/Financial/CurrencyTextBox.ascx" %> diff --git a/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs b/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs index 593bd276..86c23e88 100644 --- a/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs +++ b/Site/Pages/v5/Ledgers/UploadBankFiles.aspx.cs @@ -267,8 +267,11 @@ namespace Swarmops.Site.Pages.Ledgers return "(Instruct Stock-SE-SEB)"; case 2: return "(Instruct Stock-Global-Paypal)"; + case 150: + return "(Instruct Stock-DE-Postbank)"; default: throw new NotImplementedException(); + } } diff --git a/Site/Pages/v5/Security/ChangeOrganizations.aspx b/Site/Pages/v5/Security/ChangeOrganizations.aspx index 98f0c4bb..2665a43b 100644 --- a/Site/Pages/v5/Security/ChangeOrganizations.aspx +++ b/Site/Pages/v5/Security/ChangeOrganizations.aspx @@ -47,7 +47,7 @@ background-position: left; padding-left: 2px; margin-left: 4px; - margin-right: 8px; + margin-right: 2px; background-repeat: no-repeat; width: 70px; height: 48px; diff --git a/Site/Pages/v5/Security/ChangeOrganizations.aspx.cs b/Site/Pages/v5/Security/ChangeOrganizations.aspx.cs index bab10dae..d9e61058 100644 --- a/Site/Pages/v5/Security/ChangeOrganizations.aspx.cs +++ b/Site/Pages/v5/Security/ChangeOrganizations.aspx.cs @@ -51,7 +51,17 @@ namespace Swarmops.Frontend.Pages.v5.Security Document logoLandscape = organization.LogoLandscape; - newOrganizationParameters.LogoImage = logoLandscape.Image.GetBase64(70, 48); + try + { + if (logoLandscape != null) + { + newOrganizationParameters.LogoImage = logoLandscape.Image.GetBase64(64, 36); + } + } + catch (Exception) + { + newOrganizationParameters.LogoImage = "/Images/Flags/txl-64px.png"; + } newOrganizationParameters.OrganizationId = membership.OrganizationId; newOrganizationParameters.OrganizationName = membership.Organization.Name; diff --git a/Site/Site.csproj b/Site/Site.csproj index 4f945d54..a6bad5dc 100644 --- a/Site/Site.csproj +++ b/Site/Site.csproj @@ -730,6 +730,7 @@ +