Adjustments of copied control-names etc

This commit is contained in:
2023-08-27 22:00:11 +02:00
parent 374d401692
commit aef30274b2
8 changed files with 63 additions and 20 deletions

View File

@ -39,6 +39,7 @@ namespace WinFormDiApp
.AddTransient<IMessages, Messages>() .AddTransient<IMessages, Messages>()
.AddTransient<IAccountRecordRepository,AccountRecordRepository>() .AddTransient<IAccountRecordRepository,AccountRecordRepository>()
.AddTransient<IMemberRepository,MemberRepository>() .AddTransient<IMemberRepository,MemberRepository>()
.AddTransient<IReadingIn, ReadingIn>()
.AddTransient<MainWindow>() .AddTransient<MainWindow>()
.AddTransient<frmReadPayments>() .AddTransient<frmReadPayments>()
.AddTransient<frmPayments>(); .AddTransient<frmPayments>();

View File

@ -84,6 +84,7 @@
Controls.Add(goodbyeText); Controls.Add(goodbyeText);
Controls.Add(helloText); Controls.Add(helloText);
Name = "MainWindow"; Name = "MainWindow";
StartPosition = FormStartPosition.CenterScreen;
Text = "MainWindow"; Text = "MainWindow";
FormClosing += MainWindow_FormClosing; FormClosing += MainWindow_FormClosing;
Load += MainWindow_Load; Load += MainWindow_Load;

View File

@ -18,8 +18,8 @@ namespace WinFormDiApp
private readonly frmReadPayments _readPayments; private readonly frmReadPayments _readPayments;
public MainWindow( public MainWindow(
IMessages messages, IMessages messages,
frmPayments payments, frmPayments payments,
frmReadPayments readPayments frmReadPayments readPayments
) )
{ {

View File

@ -38,7 +38,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Local.db"> <None Update="Local.db">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
</ItemGroup> </ItemGroup>

View File

@ -1,11 +1,16 @@
{ {
"EPPlus": {
"ExcelPackage": {
"LicenseContext": "Noncommercial" //The license context used
}
},
"ConnectionStrings": { "ConnectionStrings": {
"DatabaseConnection": "Data Source=.\\Local.db" "DatabaseConnection": "Data Source=.\\Local.db"
}, },
"Logging": { "Logging": {
"LogLevel": { "LogLevel": {
"Default" : "Warning" "Default": "Warning"
} }
}, },
"AllowedHosts": "*" "AllowedHosts": "*"
} }

View File

@ -97,6 +97,7 @@
Controls.Add(btnClose); Controls.Add(btnClose);
Controls.Add(lvPayments); Controls.Add(lvPayments);
Name = "frmPayments"; Name = "frmPayments";
StartPosition = FormStartPosition.CenterScreen;
Text = "frmPayments"; Text = "frmPayments";
Load += frmPayments_Load; Load += frmPayments_Load;
ResumeLayout(false); ResumeLayout(false);

View File

@ -36,7 +36,7 @@
ch5_Förfallodag = new ColumnHeader(); ch5_Förfallodag = new ColumnHeader();
ch6_Avisering = new ColumnHeader(); ch6_Avisering = new ColumnHeader();
btnClose = new Button(); btnClose = new Button();
listView1 = new ListView(); lvPayouts = new ListView();
columnHeader1 = new ColumnHeader(); columnHeader1 = new ColumnHeader();
columnHeader2 = new ColumnHeader(); columnHeader2 = new ColumnHeader();
columnHeader3 = new ColumnHeader(); columnHeader3 = new ColumnHeader();
@ -100,17 +100,17 @@
btnClose.UseVisualStyleBackColor = true; btnClose.UseVisualStyleBackColor = true;
btnClose.Click += btnClose_Click; btnClose.Click += btnClose_Click;
// //
// listView1 // lvPayouts
// //
listView1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; lvPayouts.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
listView1.BackColor = Color.FromArgb(192, 255, 255); lvPayouts.BackColor = Color.FromArgb(192, 255, 255);
listView1.Columns.AddRange(new ColumnHeader[] { columnHeader1, columnHeader2, columnHeader3, columnHeader4, columnHeader5, columnHeader6 }); lvPayouts.Columns.AddRange(new ColumnHeader[] { columnHeader1, columnHeader2, columnHeader3, columnHeader4, columnHeader5, columnHeader6 });
listView1.Location = new Point(28, 107); lvPayouts.Location = new Point(28, 107);
listView1.Name = "listView1"; lvPayouts.Name = "lvPayouts";
listView1.Size = new Size(805, 286); lvPayouts.Size = new Size(805, 286);
listView1.TabIndex = 2; lvPayouts.TabIndex = 2;
listView1.UseCompatibleStateImageBehavior = false; lvPayouts.UseCompatibleStateImageBehavior = false;
listView1.View = View.Details; lvPayouts.View = View.Details;
// //
// columnHeader1 // columnHeader1
// //
@ -176,6 +176,8 @@
btnStartRead.TabIndex = 5; btnStartRead.TabIndex = 5;
btnStartRead.Text = "Starta Inläsning"; btnStartRead.Text = "Starta Inläsning";
btnStartRead.UseVisualStyleBackColor = false; btnStartRead.UseVisualStyleBackColor = false;
btnStartRead.Visible = false;
btnStartRead.Click += btnStartRead_Click;
// //
// frmReadPayments // frmReadPayments
// //
@ -185,9 +187,10 @@
Controls.Add(btnStartRead); Controls.Add(btnStartRead);
Controls.Add(lblTransFileName); Controls.Add(lblTransFileName);
Controls.Add(btnChooseFile); Controls.Add(btnChooseFile);
Controls.Add(listView1); Controls.Add(lvPayouts);
Controls.Add(btnClose); Controls.Add(btnClose);
Name = "frmReadPayments"; Name = "frmReadPayments";
StartPosition = FormStartPosition.CenterScreen;
Text = "frmReadPayments"; Text = "frmReadPayments";
Load += frmReadPayments_Load; Load += frmReadPayments_Load;
ResumeLayout(false); ResumeLayout(false);
@ -204,7 +207,7 @@
private ColumnHeader ch6_Avisering; private ColumnHeader ch6_Avisering;
private Button btnClose; private Button btnClose;
private ColumnHeader ch5_Förfallodag; private ColumnHeader ch5_Förfallodag;
private ListView listView1; private ListView lvPayouts;
private ColumnHeader columnHeader1; private ColumnHeader columnHeader1;
private ColumnHeader columnHeader2; private ColumnHeader columnHeader2;
private ColumnHeader columnHeader3; private ColumnHeader columnHeader3;

View File

@ -1,15 +1,21 @@
using WinFormDiApp.BLI; using Microsoft.Extensions.Logging;
using WinFormDiApp.BLI;
using WinFormDiApp.BLR;
namespace WinFormDiApp namespace WinFormDiApp
{ {
public partial class frmReadPayments : Form public partial class frmReadPayments : Form
{ {
private readonly IAccountRecordRepository _accountRecordRepository; private readonly IAccountRecordRepository _accountRecordRepository;
private readonly IReadingIn _readingIn;
private readonly ILogger<frmReadPayments> _logger;
public frmReadPayments(IAccountRecordRepository accountRecordRepository) public frmReadPayments(IAccountRecordRepository accountRecordRepository, IReadingIn readingIn, ILogger<frmReadPayments> logger)
{ {
InitializeComponent(); InitializeComponent();
_accountRecordRepository = accountRecordRepository; _accountRecordRepository = accountRecordRepository;
_readingIn = readingIn;
_logger = logger;
} }
@ -39,8 +45,34 @@ namespace WinFormDiApp
if (ofChooseFile.ShowDialog() == DialogResult.OK) if (ofChooseFile.ShowDialog() == DialogResult.OK)
{ {
lblTransFileName.Text = ofChooseFile.FileName; lblTransFileName.Text = ofChooseFile.FileName;
btnStartRead.Visible = true;
btnStartRead.Enabled = true; btnStartRead.Enabled = true;
} }
} }
private void btnStartRead_Click(object sender, EventArgs e)
{
if (!_readingIn.ReadAndSaveInvoices(lblTransFileName.Text))
{
var resUlt = _readingIn.readXLS(lblTransFileName.Text);
resUlt.ToList().ForEach(rec => _logger.LogInformation($"Konto :{rec.Konto}, {rec.Belopp}"));
}
else
{
var payments = _accountRecordRepository.GetAllAccounts();
foreach (var account in payments)
{
var lvitem = lvPayouts.Items.Add(account.Id.ToString());
lvitem.SubItems.Add(account.Mottagare);
lvitem.SubItems.Add(account.Konto);
lvitem.SubItems.Add(account.Belopp.ToString());
lvitem.SubItems.Add(account.BetalDatum.ToShortDateString());
lvitem.SubItems.Add(account.Avisering);
}
}
btnStartRead.Enabled = false;
btnStartRead.Visible = false;
}
} }
} }