From 67e0b360fa58b1730e7e1df93320da155a83b9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9B=D0=B5=D0=BE=D0=BD=D0=B8=D0=B4=20=D0=9C=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=D1=84=D0=B5=D0=B5=D0=B2?= Date: Mon, 20 May 2024 18:04:17 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../JewelryStoreDatabaseImplement.csproj | 2 +- .../JewelryStoreListImplement.csproj | 2 +- .../JewerlyStoreFileImplement.csproj | 2 +- .../JewerlyStoreView/FormImplementers.cs | 21 ++++++---------- JewelryStore/JewerlyStoreView/FormJewel.cs | 21 +--------------- JewelryStore/JewerlyStoreView/FormJewels.cs | 25 ++++++++----------- JewelryStore/JewerlyStoreView/Program.cs | 6 ++--- 8 files changed, 25 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index ca1c7a3..b600018 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.user *.userosscache *.sln.docstates +ImplementationExtensions # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs diff --git a/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj b/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj index e860ecd..b542687 100644 --- a/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj +++ b/JewelryStore/JewelryStoreDatabaseImplement/JewelryStoreDatabaseImplement.csproj @@ -27,7 +27,7 @@ - + diff --git a/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj b/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj index 467c70e..f430e9a 100644 --- a/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj +++ b/JewelryStore/JewelryStoreListImplement/JewelryStoreListImplement.csproj @@ -19,7 +19,7 @@ - + diff --git a/JewelryStore/JewerlyStoreFileImplement/JewerlyStoreFileImplement.csproj b/JewelryStore/JewerlyStoreFileImplement/JewerlyStoreFileImplement.csproj index 70ac788..6c65867 100644 --- a/JewelryStore/JewerlyStoreFileImplement/JewerlyStoreFileImplement.csproj +++ b/JewelryStore/JewerlyStoreFileImplement/JewerlyStoreFileImplement.csproj @@ -19,7 +19,7 @@ - + diff --git a/JewelryStore/JewerlyStoreView/FormImplementers.cs b/JewelryStore/JewerlyStoreView/FormImplementers.cs index 2df5767..d0f2c33 100644 --- a/JewelryStore/JewerlyStoreView/FormImplementers.cs +++ b/JewelryStore/JewerlyStoreView/FormImplementers.cs @@ -1,5 +1,6 @@ using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using JewelryStoreView; using Microsoft.Extensions.Logging; using System; @@ -55,13 +56,10 @@ namespace JewerlyStoreView /// private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } @@ -74,14 +72,11 @@ namespace JewerlyStoreView { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } diff --git a/JewelryStore/JewerlyStoreView/FormJewel.cs b/JewelryStore/JewerlyStoreView/FormJewel.cs index 1ad3d79..3b263ec 100644 --- a/JewelryStore/JewerlyStoreView/FormJewel.cs +++ b/JewelryStore/JewerlyStoreView/FormJewel.cs @@ -101,26 +101,7 @@ namespace JewelryStoreView private void ButtonRefresh_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) - { - var service = Program.ServiceProvider?.GetService(typeof(FormJewelComponent)); - if (service is FormJewelComponent form) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _JewelComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - _JewelComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } - } + LoadData(); // зачем } private void ButtonDelete_Click(object sender, EventArgs e) diff --git a/JewelryStore/JewerlyStoreView/FormJewels.cs b/JewelryStore/JewerlyStoreView/FormJewels.cs index 86f8dad..483871a 100644 --- a/JewelryStore/JewerlyStoreView/FormJewels.cs +++ b/JewelryStore/JewerlyStoreView/FormJewels.cs @@ -1,5 +1,6 @@ using JewelryStoreContracts.BindingModels; using JewelryStoreContracts.BusinessLogicsContracts; +using JewelryStoreContracts.DI; using JewerlyStoreView; using Microsoft.Extensions.Logging; using System; @@ -42,28 +43,22 @@ namespace JewelryStoreView private void ButtonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormJewel)); - if (service is FormJewel form) + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } - private void ButtonRefresh_Click(object sender, EventArgs e) + private void ButtonUpdate_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormJewel)); - if (service is FormJewel form) + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } + LoadData(); } } } @@ -96,7 +91,7 @@ namespace JewelryStoreView } } - private void ButtonUpdate_Click(object sender, EventArgs e) + private void ButtonRefresh_Click(object sender, EventArgs e) { LoadData(); } diff --git a/JewelryStore/JewerlyStoreView/Program.cs b/JewelryStore/JewerlyStoreView/Program.cs index cdf4853..27aa638 100644 --- a/JewelryStore/JewerlyStoreView/Program.cs +++ b/JewelryStore/JewerlyStoreView/Program.cs @@ -17,8 +17,6 @@ namespace JewelryStoreView { internal static class Program { - private static ServiceProvider? _serviceProvider; - public static ServiceProvider? ServiceProvider => _serviceProvider; /// /// The main entry point for the application. /// @@ -93,6 +91,6 @@ namespace JewelryStoreView DependencyManager.Instance.RegisterType(); } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); - } + private static void MailCheck(object obj) => DependencyManager.Instance?.Resolve()?.MailCheck(); + } } \ No newline at end of file