From aef30274b288e5538c35320dd28bbc04cf6268aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tommy=20=C3=96man?= Date: Sun, 27 Aug 2023 22:00:11 +0200 Subject: [PATCH] Adjustments of copied control-names etc --- WinFormDi/ContainerConfig.cs | 1 + WinFormDi/MainWindow.Designer.cs | 1 + WinFormDi/MainWindow.cs | 4 +-- WinFormDi/WinFormDi.csproj | 2 +- WinFormDi/appsettings.json | 9 +++++-- WinFormDi/frmPayments.Designer.cs | 1 + WinFormDi/frmReadPayments.Designer.cs | 29 +++++++++++---------- WinFormDi/frmReadPayments.cs | 36 +++++++++++++++++++++++++-- 8 files changed, 63 insertions(+), 20 deletions(-) diff --git a/WinFormDi/ContainerConfig.cs b/WinFormDi/ContainerConfig.cs index 65b56a4..0851846 100644 --- a/WinFormDi/ContainerConfig.cs +++ b/WinFormDi/ContainerConfig.cs @@ -39,6 +39,7 @@ namespace WinFormDiApp .AddTransient() .AddTransient() .AddTransient() + .AddTransient() .AddTransient() .AddTransient() .AddTransient(); diff --git a/WinFormDi/MainWindow.Designer.cs b/WinFormDi/MainWindow.Designer.cs index 8f873e0..3bdd1a3 100644 --- a/WinFormDi/MainWindow.Designer.cs +++ b/WinFormDi/MainWindow.Designer.cs @@ -84,6 +84,7 @@ Controls.Add(goodbyeText); Controls.Add(helloText); Name = "MainWindow"; + StartPosition = FormStartPosition.CenterScreen; Text = "MainWindow"; FormClosing += MainWindow_FormClosing; Load += MainWindow_Load; diff --git a/WinFormDi/MainWindow.cs b/WinFormDi/MainWindow.cs index 7c2f621..462d6c3 100644 --- a/WinFormDi/MainWindow.cs +++ b/WinFormDi/MainWindow.cs @@ -18,8 +18,8 @@ namespace WinFormDiApp private readonly frmReadPayments _readPayments; public MainWindow( - IMessages messages, - frmPayments payments, + IMessages messages, + frmPayments payments, frmReadPayments readPayments ) { diff --git a/WinFormDi/WinFormDi.csproj b/WinFormDi/WinFormDi.csproj index 1670fdd..9717390 100644 --- a/WinFormDi/WinFormDi.csproj +++ b/WinFormDi/WinFormDi.csproj @@ -38,7 +38,7 @@ Always - Always + PreserveNewest diff --git a/WinFormDi/appsettings.json b/WinFormDi/appsettings.json index d43725e..c51253c 100644 --- a/WinFormDi/appsettings.json +++ b/WinFormDi/appsettings.json @@ -1,11 +1,16 @@ { + "EPPlus": { + "ExcelPackage": { + "LicenseContext": "Noncommercial" //The license context used + } + }, "ConnectionStrings": { "DatabaseConnection": "Data Source=.\\Local.db" }, "Logging": { "LogLevel": { - "Default" : "Warning" + "Default": "Warning" } }, - "AllowedHosts": "*" + "AllowedHosts": "*" } diff --git a/WinFormDi/frmPayments.Designer.cs b/WinFormDi/frmPayments.Designer.cs index c72685e..5438d60 100644 --- a/WinFormDi/frmPayments.Designer.cs +++ b/WinFormDi/frmPayments.Designer.cs @@ -97,6 +97,7 @@ Controls.Add(btnClose); Controls.Add(lvPayments); Name = "frmPayments"; + StartPosition = FormStartPosition.CenterScreen; Text = "frmPayments"; Load += frmPayments_Load; ResumeLayout(false); diff --git a/WinFormDi/frmReadPayments.Designer.cs b/WinFormDi/frmReadPayments.Designer.cs index 0728f06..885f8fa 100644 --- a/WinFormDi/frmReadPayments.Designer.cs +++ b/WinFormDi/frmReadPayments.Designer.cs @@ -36,7 +36,7 @@ ch5_Förfallodag = new ColumnHeader(); ch6_Avisering = new ColumnHeader(); btnClose = new Button(); - listView1 = new ListView(); + lvPayouts = new ListView(); columnHeader1 = new ColumnHeader(); columnHeader2 = new ColumnHeader(); columnHeader3 = new ColumnHeader(); @@ -100,17 +100,17 @@ btnClose.UseVisualStyleBackColor = true; btnClose.Click += btnClose_Click; // - // listView1 + // lvPayouts // - listView1.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - listView1.BackColor = Color.FromArgb(192, 255, 255); - listView1.Columns.AddRange(new ColumnHeader[] { columnHeader1, columnHeader2, columnHeader3, columnHeader4, columnHeader5, columnHeader6 }); - listView1.Location = new Point(28, 107); - listView1.Name = "listView1"; - listView1.Size = new Size(805, 286); - listView1.TabIndex = 2; - listView1.UseCompatibleStateImageBehavior = false; - listView1.View = View.Details; + lvPayouts.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + lvPayouts.BackColor = Color.FromArgb(192, 255, 255); + lvPayouts.Columns.AddRange(new ColumnHeader[] { columnHeader1, columnHeader2, columnHeader3, columnHeader4, columnHeader5, columnHeader6 }); + lvPayouts.Location = new Point(28, 107); + lvPayouts.Name = "lvPayouts"; + lvPayouts.Size = new Size(805, 286); + lvPayouts.TabIndex = 2; + lvPayouts.UseCompatibleStateImageBehavior = false; + lvPayouts.View = View.Details; // // columnHeader1 // @@ -176,6 +176,8 @@ btnStartRead.TabIndex = 5; btnStartRead.Text = "Starta Inläsning"; btnStartRead.UseVisualStyleBackColor = false; + btnStartRead.Visible = false; + btnStartRead.Click += btnStartRead_Click; // // frmReadPayments // @@ -185,9 +187,10 @@ Controls.Add(btnStartRead); Controls.Add(lblTransFileName); Controls.Add(btnChooseFile); - Controls.Add(listView1); + Controls.Add(lvPayouts); Controls.Add(btnClose); Name = "frmReadPayments"; + StartPosition = FormStartPosition.CenterScreen; Text = "frmReadPayments"; Load += frmReadPayments_Load; ResumeLayout(false); @@ -204,7 +207,7 @@ private ColumnHeader ch6_Avisering; private Button btnClose; private ColumnHeader ch5_Förfallodag; - private ListView listView1; + private ListView lvPayouts; private ColumnHeader columnHeader1; private ColumnHeader columnHeader2; private ColumnHeader columnHeader3; diff --git a/WinFormDi/frmReadPayments.cs b/WinFormDi/frmReadPayments.cs index 0bbf6b4..a7da9ac 100644 --- a/WinFormDi/frmReadPayments.cs +++ b/WinFormDi/frmReadPayments.cs @@ -1,15 +1,21 @@ -using WinFormDiApp.BLI; +using Microsoft.Extensions.Logging; +using WinFormDiApp.BLI; +using WinFormDiApp.BLR; namespace WinFormDiApp { public partial class frmReadPayments : Form { private readonly IAccountRecordRepository _accountRecordRepository; + private readonly IReadingIn _readingIn; + private readonly ILogger _logger; - public frmReadPayments(IAccountRecordRepository accountRecordRepository) + public frmReadPayments(IAccountRecordRepository accountRecordRepository, IReadingIn readingIn, ILogger logger) { InitializeComponent(); _accountRecordRepository = accountRecordRepository; + _readingIn = readingIn; + _logger = logger; } @@ -39,8 +45,34 @@ namespace WinFormDiApp if (ofChooseFile.ShowDialog() == DialogResult.OK) { lblTransFileName.Text = ofChooseFile.FileName; + btnStartRead.Visible = 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; + } } }