Sök betalningar, fördela på mottagare under sökt period

This commit is contained in:
2023-09-12 22:12:45 +02:00
parent 2b6e48c3ef
commit de6e196809
8 changed files with 356 additions and 16 deletions

View File

@ -53,22 +53,19 @@ public class AccountRecordRepository : IAccountRecordRepository
public IEnumerable<AccountRecord> GetAllAccBetweenDates(DateTime dateFrom, DateTime dateTo) public IEnumerable<AccountRecord> GetAllAccBetweenDates(DateTime dateFrom, DateTime dateTo)
{ {
IEnumerable<AccountRecord> result = null; IEnumerable<AccountRecord> result = null;
using (ApplicationDbContext dc = _dataContext) result = (from acc in _dataContext.AccountRecords
{ where acc.BetalDatum > dateFrom && acc.BetalDatum < dateTo
result = (from acc in dc.AccountRecords orderby acc.Mottagare, acc.BetalDatum descending
where acc.BetalDatum>dateFrom && acc.BetalDatum <dateTo select new AccountRecord
orderby acc.Mottagare, acc.BetalDatum descending {
select new AccountRecord Id = acc.Id,
{ BetalDatum = acc.BetalDatum,
Id = acc.Id, Mottagare = acc.Mottagare,
BetalDatum = acc.BetalDatum, Avisering = acc.Avisering,
Mottagare = acc.Mottagare, Belopp = acc.Belopp,
Avisering = acc.Avisering, Konto = acc.Konto,
Belopp = acc.Belopp, Stored = acc.Stored
Konto = acc.Konto, }).ToList();
Stored = acc.Stored
}).ToList();
}
return result; return result;
} }

View File

@ -0,0 +1,100 @@
namespace WinFormDi.UserControls
{
partial class ucCustomerValue
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Component Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
lblCustName = new Label();
lblAmount = new Label();
btnShowMore = new Button();
lblNumberof = new Label();
SuspendLayout();
//
// lblCustName
//
lblCustName.AutoSize = true;
lblCustName.Font = new Font("Verdana Pro", 9F, FontStyle.Bold, GraphicsUnit.Point);
lblCustName.Location = new Point(3, 9);
lblCustName.Name = "lblCustName";
lblCustName.Size = new Size(123, 14);
lblCustName.TabIndex = 0;
lblCustName.Text = "Customer default";
//
// lblAmount
//
lblAmount.AutoSize = true;
lblAmount.Font = new Font("Segoe UI", 11F, FontStyle.Regular, GraphicsUnit.Point);
lblAmount.Location = new Point(317, 5);
lblAmount.Name = "lblAmount";
lblAmount.Size = new Size(36, 20);
lblAmount.TabIndex = 1;
lblAmount.Text = "0,00";
//
// btnShowMore
//
btnShowMore.BackColor = Color.FromArgb(192, 192, 255);
btnShowMore.ForeColor = Color.FromArgb(0, 0, 64);
btnShowMore.Location = new Point(563, 5);
btnShowMore.Name = "btnShowMore";
btnShowMore.Size = new Size(72, 23);
btnShowMore.TabIndex = 2;
btnShowMore.Text = "Visa mer";
btnShowMore.UseVisualStyleBackColor = false;
btnShowMore.Click += btnShowMore_Click;
//
// lblNumberof
//
lblNumberof.AutoSize = true;
lblNumberof.Location = new Point(505, 9);
lblNumberof.Name = "lblNumberof";
lblNumberof.Size = new Size(13, 15);
lblNumberof.TabIndex = 3;
lblNumberof.Text = "0";
//
// ucCustomerValue
//
AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font;
BackColor = Color.FromArgb(192, 255, 255);
Controls.Add(lblNumberof);
Controls.Add(btnShowMore);
Controls.Add(lblAmount);
Controls.Add(lblCustName);
Name = "ucCustomerValue";
Size = new Size(638, 28);
ResumeLayout(false);
PerformLayout();
}
#endregion
private Label lblCustName;
private Label lblAmount;
private Button btnShowMore;
private Label lblNumberof;
}
}

View File

@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace WinFormDi.UserControls
{
public partial class ucCustomerValue : UserControl
{
public ucCustomerValue()
{
InitializeComponent();
}
private void btnShowMore_Click(object sender, EventArgs e)
{
}
public string Receiver { get => lblCustName.Text; set => lblCustName.Text = value; }
public string Number { get => lblNumberof.Text; set => lblNumberof.Text = value; }
public string Amount { get => lblAmount.Text; set => lblAmount.Text = value; }
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

View File

@ -35,6 +35,7 @@
lblDateTo = new Label(); lblDateTo = new Label();
dtpTo = new DateTimePicker(); dtpTo = new DateTimePicker();
btnStartSearch = new Button(); btnStartSearch = new Button();
flpPanel1 = new FlowLayoutPanel();
SuspendLayout(); SuspendLayout();
// //
// btnClose // btnClose
@ -99,12 +100,23 @@
btnStartSearch.TabIndex = 7; btnStartSearch.TabIndex = 7;
btnStartSearch.Text = "Starta sökning"; btnStartSearch.Text = "Starta sökning";
btnStartSearch.UseVisualStyleBackColor = true; btnStartSearch.UseVisualStyleBackColor = true;
btnStartSearch.Click += btnStartSearch_Click;
//
// flpPanel1
//
flpPanel1.AutoScroll = true;
flpPanel1.BackColor = Color.Silver;
flpPanel1.Location = new Point(21, 102);
flpPanel1.Name = "flpPanel1";
flpPanel1.Size = new Size(668, 314);
flpPanel1.TabIndex = 8;
// //
// frmSearchData // frmSearchData
// //
AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleDimensions = new SizeF(7F, 15F);
AutoScaleMode = AutoScaleMode.Font; AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(800, 450); ClientSize = new Size(800, 450);
Controls.Add(flpPanel1);
Controls.Add(btnStartSearch); Controls.Add(btnStartSearch);
Controls.Add(dtpTo); Controls.Add(dtpTo);
Controls.Add(lblDateTo); Controls.Add(lblDateTo);
@ -128,5 +140,6 @@
private Label lblDateTo; private Label lblDateTo;
private DateTimePicker dtpTo; private DateTimePicker dtpTo;
private Button btnStartSearch; private Button btnStartSearch;
private FlowLayoutPanel flpPanel1;
} }
} }

View File

@ -7,12 +7,19 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using WinFormDi.UserControls;
using WinFormDiApp.BL.Helpers;
using WinFormDiApp.BL.Models;
using WinFormDiApp.BLI; using WinFormDiApp.BLI;
namespace WinFormDiApp namespace WinFormDiApp
{ {
public partial class frmSearchData : Form public partial class frmSearchData : Form
{ {
private class AccCount : AccountRecord
{
public int NoOfRecs { get; set; }
}
private readonly IAccountRecordRepository _accountRecordRepository; private readonly IAccountRecordRepository _accountRecordRepository;
public frmSearchData(IAccountRecordRepository accountRecordRepository) public frmSearchData(IAccountRecordRepository accountRecordRepository)
@ -25,5 +32,70 @@ namespace WinFormDiApp
{ {
this.Close(); this.Close();
} }
private void btnStartSearch_Click(object sender, EventArgs e)
{
flpPanel1.Controls.Clear();
var result = _accountRecordRepository.GetAllAccBetweenDates(dtpFrom.Value, dtpTo.Value);
var aggregates = aggegateAccounts(result);
foreach (var account in aggregates)
{
var ucCustV = createAndFillUCcv(account);
flpPanel1.Controls.Add(ucCustV);
}
}
private ucCustomerValue createAndFillUCcv(AccCount account)
{
var result = new ucCustomerValue();
result.Amount = String.Format("{0:0.00}", account.Belopp).adjustRight();
result.Receiver = account.Mottagare;
result.Number = Convert.ToString(account.NoOfRecs);
return result;
}
private IEnumerable<AccCount> aggegateAccounts(IEnumerable<AccountRecord> result)
{
List<AccCount> Localresult = new List<AccCount>();
string oldMott = string.Empty;
AccCount wrkRec = null;
foreach (var accountRecord in result)
{
if (accountRecord.Mottagare == oldMott)
{
wrkRec.Belopp += accountRecord.Belopp;
wrkRec.NoOfRecs++;
}
else
{
oldMott = accountRecord.Mottagare;
if (wrkRec != null)
{
Localresult.Add(wrkRec);
wrkRec = AddAccountRecord(accountRecord);
}
else
{
wrkRec = AddAccountRecord(accountRecord);
}
}
}
Localresult.Add(wrkRec);
return Localresult;
}
private AccCount AddAccountRecord(AccountRecord accountRecord)
{
AccCount acc = new AccCount();
acc.NoOfRecs = 1;
acc.BetalDatum = accountRecord.BetalDatum;
acc.Stored = accountRecord.Stored;
acc.Mottagare = accountRecord.Mottagare;
acc.Konto = accountRecord.Konto;
acc.Avisering = accountRecord.Avisering;
acc.Belopp = accountRecord.Belopp;
acc.Id = accountRecord.Id;
return acc;
}
} }
} }

View File

@ -23,4 +23,12 @@ public static class Extensions
} }
else return false; else return false;
} }
public static string adjustRight(this string value) {
if (!string.IsNullOrEmpty(value) && value.Length < 20)
{
return " ".Substring(0, 20 - value.Length)+value;
}
else return value;
}
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB