Committing some work. Build is still broken. Calling it a night.

This commit is contained in:
Rick Falkvinge
2014-08-12 20:45:18 +00:00
parent d3d2e8bb22
commit d564358fae
7 changed files with 66 additions and 23 deletions
@@ -1,11 +1,16 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
namespace Swarmops.Logic.Financial.BankDataReaders
{
public class TabSeparatedValuesReader: IBankDataAccountReader
public class TabSeparatedValuesReader: IBankDataAccountStatementReader
{
public ImportedBankData ReadData(StreamReader data, FinancialAccount account, ExternalBankDataProfile profile)
{
throw new NotImplementedException();
}
}
}
+7
View File
@@ -33,6 +33,13 @@ namespace Swarmops.Logic.Financial
throw new InvalidOperationException("Cannot call LoadData before a profile has been set");
}
if (Profile.BankDataAccountReader != StockBankDataReaders.TabSeparatedValuesAccountReader)
{
throw new NotImplementedException("Only tab separated values are supported at this point");
}
// TODO: Implement bank data reader factory here
string organizationCurrencyCode = organization.Currency.Code;
int crlfIndex = data.IndexOfAny(new char[] {'\n', '\r'});
-10
View File
@@ -1,10 +0,0 @@
using System.IO;
using Swarmops.Logic.Financial.BankDataReaders;
namespace Swarmops.Logic.Financial
{
interface IBankDataAccountReader
{
ImportedBankData ReadData(TextReader data, IBankDataPaymentsReader paymentsReader);
}
}
@@ -0,0 +1,10 @@
using System.IO;
using Swarmops.Logic.Financial.BankDataReaders;
namespace Swarmops.Logic.Financial
{
interface IBankDataAccountStatementReader
{
ImportedBankData ReadData(StreamReader data, FinancialAccount account, ExternalBankDataProfile profile);
}
}
+1 -1
View File
@@ -1,6 +1,6 @@
namespace Swarmops.Logic.Financial
{
interface IBankDataPaymentsReader
public interface IBankDataPaymentsReader
{
void GetParameterList(); // TODO - need to find types of params and return for this guy
void SetParameters(); // TODO - ditto
+1 -1
View File
@@ -96,7 +96,7 @@
<Compile Include="Communications\Transmission\NotificationPayload.cs" />
<Compile Include="Communications\Transmission\PayloadBase.cs" />
<Compile Include="Financial\BankDataReaders\SEPaymentsBankgiroReader.cs" />
<Compile Include="Financial\IBankDataAccountReader.cs" />
<Compile Include="Financial\IBankDataAccountStatementReader.cs" />
<Compile Include="Financial\IBankDataPaymentsReader.cs" />
<Compile Include="Financial\BankDataReaders\TabSeparatedValuesReader.cs" />
<Compile Include="Financial\CashAdvance.cs" />
+41 -10
View File
@@ -181,6 +181,14 @@ namespace Swarmops.Site.Pages.Ledgers
AuthenticationData authData = GetAuthenticationDataAndCulture();
int accountId = Int32.Parse(accountIdString);
BankFileType fileType = BankFileType.AccountStatement;
if (accountId < 0)
{
accountId = -accountId;
fileType = BankFileType.PaymentDetails;
}
FinancialAccount account = FinancialAccount.FromIdentity(accountId);
if (account.Organization.Identity != authData.CurrentOrganization.Identity ||
@@ -191,7 +199,7 @@ namespace Swarmops.Site.Pages.Ledgers
Thread initThread = new Thread(ProcessUploadThread);
ProcessThreadArguments args = new ProcessThreadArguments { Guid = guid, Organization = authData.CurrentOrganization, Account = account };
ProcessThreadArguments args = new ProcessThreadArguments { Guid = guid, Organization = authData.CurrentOrganization, Account = account, FileType = fileType };
initThread.Start(args);
}
@@ -201,13 +209,26 @@ namespace Swarmops.Site.Pages.Ledgers
public string Guid { get; set; }
public Organization Organization { get; set; }
public FinancialAccount Account { get; set; }
public BankFileType FileType { get; set; }
}
private enum BankFileType
{
Unknown = 0,
/// <summary>
/// A regular bank statement
/// </summary>
AccountStatement,
/// <summary>
/// A payments file with breakdowns of aggregate transactions
/// </summary>
PaymentDetails
}
private static void ProcessUploadThread(object args)
{
string guid = ((ProcessThreadArguments) args).Guid;
BankFileType fileType = ((ProcessThreadArguments) args).FileType;
Documents documents = Documents.RecentFromDescription(guid);
@@ -218,20 +239,30 @@ namespace Swarmops.Site.Pages.Ledgers
Document uploadedDoc = documents[0];
FinancialAccount account = ((ProcessThreadArguments)args).Account;
FinancialAccount account = ((ProcessThreadArguments) args).Account;
ExternalBankData externalData = new ExternalBankData();
externalData.Profile = account.ExternalBankDataProfile;
using (StreamReader reader = uploadedDoc.GetReader(1252))
if (fileType == BankFileType.AccountStatement)
{
externalData.LoadData(reader, ((ProcessThreadArguments) args).Organization);
using (StreamReader reader = uploadedDoc.GetReader(1252))
{
externalData.LoadData(reader, ((ProcessThreadArguments) args).Organization);
}
}
else if (fileType == BankFileType.PaymentDetails)
{
// Get reader factory from ExternalBankData
IBankDataPaymentsReader paymentsReader = externalData.GetPaymentsReader();
// then read
}
}
/*
private void Submit_Click(object sender, EventArgs e)
{
bool fileWasUploaded = false;
@@ -329,7 +360,7 @@ namespace Swarmops.Site.Pages.Ledgers
this.LabelNoFileUploaded.Text = string.Empty;
this.LiteralDivInstructionsStyle.Text = @"style='display:none'";
}
}
}*/
private void PresentPaymentFileResults (ImportedPaymentData data)
@@ -796,7 +827,7 @@ namespace Swarmops.Site.Pages.Ledgers
/*
protected ImportedBankData ImportSebText(Stream fileStream)
{
string contents = string.Empty;
@@ -1020,7 +1051,7 @@ namespace Swarmops.Site.Pages.Ledgers
}
return input;
}
}*/
}
}