From 66238fe6f286637708036363a46b4e17edeb3a7b Mon Sep 17 00:00:00 2001 From: dex_moth Date: Tue, 18 Jun 2024 15:56:18 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D1=83=D0=B6=D0=BD=D1=8B=20=D0=B4=D0=B4?= =?UTF-8?q?=D0=BB-=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 4 + FishFactory/DataGridViewExtension.cs | 44 ++ FishFactory/FishFactory.csproj | 4 + FishFactory/FishFactory.sln | 2 +- FishFactory/Forms/FormCanned.cs | 78 ++-- FishFactory/Forms/FormCanneds.cs | 45 +- FishFactory/Forms/FormClients.cs | 12 +- FishFactory/Forms/FormComponent.cs | 12 +- FishFactory/Forms/FormComponents.cs | 53 +-- FishFactory/Forms/FormImplementers.cs | 27 +- FishFactory/Forms/FormMails.cs | 11 +- FishFactory/Forms/FormMain.Designer.cs | 397 +++++++++--------- FishFactory/Forms/FormMain.cs | 300 +++++++------ FishFactory/Program.cs | 128 +++--- .../BusinessLogic/BackUpLogic.cs | 94 +++++ .../Attributes/ColumnAttribute.cs | 22 + .../Attributes/GridViewAutoSize.cs | 14 + .../BindingModels/BackUpSaveBindingModel.cs | 7 + .../BindingModels/MessageInfoBindingModel.cs | 3 +- .../ServiceDependencyContainer.cs | 58 +++ .../BusinessLogicsContracts/IBackUpLogic.cs | 9 + .../DependencyInjection/DependencyManager.cs | 62 +++ .../IDependencyContainer.cs | 28 ++ .../IImplementationExtension.cs | 14 + .../ServiceDependencyContainer.cs | 57 +++ .../ServiceProviderLoader.cs | 52 +++ .../UnityDependencyContainer.cs | 38 ++ .../FishFactoryContracts.csproj | 6 + .../StoragesContracts/IBackUpInfo.cs | 8 + .../ViewModels/CannedViewModel.cs | 22 +- .../ViewModels/ClientViewModel.cs | 19 +- .../ViewModels/ComponentViewModel.cs | 20 +- .../ViewModels/ImplementerViewModel.cs | 22 +- .../ViewModels/MessageInfoViewModel.cs | 27 +- .../ViewModels/OrderViewModel.cs | 45 +- .../ViewModels/ReportOrdersViewModel.cs | 5 +- .../Models/IMessageInfoModel.cs | 2 +- .../FishFactoryDatabaseImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 26 ++ .../Implements/ImplementationExtension.cs | 21 + FishFactoryDatabaseImplement/Models/Canned.cs | 14 +- FishFactoryDatabaseImplement/Models/Client.cs | 20 +- .../Models/Component.cs | 13 +- .../Models/Implementer.cs | 19 +- .../Models/MessageInfo.cs | 17 +- FishFactoryDatabaseImplement/Models/Order.cs | 21 +- .../FishFactoryFileImplement.csproj | 4 + .../Implements/BackUpInfo.cs | 39 ++ .../Implements/ImplementationExtension.cs | 21 + FishFactoryFileImplement/Models/Canned.cs | 17 +- FishFactoryFileImplement/Models/Client.cs | 4 +- FishFactoryFileImplement/Models/Component.cs | 13 +- .../Models/Implementer.cs | 24 +- .../Models/MessageInfo.cs | 29 +- FishFactoryFileImplement/Models/Order.cs | 29 +- .../FishFactoryListImplement.csproj | 3 + .../Implements/BackUpInfo.cs | 17 + .../Implements/ListImplementationExtension.cs | 20 + .../Models/MessageInfo.cs | 7 +- 59 files changed, 1408 insertions(+), 725 deletions(-) create mode 100644 FishFactory/DataGridViewExtension.cs create mode 100644 FishFactoryBusinessLogic/BusinessLogic/BackUpLogic.cs create mode 100644 FishFactoryContracts/Attributes/ColumnAttribute.cs create mode 100644 FishFactoryContracts/Attributes/GridViewAutoSize.cs create mode 100644 FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs create mode 100644 FishFactoryContracts/BindingModels/ServiceDependencyContainer.cs create mode 100644 FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs create mode 100644 FishFactoryContracts/DependencyInjection/DependencyManager.cs create mode 100644 FishFactoryContracts/DependencyInjection/IDependencyContainer.cs create mode 100644 FishFactoryContracts/DependencyInjection/IImplementationExtension.cs create mode 100644 FishFactoryContracts/DependencyInjection/ServiceDependencyContainer.cs create mode 100644 FishFactoryContracts/DependencyInjection/ServiceProviderLoader.cs create mode 100644 FishFactoryContracts/DependencyInjection/UnityDependencyContainer.cs create mode 100644 FishFactoryContracts/StoragesContracts/IBackUpInfo.cs create mode 100644 FishFactoryDatabaseImplement/Implements/BackUpInfo.cs create mode 100644 FishFactoryDatabaseImplement/Implements/ImplementationExtension.cs create mode 100644 FishFactoryFileImplement/Implements/BackUpInfo.cs create mode 100644 FishFactoryFileImplement/Implements/ImplementationExtension.cs create mode 100644 FishFactoryListImplement/Implements/BackUpInfo.cs create mode 100644 FishFactoryListImplement/Implements/ListImplementationExtension.cs diff --git a/.gitignore b/.gitignore index d38a353..8e7aec0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,10 @@ # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs +# dll файлы +*.dll +/ImplementationExtensions + # Mono auto generated files mono_crash.* diff --git a/FishFactory/DataGridViewExtension.cs b/FishFactory/DataGridViewExtension.cs new file mode 100644 index 0000000..853b809 --- /dev/null +++ b/FishFactory/DataGridViewExtension.cs @@ -0,0 +1,44 @@ +using FishFactoryContracts.Attributes; + +namespace FishFactory +{ + public static class DataGridViewExtension + { + public static void FillandConfigGrid(this DataGridView grid, List? data) + { + if (data == null) + { + return; + } + grid.DataSource = data; + var type = typeof(T); + var properties = type.GetProperties(); + foreach (DataGridViewColumn column in grid.Columns) + { + var property = properties.FirstOrDefault(x => x.Name == column.Name); + if (property == null) + { + throw new InvalidOperationException($"В типе {type.Name} не найдено свойство с именем {column.Name}"); + } + var attribute = property.GetCustomAttributes(typeof(ColumnAttribute), true)?.SingleOrDefault(); + if (attribute == null) + { + throw new InvalidOperationException($"Не найден атрибут типа ColumnAttribute для свойства {property.Name}"); + } + if (attribute is ColumnAttribute columnAttr) + { + column.HeaderText = columnAttr.Title; + column.Visible = columnAttr.Visible; + if (columnAttr.IsUseAutoSize) + { + column.AutoSizeMode = (DataGridViewAutoSizeColumnMode)Enum.Parse(typeof(DataGridViewAutoSizeColumnMode), columnAttr.GridViewAutoSize.ToString()); + } + else + { + column.Width = columnAttr.Width; + } + } + } + } + } +} diff --git a/FishFactory/FishFactory.csproj b/FishFactory/FishFactory.csproj index 8e250dc..84a3c38 100644 --- a/FishFactory/FishFactory.csproj +++ b/FishFactory/FishFactory.csproj @@ -50,4 +50,8 @@ + + + + \ No newline at end of file diff --git a/FishFactory/FishFactory.sln b/FishFactory/FishFactory.sln index 658f4d6..a3d2b3b 100644 --- a/FishFactory/FishFactory.sln +++ b/FishFactory/FishFactory.sln @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryDatabaseImplemen EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryRestApi", "..\FishFactoryRestApi\FishFactoryRestApi.csproj", "{AB6068FA-9FA7-40E9-9A2F-2BF7B97AD621}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishFactoryClientApp", "..\FishFactoryClientApp\FishFactoryClientApp.csproj", "{76A3D175-F30D-46ED-94C7-7D4272D5E97D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FishFactoryClientApp", "..\FishFactoryClientApp\FishFactoryClientApp.csproj", "{76A3D175-F30D-46ED-94C7-7D4272D5E97D}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/FishFactory/Forms/FormCanned.cs b/FishFactory/Forms/FormCanned.cs index c6dd870..49240b2 100644 --- a/FishFactory/Forms/FormCanned.cs +++ b/FishFactory/Forms/FormCanned.cs @@ -3,6 +3,7 @@ using Microsoft.Extensions.Logging; using FishFactoryContracts.BusinessLogicsContracts; using FishFactoryContracts.SearchModels; using FishFactoryContracts.BindingModels; +using FishFactoryContracts.DependencyInjection; namespace FishFactory.Forms { @@ -67,51 +68,42 @@ namespace FishFactory.Forms } private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent)); - if (service is FormCannedComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count} ", form.ComponentModel.ComponentName, form.Count); - if (_CannedComponents.ContainsKey(form.Id)) - { - _CannedComponents[form.Id] = (form.ComponentModel, form.Count); - } - else - { - _CannedComponents.Add(form.Id, (form.ComponentModel, form.Count)); - } - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Добавление нового компонента: {ComponentName} - {Count}", form.ComponentModel.ComponentName, form.Count); + if (_CannedComponents.ContainsKey(form.Id)) + { + _CannedComponents[form.Id] = (form.ComponentModel, form.Count); + } + else + { + _CannedComponents.Add(form.Id, (form.ComponentModel, form.Count)); + } + LoadData(); + } + } private void buttonUpd_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCannedComponent)); - if (service is FormCannedComponent form) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); - form.Id = id; - form.Count = _CannedComponents[id].Item2; - if (form.ShowDialog() == DialogResult.OK) - { - if (form.ComponentModel == null) - { - return; - } - _logger.LogInformation("Изменение компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); - _CannedComponents[form.Id] = (form.ComponentModel, form.Count); - LoadData(); - } - } - } - } + var form = DependencyManager.Instance.Resolve(); + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value); + form.Id = id; + form.Count = _CannedComponents[id].Item2; + if (form.ShowDialog() == DialogResult.OK) + { + if (form.ComponentModel == null) + { + return; + } + _logger.LogInformation("Изменение компонента: {ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count); + _CannedComponents[form.Id] = (form.ComponentModel, form.Count); + LoadData(); + } + } private void buttonDel_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) diff --git a/FishFactory/Forms/FormCanneds.cs b/FishFactory/Forms/FormCanneds.cs index 6cbeb50..a770ef0 100644 --- a/FishFactory/Forms/FormCanneds.cs +++ b/FishFactory/Forms/FormCanneds.cs @@ -10,6 +10,7 @@ using System.Windows.Forms; using FishFactory; using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DependencyInjection; using Microsoft.Extensions.Logging; namespace FishFactory.Forms @@ -34,15 +35,8 @@ namespace FishFactory.Forms { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["CannedComponents"].Visible = false; - dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка консерв"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка консерв"); } catch (Exception ex) { @@ -52,31 +46,22 @@ namespace FishFactory.Forms private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormCanned)); - if (service is FormCanned form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } } private void buttonUpd_Click(object sender, EventArgs e) { - if (dataGridView.SelectedRows.Count == 1) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCanned)); - if (service is FormCanned form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } - } + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } private void buttonDel_Click(object sender, EventArgs e) { diff --git a/FishFactory/Forms/FormClients.cs b/FishFactory/Forms/FormClients.cs index a0e202c..e2d2a45 100644 --- a/FishFactory/Forms/FormClients.cs +++ b/FishFactory/Forms/FormClients.cs @@ -26,16 +26,8 @@ namespace FishFactory.Forms { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Email"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["Password"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка клиентов"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка клиентов"); } catch (Exception ex) { diff --git a/FishFactory/Forms/FormComponent.cs b/FishFactory/Forms/FormComponent.cs index 86b613f..57f0fed 100644 --- a/FishFactory/Forms/FormComponent.cs +++ b/FishFactory/Forms/FormComponent.cs @@ -1,15 +1,5 @@ -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; -using Microsoft.Extensions.Logging; +using Microsoft.Extensions.Logging; using FishFactoryContracts.BusinessLogicsContracts; -using Microsoft.VisualBasic.Logging; using FishFactoryContracts.SearchModels; using FishFactoryContracts.BindingModels; diff --git a/FishFactory/Forms/FormComponents.cs b/FishFactory/Forms/FormComponents.cs index ef3531a..bc3e1f4 100644 --- a/FishFactory/Forms/FormComponents.cs +++ b/FishFactory/Forms/FormComponents.cs @@ -1,15 +1,8 @@ using FishFactoryContracts.BindingModels; +using FishFactoryContracts.DependencyInjection; +using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; using Microsoft.Extensions.Logging; -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 FishFactory.Forms { @@ -33,14 +26,8 @@ namespace FishFactory.Forms { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка компонентов"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка компонентов"); } catch (Exception ex) { @@ -51,30 +38,24 @@ namespace FishFactory.Forms private void buttonAdd_Click(object sender, EventArgs e) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } private void buttonUpd_Click(object sender, EventArgs e) { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormComponent)); - if (service is FormComponent form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } } private void buttonDel_Click(object sender, EventArgs e) diff --git a/FishFactory/Forms/FormImplementers.cs b/FishFactory/Forms/FormImplementers.cs index 50f1271..dcffe7a 100644 --- a/FishFactory/Forms/FormImplementers.cs +++ b/FishFactory/Forms/FormImplementers.cs @@ -1,5 +1,6 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DependencyInjection; using Microsoft.Extensions.Logging; namespace FishFactory.Forms @@ -25,14 +26,8 @@ namespace FishFactory.Forms { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["Id"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка исполнителей"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка исполнителей"); } catch (Exception ex) { @@ -57,16 +52,12 @@ namespace FishFactory.Forms { if (dataGridView.SelectedRows.Count == 1) { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementer)); - if (service is FormImplementer form) - { - form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - if (form.ShowDialog() == DialogResult.OK) - { - LoadData(); - } - } - } + var form = DependencyManager.Instance.Resolve(); + if (form.ShowDialog() == DialogResult.OK) + { + LoadData(); + } + } } private void buttonDel_Click(object sender, EventArgs e) diff --git a/FishFactory/Forms/FormMails.cs b/FishFactory/Forms/FormMails.cs index 518c899..3957ea9 100644 --- a/FishFactory/Forms/FormMails.cs +++ b/FishFactory/Forms/FormMails.cs @@ -28,15 +28,8 @@ namespace FishFactory.Forms { try { - var list = _logic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["MessageId"].Visible = false; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["Body"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - _logger.LogInformation("Загрузка почтовых собщений"); + dataGridView.FillandConfigGrid(_logic.ReadList(null)); + _logger.LogInformation("Загрузка почтовых собщений"); } catch (Exception ex) { diff --git a/FishFactory/Forms/FormMain.Designer.cs b/FishFactory/Forms/FormMain.Designer.cs index 7cce468..6490f8b 100644 --- a/FishFactory/Forms/FormMain.Designer.cs +++ b/FishFactory/Forms/FormMain.Designer.cs @@ -20,202 +20,210 @@ base.Dispose(disposing); } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); - toolStrip1 = new ToolStrip(); - toolStripDropDownButton1 = new ToolStripDropDownButton(); - компонентыToolStripMenuItem = new ToolStripMenuItem(); - консервыToolStripMenuItem = new ToolStripMenuItem(); - клиентыToolStripMenuItem = new ToolStripMenuItem(); - исполнителиToolStripMenuItem = new ToolStripMenuItem(); - toolStripDropDownButton2 = new ToolStripDropDownButton(); - списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); - компонентыПоКонсервамToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); - ЗапускРаботToolStripLabel = new ToolStripLabel(); - buttonCreateOrder = new Button(); - buttonIssuedOrder = new Button(); - buttonRef = new Button(); - dataGridView = new DataGridView(); - ПисьмаtoolStripLabel = new ToolStripLabel(); - toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); - SuspendLayout(); - // - // toolStrip1 - // - toolStrip1.ImageScalingSize = new Size(20, 20); - toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2, ЗапускРаботToolStripLabel, ПисьмаtoolStripLabel }); - toolStrip1.Location = new Point(0, 0); - toolStrip1.Name = "toolStrip1"; - toolStrip1.Size = new Size(1265, 26); - toolStrip1.TabIndex = 0; - toolStrip1.Text = "toolStrip1"; - // - // toolStripDropDownButton1 - // - toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text; - toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem }); - toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); - toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; - toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - toolStripDropDownButton1.Size = new Size(101, 23); - toolStripDropDownButton1.Text = "Справочник"; - // - // компонентыToolStripMenuItem - // - компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - компонентыToolStripMenuItem.Size = new Size(171, 26); - компонентыToolStripMenuItem.Text = "Компоненты"; - компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; - // - // консервыToolStripMenuItem - // - консервыToolStripMenuItem.Name = "консервыToolStripMenuItem"; - консервыToolStripMenuItem.Size = new Size(171, 26); - консервыToolStripMenuItem.Text = "Консервы"; - консервыToolStripMenuItem.Click += консервыToolStripMenuItem_Click; - // - // клиентыToolStripMenuItem - // - клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; - клиентыToolStripMenuItem.Size = new Size(171, 26); - клиентыToolStripMenuItem.Text = "Клиенты"; - клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; - // - // исполнителиToolStripMenuItem - // - исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; - исполнителиToolStripMenuItem.Size = new Size(171, 26); - исполнителиToolStripMenuItem.Text = "Исполнители"; - исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; - // - // toolStripDropDownButton2 - // - toolStripDropDownButton2.DisplayStyle = ToolStripItemDisplayStyle.Text; - toolStripDropDownButton2.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоКонсервамToolStripMenuItem, списокЗаказовToolStripMenuItem }); - toolStripDropDownButton2.Image = (Image)resources.GetObject("toolStripDropDownButton2.Image"); - toolStripDropDownButton2.ImageTransparentColor = Color.Magenta; - toolStripDropDownButton2.Name = "toolStripDropDownButton2"; - toolStripDropDownButton2.Size = new Size(71, 23); - toolStripDropDownButton2.Text = "Отчёты"; - // - // списокКомпонентовToolStripMenuItem - // - списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; - списокКомпонентовToolStripMenuItem.Size = new Size(261, 26); - списокКомпонентовToolStripMenuItem.Text = "Список консерв"; - списокКомпонентовToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click; - // - // компонентыПоКонсервамToolStripMenuItem - // - компонентыПоКонсервамToolStripMenuItem.Name = "компонентыПоКонсервамToolStripMenuItem"; - компонентыПоКонсервамToolStripMenuItem.Size = new Size(261, 26); - компонентыПоКонсервамToolStripMenuItem.Text = "Компоненты по консервам"; - компонентыПоКонсервамToolStripMenuItem.Click += компонентыПоИзделиямToolStripMenuItem_Click; - // - // списокЗаказовToolStripMenuItem - // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(261, 26); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; - списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; - // - // ЗапускРаботToolStripLabel - // - ЗапускРаботToolStripLabel.Name = "ЗапускРаботToolStripLabel"; - ЗапускРаботToolStripLabel.Size = new Size(93, 23); - ЗапускРаботToolStripLabel.Text = "Запуск работ"; - ЗапускРаботToolStripLabel.Click += ЗапускРаботToolStripLabel_Click; - // - // buttonCreateOrder - // - buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonCreateOrder.Location = new Point(1078, 71); - buttonCreateOrder.Margin = new Padding(3, 4, 3, 4); - buttonCreateOrder.Name = "buttonCreateOrder"; - buttonCreateOrder.Size = new Size(161, 30); - buttonCreateOrder.TabIndex = 1; - buttonCreateOrder.Text = "Создать заказ"; - buttonCreateOrder.UseVisualStyleBackColor = true; - buttonCreateOrder.Click += buttonCreateOrder_Click; - // - // buttonIssuedOrder - // - buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonIssuedOrder.Location = new Point(1078, 125); - buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4); - buttonIssuedOrder.Name = "buttonIssuedOrder"; - buttonIssuedOrder.Size = new Size(161, 30); - buttonIssuedOrder.TabIndex = 4; - buttonIssuedOrder.Text = "Заказ выдан"; - buttonIssuedOrder.UseVisualStyleBackColor = true; - buttonIssuedOrder.Click += buttonIssuedOrder_Click; - // - // buttonRef - // - buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right; - buttonRef.Location = new Point(1078, 177); - buttonRef.Margin = new Padding(3, 4, 3, 4); - buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(161, 30); - buttonRef.TabIndex = 5; - buttonRef.Text = "Обновить список"; - buttonRef.UseVisualStyleBackColor = true; - buttonRef.Click += buttonRef_Click; - // - // dataGridView - // - dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(0, 25); - dataGridView.Margin = new Padding(3, 4, 3, 4); - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 24; - dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(1054, 559); - dataGridView.TabIndex = 6; - // - // ПисьмаtoolStripLabel - // - ПисьмаtoolStripLabel.Name = "ПисьмаtoolStripLabel"; - ПисьмаtoolStripLabel.Size = new Size(128, 23); - ПисьмаtoolStripLabel.Text = "Письма (призрака)"; - ПисьмаtoolStripLabel.Click += ПисьмаtoolStripLabel_Click; - // - // FormMain - // - AutoScaleDimensions = new SizeF(8F, 19F); - AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(1265, 584); - Controls.Add(dataGridView); - Controls.Add(buttonRef); - Controls.Add(buttonIssuedOrder); - Controls.Add(buttonCreateOrder); - Controls.Add(toolStrip1); - Margin = new Padding(3, 4, 3, 4); - Name = "FormMain"; - Text = "Рыбный завод"; - Load += FormMain_Load; - toolStrip1.ResumeLayout(false); - toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); - ResumeLayout(false); - PerformLayout(); - } + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); + toolStrip1 = new ToolStrip(); + toolStripDropDownButton1 = new ToolStripDropDownButton(); + компонентыToolStripMenuItem = new ToolStripMenuItem(); + консервыToolStripMenuItem = new ToolStripMenuItem(); + клиентыToolStripMenuItem = new ToolStripMenuItem(); + исполнителиToolStripMenuItem = new ToolStripMenuItem(); + toolStripDropDownButton2 = new ToolStripDropDownButton(); + списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); + компонентыПоКонсервамToolStripMenuItem = new ToolStripMenuItem(); + списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + ЗапускРаботToolStripLabel = new ToolStripLabel(); + ПисьмаtoolStripLabel = new ToolStripLabel(); + buttonCreateOrder = new Button(); + buttonIssuedOrder = new Button(); + buttonRef = new Button(); + dataGridView = new DataGridView(); + СоздатьБекапtoolStripLabel = new ToolStripLabel(); + toolStrip1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // toolStrip1 + // + toolStrip1.ImageScalingSize = new Size(20, 20); + toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, toolStripDropDownButton2, ЗапускРаботToolStripLabel, ПисьмаtoolStripLabel, СоздатьБекапtoolStripLabel }); + toolStrip1.Location = new Point(0, 0); + toolStrip1.Name = "toolStrip1"; + toolStrip1.Size = new Size(1265, 26); + toolStrip1.TabIndex = 0; + toolStrip1.Text = "toolStrip1"; + // + // toolStripDropDownButton1 + // + toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text; + toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { компонентыToolStripMenuItem, консервыToolStripMenuItem, клиентыToolStripMenuItem, исполнителиToolStripMenuItem }); + toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); + toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; + toolStripDropDownButton1.Name = "toolStripDropDownButton1"; + toolStripDropDownButton1.Size = new Size(101, 23); + toolStripDropDownButton1.Text = "Справочник"; + // + // компонентыToolStripMenuItem + // + компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; + компонентыToolStripMenuItem.Size = new Size(171, 26); + компонентыToolStripMenuItem.Text = "Компоненты"; + компонентыToolStripMenuItem.Click += компонентыToolStripMenuItem_Click; + // + // консервыToolStripMenuItem + // + консервыToolStripMenuItem.Name = "консервыToolStripMenuItem"; + консервыToolStripMenuItem.Size = new Size(171, 26); + консервыToolStripMenuItem.Text = "Консервы"; + консервыToolStripMenuItem.Click += консервыToolStripMenuItem_Click; + // + // клиентыToolStripMenuItem + // + клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem"; + клиентыToolStripMenuItem.Size = new Size(171, 26); + клиентыToolStripMenuItem.Text = "Клиенты"; + клиентыToolStripMenuItem.Click += клиентыToolStripMenuItem_Click; + // + // исполнителиToolStripMenuItem + // + исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem"; + исполнителиToolStripMenuItem.Size = new Size(171, 26); + исполнителиToolStripMenuItem.Text = "Исполнители"; + исполнителиToolStripMenuItem.Click += исполнителиToolStripMenuItem_Click; + // + // toolStripDropDownButton2 + // + toolStripDropDownButton2.DisplayStyle = ToolStripItemDisplayStyle.Text; + toolStripDropDownButton2.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоКонсервамToolStripMenuItem, списокЗаказовToolStripMenuItem }); + toolStripDropDownButton2.Image = (Image)resources.GetObject("toolStripDropDownButton2.Image"); + toolStripDropDownButton2.ImageTransparentColor = Color.Magenta; + toolStripDropDownButton2.Name = "toolStripDropDownButton2"; + toolStripDropDownButton2.Size = new Size(71, 23); + toolStripDropDownButton2.Text = "Отчёты"; + // + // списокКомпонентовToolStripMenuItem + // + списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; + списокКомпонентовToolStripMenuItem.Size = new Size(261, 26); + списокКомпонентовToolStripMenuItem.Text = "Список консерв"; + списокКомпонентовToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click; + // + // компонентыПоКонсервамToolStripMenuItem + // + компонентыПоКонсервамToolStripMenuItem.Name = "компонентыПоКонсервамToolStripMenuItem"; + компонентыПоКонсервамToolStripMenuItem.Size = new Size(261, 26); + компонентыПоКонсервамToolStripMenuItem.Text = "Компоненты по консервам"; + компонентыПоКонсервамToolStripMenuItem.Click += компонентыПоИзделиямToolStripMenuItem_Click; + // + // списокЗаказовToolStripMenuItem + // + списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + списокЗаказовToolStripMenuItem.Size = new Size(261, 26); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; + списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; + // + // ЗапускРаботToolStripLabel + // + ЗапускРаботToolStripLabel.Name = "ЗапускРаботToolStripLabel"; + ЗапускРаботToolStripLabel.Size = new Size(93, 23); + ЗапускРаботToolStripLabel.Text = "Запуск работ"; + ЗапускРаботToolStripLabel.Click += ЗапускРаботToolStripLabel_Click; + // + // ПисьмаtoolStripLabel + // + ПисьмаtoolStripLabel.Name = "ПисьмаtoolStripLabel"; + ПисьмаtoolStripLabel.Size = new Size(128, 23); + ПисьмаtoolStripLabel.Text = "Письма (призрака)"; + ПисьмаtoolStripLabel.Click += ПисьмаtoolStripLabel_Click; + // + // buttonCreateOrder + // + buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonCreateOrder.Location = new Point(1078, 71); + buttonCreateOrder.Margin = new Padding(3, 4, 3, 4); + buttonCreateOrder.Name = "buttonCreateOrder"; + buttonCreateOrder.Size = new Size(161, 30); + buttonCreateOrder.TabIndex = 1; + buttonCreateOrder.Text = "Создать заказ"; + buttonCreateOrder.UseVisualStyleBackColor = true; + buttonCreateOrder.Click += buttonCreateOrder_Click; + // + // buttonIssuedOrder + // + buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonIssuedOrder.Location = new Point(1078, 125); + buttonIssuedOrder.Margin = new Padding(3, 4, 3, 4); + buttonIssuedOrder.Name = "buttonIssuedOrder"; + buttonIssuedOrder.Size = new Size(161, 30); + buttonIssuedOrder.TabIndex = 4; + buttonIssuedOrder.Text = "Заказ выдан"; + buttonIssuedOrder.UseVisualStyleBackColor = true; + buttonIssuedOrder.Click += buttonIssuedOrder_Click; + // + // buttonRef + // + buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right; + buttonRef.Location = new Point(1078, 177); + buttonRef.Margin = new Padding(3, 4, 3, 4); + buttonRef.Name = "buttonRef"; + buttonRef.Size = new Size(161, 30); + buttonRef.TabIndex = 5; + buttonRef.Text = "Обновить список"; + buttonRef.UseVisualStyleBackColor = true; + buttonRef.Click += buttonRef_Click; + // + // dataGridView + // + dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Location = new Point(0, 25); + dataGridView.Margin = new Padding(3, 4, 3, 4); + dataGridView.Name = "dataGridView"; + dataGridView.ReadOnly = true; + dataGridView.RowHeadersWidth = 51; + dataGridView.RowTemplate.Height = 24; + dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dataGridView.Size = new Size(1054, 559); + dataGridView.TabIndex = 6; + // + // СоздатьБекапtoolStripLabel + // + СоздатьБекапtoolStripLabel.Name = "СоздатьБекапtoolStripLabel"; + СоздатьБекапtoolStripLabel.Size = new Size(101, 23); + СоздатьБекапtoolStripLabel.Text = "Создать бекап"; + СоздатьБекапtoolStripLabel.Click += СоздатьБекапtoolStripLabel_Click; + // + // FormMain + // + AutoScaleDimensions = new SizeF(8F, 19F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1265, 584); + Controls.Add(dataGridView); + Controls.Add(buttonRef); + Controls.Add(buttonIssuedOrder); + Controls.Add(buttonCreateOrder); + Controls.Add(toolStrip1); + Margin = new Padding(3, 4, 3, 4); + Name = "FormMain"; + Text = "Рыбный завод"; + Load += FormMain_Load; + toolStrip1.ResumeLayout(false); + toolStrip1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + PerformLayout(); + } - #endregion + #endregion - private ToolStrip toolStrip1; + private ToolStrip toolStrip1; private Button buttonCreateOrder; private Button buttonIssuedOrder; private Button buttonRef; @@ -231,5 +239,6 @@ private ToolStripLabel ЗапускРаботToolStripLabel; private ToolStripMenuItem исполнителиToolStripMenuItem; private ToolStripLabel ПисьмаtoolStripLabel; - } + private ToolStripLabel СоздатьБекапtoolStripLabel; + } } \ No newline at end of file diff --git a/FishFactory/Forms/FormMain.cs b/FishFactory/Forms/FormMain.cs index 506f2ac..496793f 100644 --- a/FishFactory/Forms/FormMain.cs +++ b/FishFactory/Forms/FormMain.cs @@ -1,176 +1,164 @@ -using FishFactoryContracts.BindingModels; +using FishFactoryBusinessLogic.BusinessLogic; +using FishFactoryContracts.BindingModels; using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.DependencyInjection; using Microsoft.Extensions.Logging; namespace FishFactory.Forms { - public partial class FormMain : Form - { - private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - private readonly IReportLogic _reportLogic; - private readonly IWorkProcess _workProcess; + public partial class FormMain : Form + { + private readonly ILogger _logger; + private readonly IOrderLogic _orderLogic; + private readonly IReportLogic _reportLogic; + private readonly IWorkProcess _workProcess; + private readonly IBackUpLogic _backUpLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess) - { - InitializeComponent(); - _logger = logger; - _orderLogic = orderLogic; - _reportLogic = reportLogic; + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic, + IWorkProcess workProcess, IBackUpLogic backUpLogic) + { + InitializeComponent(); + _logger = logger; + _orderLogic = orderLogic; + _reportLogic = reportLogic; _workProcess = workProcess; + _backUpLogic = backUpLogic; + } + private void FormMain_Load(object sender, EventArgs e) + { + LoadData(); + } + private void LoadData() + { + _logger.LogInformation("Загрузка заказов"); + try + { + dataGridView.FillandConfigGrid(_orderLogic.ReadList(null)); + _logger.LogInformation("Загрузка заказов"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки заказов"); + } + } + private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + private void консервыToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } + private void клиентыToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); } - private void FormMain_Load(object sender, EventArgs e) - { - LoadData(); - } - private void LoadData() - { - _logger.LogInformation("Загрузка заказов"); - try - { - var list = _orderLogic.ReadList(null); - if (list != null) - { - dataGridView.DataSource = list; - dataGridView.Columns["CannedId"].Visible = false; - dataGridView.Columns["CannedName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ClientId"].Visible = false; - dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - dataGridView.Columns["ImplementerId"].Visible = false; - dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } + private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } - _logger.LogInformation("Загрузка заказов"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки заказов"); - } - } - private void компонентыToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormComponents)); - if (service is FormComponents form) - { - form.ShowDialog(); - } - } - private void консервыToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCanneds)); + private void buttonCreateOrder_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } - if (service is FormCanneds form) - { - form.ShowDialog(); - } - } - private void клиентыToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormClients)); + private void buttonIssuedOrder_Click(object sender, EventArgs e) + { + if (dataGridView.SelectedRows.Count == 1) + { + int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); + _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); + try + { + var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel + { + Id = id + }); + if (!operationResult) + { + throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); + } + _logger.LogInformation("Заказ №{id} выдан", id); + LoadData(); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + private void buttonRef_Click(object sender, EventArgs e) + { + LoadData(); + } - if (service is FormClients form) - { - form.ShowDialog(); - } - } + private void списокКомпонентовToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveCannedsToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } - private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormImplementers)); + } - if (service is FormImplementers form) - { - form.ShowDialog(); - } - } + private void компонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); - private void buttonCreateOrder_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder)); - if (service is FormCreateOrder form) - { - form.ShowDialog(); - LoadData(); - } - } + } - private void buttonIssuedOrder_Click(object sender, EventArgs e) - { - if (dataGridView.SelectedRows.Count == 1) - { - int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value); - _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id); - try - { - var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel - { - Id = id - }); - if (!operationResult) - { - throw new Exception("Ошибка при сохранении. Дополнительная информация в логах."); - } - _logger.LogInformation("Заказ №{id} выдан", id); - LoadData(); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка отметки о выдачи заказа"); MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - private void buttonRef_Click(object sender, EventArgs e) - { - LoadData(); - } + private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } - private void списокКомпонентовToolStripMenuItem_Click(object sender, EventArgs e) - { - using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; - if (dialog.ShowDialog() == DialogResult.OK) - { - _reportLogic.SaveCannedsToWordFile(new ReportBindingModel - { - FileName = dialog.FileName - }); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } + private void ЗапускРаботToolStripLabel_Click(object sender, EventArgs e) + { + _workProcess.DoWork(DependencyManager.Instance.Resolve(), _orderLogic); + MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } - } + private void ПисьмаtoolStripLabel_Click(object sender, EventArgs e) + { + var form = DependencyManager.Instance.Resolve(); + form.ShowDialog(); + } - private void компонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportCannedComponents)); - if (service is FormReportCannedComponents form) - { - form.ShowDialog(); - } - - } - - private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); - if (service is FormReportOrders form) - { - form.ShowDialog(); - } - } - - private void ЗапускРаботToolStripLabel_Click(object sender, EventArgs e) - { - _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic); - MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - - private void ПисьмаtoolStripLabel_Click(object sender, EventArgs e) - { - var service = Program.ServiceProvider?.GetService(typeof(FormMails)); - if (service is FormMails form) - { - form.ShowDialog(); - } - } - } + private void СоздатьБекапtoolStripLabel_Click(object sender, EventArgs e) + { + try + { + if (_backUpLogic != null) + { + var fbd = new FolderBrowserDialog(); + if (fbd.ShowDialog() == DialogResult.OK) + { + _backUpLogic.CreateBackUp(new BackUpSaveBindingModel + { + FolderName = fbd.SelectedPath + }); + MessageBox.Show("Бекап создан", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + } + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } } diff --git a/FishFactory/Program.cs b/FishFactory/Program.cs index 8d0e11c..c681537 100644 --- a/FishFactory/Program.cs +++ b/FishFactory/Program.cs @@ -10,6 +10,7 @@ using FishFactoryBusinessLogic.OfficePackage; using FishFactoryBusinessLogic.OfficePackage.Implements; using FishFactoryBusinessLogic.MailWorker; using FishFactoryContracts.BindingModels; +using FishFactoryContracts.DependencyInjection; namespace FishFactory { @@ -23,81 +24,76 @@ namespace FishFactory [STAThread] static void Main() { - // To customize application configuration such as set high DPI settings or default font, - // see https://aka.ms/applicationconfiguration. - ApplicationConfiguration.Initialize(); - var services = new ServiceCollection(); - ConfigureServices(services); - _serviceProvider = services.BuildServiceProvider(); + ApplicationConfiguration.Initialize(); + var services = new ServiceCollection(); + InitDependency(); - var mailSender = _serviceProvider.GetService(); - try + try + { + var mailSender = DependencyManager.Instance.Resolve(); + mailSender?.MailConfig(new MailConfigBindingModel + { + MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, + MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty, + SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty, + SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]), + PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty, + PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"]) + }); + // + var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); + } + catch(Exception ex) { - mailSender?.MailConfig(new MailConfigBindingModel - { - MailLogin = System.Configuration.ConfigurationManager.AppSettings["MailLogin"] ?? string.Empty, - MailPassword = System.Configuration.ConfigurationManager.AppSettings["MailPassword"] ?? string.Empty, - SmtpClientHost = System.Configuration.ConfigurationManager.AppSettings["SmtpClientHost"] ?? string.Empty, - SmtpClientPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["SmtpClientPort"]), - PopHost = System.Configuration.ConfigurationManager.AppSettings["PopHost"] ?? string.Empty, - PopPort = Convert.ToInt32(System.Configuration.ConfigurationManager.AppSettings["PopPort"]) - }); - // - var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000); - } - catch (Exception ex) - { - var logger = _serviceProvider.GetService(); - logger?.LogError(ex, " "); - } + var logger = DependencyManager.Instance.Resolve(); + logger?.LogError(ex, " "); + } - Application.Run(_serviceProvider.GetRequiredService()); + Application.Run(DependencyManager.Instance.Resolve()); } - private static void ConfigureServices(ServiceCollection services) - { - services.AddLogging(option => - { - option.SetMinimumLevel(LogLevel.Information); - option.AddNLog("nlog.config"); - }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + private static void InitDependency() + { + DependencyManager.InitDependency(); + DependencyManager.Instance.AddLogging(option => + { + option.SetMinimumLevel(LogLevel.Information); + option.AddNLog("nlog.config"); + }); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddSingleton(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + DependencyManager.Instance.RegisterType(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - } - private static void MailCheck(object obj) => ServiceProvider?.GetService()?.MailCheck(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + private static void MailCheck(object obj) => DependencyManager.Instance.Resolve()?.MailCheck(); } } \ No newline at end of file diff --git a/FishFactoryBusinessLogic/BusinessLogic/BackUpLogic.cs b/FishFactoryBusinessLogic/BusinessLogic/BackUpLogic.cs new file mode 100644 index 0000000..1d9076c --- /dev/null +++ b/FishFactoryBusinessLogic/BusinessLogic/BackUpLogic.cs @@ -0,0 +1,94 @@ +using FishFactoryContracts.BindingModels; +using FishFactoryContracts.BusinessLogicsContracts; +using FishFactoryContracts.StoragesContracts; +using FishFactoryDataModel; +using Microsoft.Extensions.Logging; +using System.IO.Compression; +using System.Reflection; +using System.Runtime.Serialization.Json; + +namespace FishFactoryBusinessLogic.BusinessLogic +{ + public class BackUpLogic : IBackUpLogic + { + private readonly ILogger _logger; + private readonly IBackUpInfo _backUpInfo; + public BackUpLogic(ILogger logger, IBackUpInfo backUpInfo) + { + _logger = logger; + _backUpInfo = backUpInfo; + } + public void CreateBackUp(BackUpSaveBindingModel model) + { + if (_backUpInfo == null) + { + return; + } + try + { + _logger.LogDebug("Clear folder"); + // зачистка папки и удаление старого архива + var dirInfo = new DirectoryInfo(model.FolderName); + if (dirInfo.Exists) + { + foreach (var file in dirInfo.GetFiles()) + { + file.Delete(); + } + } + _logger.LogDebug("Delete archive"); + string fileName = $"{model.FolderName}.zip"; + if (File.Exists(fileName)) + { + File.Delete(fileName); + } + // берем метод для сохранения + _logger.LogDebug("Get assembly"); + var typeIId = typeof(IId); + var assembly = typeIId.Assembly; + if (assembly == null) + { + throw new ArgumentNullException("Сборка не найдена", nameof(assembly)); + } + var types = assembly.GetTypes(); + var method = GetType().GetMethod("SaveToFile", BindingFlags.NonPublic | BindingFlags.Instance); + _logger.LogDebug("Find {count} types", types.Length); + foreach (var type in types) + { + if (type.IsInterface && type.GetInterface(typeIId.Name) != null) + { + var modelType = _backUpInfo.GetTypeByModelInterface(type.Name); + if (modelType == null) + { + throw new InvalidOperationException($"Не найден класс-модель для {type.Name}"); + } + _logger.LogDebug("Call SaveToFile method for {name} type", type.Name); + // вызываем метод на выполнение + method?.MakeGenericMethod(modelType).Invoke(this, new object[] { model.FolderName }); + } + } + _logger.LogDebug("Create zip and remove folder"); + // архивируем + ZipFile.CreateFromDirectory(model.FolderName, fileName); + // удаляем папку + dirInfo.Delete(true); + } + catch (Exception) + { + throw; + } + } + private void SaveToFile(string folderName) where T : class, new() + { + var records = _backUpInfo.GetList(); + if (records == null) + { + _logger.LogWarning("{type} type get null list", typeof(T).Name); + return; + } + var jsonFormatter = new DataContractJsonSerializer(typeof(List)); + using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate); + jsonFormatter.WriteObject(fs, records); + } + } +} diff --git a/FishFactoryContracts/Attributes/ColumnAttribute.cs b/FishFactoryContracts/Attributes/ColumnAttribute.cs new file mode 100644 index 0000000..6b9350f --- /dev/null +++ b/FishFactoryContracts/Attributes/ColumnAttribute.cs @@ -0,0 +1,22 @@ +using System; + +namespace FishFactoryContracts.Attributes +{ + [AttributeUsage(AttributeTargets.Property)] + public class ColumnAttribute : Attribute + { + public ColumnAttribute(string title = "", bool visible = true, int width = 0, GridViewAutoSize gridViewAutoSize = GridViewAutoSize.None, bool isUseAutoSize = false) + { + Title = title; + Visible = visible; + Width = width; + GridViewAutoSize = gridViewAutoSize; + IsUseAutoSize = isUseAutoSize; + } + public string Title { get; private set; } + public bool Visible { get; private set; } + public int Width { get; private set; } + public GridViewAutoSize GridViewAutoSize { get; private set; } + public bool IsUseAutoSize { get; private set; } + } +} diff --git a/FishFactoryContracts/Attributes/GridViewAutoSize.cs b/FishFactoryContracts/Attributes/GridViewAutoSize.cs new file mode 100644 index 0000000..d353e78 --- /dev/null +++ b/FishFactoryContracts/Attributes/GridViewAutoSize.cs @@ -0,0 +1,14 @@ +namespace FishFactoryContracts.Attributes +{ + public enum GridViewAutoSize + { + NotSet = 0, + None = 1, + ColumnHeader = 2, + AllCellsExceptHeader = 4, + AllCells = 6, + DisplayedCellsExceptHeader = 8, + DisplayedCells = 10, + Fill = 16 + } +} diff --git a/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs b/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs new file mode 100644 index 0000000..d70a3b3 --- /dev/null +++ b/FishFactoryContracts/BindingModels/BackUpSaveBindingModel.cs @@ -0,0 +1,7 @@ +namespace FishFactoryContracts.BindingModels +{ + public class BackUpSaveBindingModel + { + public string FolderName { get; set; } = string.Empty; + } +} diff --git a/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs b/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs index 32fe9b9..ca2713e 100644 --- a/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs +++ b/FishFactoryContracts/BindingModels/MessageInfoBindingModel.cs @@ -4,7 +4,8 @@ namespace FishFactoryContracts.BindingModels { public class MessageInfoBindingModel : IMessageInfoModel { - public string MessageId { get; set; } = string.Empty; + public int Id => throw new NotImplementedException(); + public string MessageId { get; set; } = string.Empty; public int? ClientId { get; set; } public string SenderName { get; set; } = string.Empty; public string Subject { get; set; } = string.Empty; diff --git a/FishFactoryContracts/BindingModels/ServiceDependencyContainer.cs b/FishFactoryContracts/BindingModels/ServiceDependencyContainer.cs new file mode 100644 index 0000000..76dfb40 --- /dev/null +++ b/FishFactoryContracts/BindingModels/ServiceDependencyContainer.cs @@ -0,0 +1,58 @@ +using FishFactoryContracts.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace FishFactoryContracts.BindingModels +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + return _serviceProvider.GetService()!; + } + } +} diff --git a/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs b/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs new file mode 100644 index 0000000..ed7d201 --- /dev/null +++ b/FishFactoryContracts/BusinessLogicsContracts/IBackUpLogic.cs @@ -0,0 +1,9 @@ +using FishFactoryContracts.BindingModels; + +namespace FishFactoryContracts.BusinessLogicsContracts +{ + public interface IBackUpLogic + { + void CreateBackUp(BackUpSaveBindingModel model); + } +} diff --git a/FishFactoryContracts/DependencyInjection/DependencyManager.cs b/FishFactoryContracts/DependencyInjection/DependencyManager.cs new file mode 100644 index 0000000..de0ecfe --- /dev/null +++ b/FishFactoryContracts/DependencyInjection/DependencyManager.cs @@ -0,0 +1,62 @@ +using Microsoft.Extensions.Logging; + +namespace FishFactoryContracts.DependencyInjection +{ + public class DependencyManager + { + private readonly IDependencyContainer _dependencyManager; + private static DependencyManager? _manager; + private static readonly object _locjObject = new(); + private DependencyManager() + { + _dependencyManager = new UnityDependencyContainer(); + } + public static DependencyManager Instance + { + get + { + if (_manager == null) + { + lock (_locjObject) {_manager = new DependencyManager(); } + } + return _manager; + } + } + /// + /// Иницализация библиотек, в которых идут установки зависомстей + /// + public static void InitDependency() + { + var ext = ServiceProviderLoader.GetImplementationExtensions(); + if (ext == null) + { + throw new ArgumentNullException("Отсутствуют компоненты для загрузки зависимостей по модулям"); + } + // регистрируем зависимости + ext.RegisterServices(); + } + /// + /// Регистрация логгера + /// + /// + public void AddLogging(Action configure) => _dependencyManager.AddLogging(configure); + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType(isSingle); + /// + /// Добавление зависимости + /// + /// + /// + public void RegisterType(bool isSingle = false) where T : class => _dependencyManager.RegisterType(isSingle); + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + public T Resolve() => _dependencyManager.Resolve(); + } +} diff --git a/FishFactoryContracts/DependencyInjection/IDependencyContainer.cs b/FishFactoryContracts/DependencyInjection/IDependencyContainer.cs new file mode 100644 index 0000000..b797237 --- /dev/null +++ b/FishFactoryContracts/DependencyInjection/IDependencyContainer.cs @@ -0,0 +1,28 @@ +using Microsoft.Extensions.Logging; + +namespace FishFactoryContracts.DependencyInjection +{ + public interface IDependencyContainer + { + void AddLogging(Action configure); + /// + /// Добавление зависимости + /// + /// + /// + /// + void RegisterType(bool isSingle) where U : class, T where T : class; + /// + /// Добавление зависимости + /// + /// + /// + void RegisterType(bool isSingle) where T : class; + /// + /// Получение класса со всеми зависмостями + /// + /// + /// + T Resolve(); + } +} diff --git a/FishFactoryContracts/DependencyInjection/IImplementationExtension.cs b/FishFactoryContracts/DependencyInjection/IImplementationExtension.cs new file mode 100644 index 0000000..8eb1cc9 --- /dev/null +++ b/FishFactoryContracts/DependencyInjection/IImplementationExtension.cs @@ -0,0 +1,14 @@ +namespace FishFactoryContracts.DependencyInjection +{ + /// + /// Интерфейс для регистрации зависимостей в модулях + /// + public interface IImplementationExtension + { + public int Priority { get; } + /// + /// Регистрация сервисов + /// + public void RegisterServices(); + } +} diff --git a/FishFactoryContracts/DependencyInjection/ServiceDependencyContainer.cs b/FishFactoryContracts/DependencyInjection/ServiceDependencyContainer.cs new file mode 100644 index 0000000..11bf3a9 --- /dev/null +++ b/FishFactoryContracts/DependencyInjection/ServiceDependencyContainer.cs @@ -0,0 +1,57 @@ +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace FishFactoryContracts.DependencyInjection +{ + public class ServiceDependencyContainer : IDependencyContainer + { + private ServiceProvider? _serviceProvider; + + private readonly ServiceCollection _serviceCollection; + + public ServiceDependencyContainer() + { + _serviceCollection = new ServiceCollection(); + } + + public void AddLogging(Action configure) + { + _serviceCollection.AddLogging(configure); + } + + public void RegisterType(bool isSingle) where U : class, T where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public void RegisterType(bool isSingle) where T : class + { + if (isSingle) + { + _serviceCollection.AddSingleton(); + } + else + { + _serviceCollection.AddTransient(); + } + _serviceProvider = null; + } + + public T Resolve() + { + if (_serviceProvider == null) + { + _serviceProvider = _serviceCollection.BuildServiceProvider(); + } + return _serviceProvider.GetService()!; + } + } +} diff --git a/FishFactoryContracts/DependencyInjection/ServiceProviderLoader.cs b/FishFactoryContracts/DependencyInjection/ServiceProviderLoader.cs new file mode 100644 index 0000000..70134ac --- /dev/null +++ b/FishFactoryContracts/DependencyInjection/ServiceProviderLoader.cs @@ -0,0 +1,52 @@ +using System.Reflection; + +namespace FishFactoryContracts.DependencyInjection +{ + /// + /// Загрузчик данных + /// + public static partial class ServiceProviderLoader + { + /// Загрузка всех классов-реализаций IImplementationExtension + /// + /// + public static IImplementationExtension? GetImplementationExtensions() + { + IImplementationExtension? source = null; + + var files = Directory.GetFiles(TryGetImplementationExtensionsFolder(), "*.dll", SearchOption.AllDirectories); + foreach (var file in files.Distinct()) + { + Assembly asm = Assembly.LoadFrom(file); + foreach (var t in asm.GetExportedTypes()) + { + if (t.IsClass && typeof(IImplementationExtension).IsAssignableFrom(t)) + { + if (source == null) + { + source = (IImplementationExtension)Activator.CreateInstance(t)!; + } + else + { + var newSource = (IImplementationExtension)Activator.CreateInstance(t)!; + if (newSource.Priority > source.Priority) + { + source = newSource; + } + } + } + } + } + return source; + } + private static string TryGetImplementationExtensionsFolder() + { + var directory = new DirectoryInfo(Directory.GetCurrentDirectory()); + while (directory != null && !directory.GetDirectories("ImplementationExtensions", SearchOption.AllDirectories).Any(x => x.Name == "ImplementationExtensions")) + { + directory = directory.Parent; + } + return $"{directory?.FullName}\\ImplementationExtensions"; + } + } +} diff --git a/FishFactoryContracts/DependencyInjection/UnityDependencyContainer.cs b/FishFactoryContracts/DependencyInjection/UnityDependencyContainer.cs new file mode 100644 index 0000000..4d1d616 --- /dev/null +++ b/FishFactoryContracts/DependencyInjection/UnityDependencyContainer.cs @@ -0,0 +1,38 @@ +using Microsoft.Extensions.Logging; +using Unity; +using Unity.Microsoft.Logging; + +namespace FishFactoryContracts.DependencyInjection +{ + public class UnityDependencyContainer : IDependencyContainer + { + private readonly IUnityContainer _container; + + public UnityDependencyContainer() + { + _container = new UnityContainer(); + } + + public void AddLogging(Action configure) + { + var factory = LoggerFactory.Create(configure); + _container.AddExtension(new LoggingExtension(factory)); + } + + public void RegisterType(bool isSingle) where T : class + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + + } + + public T Resolve() + { + return _container.Resolve(); + } + + void IDependencyContainer.RegisterType(bool isSingle) + { + _container.RegisterType(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient); + } + } +} diff --git a/FishFactoryContracts/FishFactoryContracts.csproj b/FishFactoryContracts/FishFactoryContracts.csproj index 2b37aba..37aec2e 100644 --- a/FishFactoryContracts/FishFactoryContracts.csproj +++ b/FishFactoryContracts/FishFactoryContracts.csproj @@ -7,6 +7,12 @@ AnyCPU;x86 + + + + + + diff --git a/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs b/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs new file mode 100644 index 0000000..02b3d9b --- /dev/null +++ b/FishFactoryContracts/StoragesContracts/IBackUpInfo.cs @@ -0,0 +1,8 @@ +namespace FishFactoryContracts.StoragesContracts +{ + public interface IBackUpInfo + { + List? GetList() where T : class, new(); + Type? GetTypeByModelInterface(string modelInterfaceName); + } +} diff --git a/FishFactoryContracts/ViewModels/CannedViewModel.cs b/FishFactoryContracts/ViewModels/CannedViewModel.cs index 20b2012..98036a3 100644 --- a/FishFactoryContracts/ViewModels/CannedViewModel.cs +++ b/FishFactoryContracts/ViewModels/CannedViewModel.cs @@ -1,21 +1,19 @@ -using FishFactoryDataModel.Models; -using System; -using System.Collections.Generic; +using FishFactoryContracts.Attributes; +using FishFactoryDataModel.Models; using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; namespace FishFactoryContracts.ViewModels { public class CannedViewModel : ICannedModel { - public int Id { get; set; } - [DisplayName("Название изделия")] - public string CannedName { get; set; } - [DisplayName("Цена")] - public double Price { get; set; } - public Dictionary CannedComponents { get; set; } = new(); + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название консервы", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string CannedName { get; set; } + [Column(title: "Цена", width: 80)] + public double Price { get; set; } + [Column(visible: false)] + public Dictionary CannedComponents { get; set; } = new(); } } diff --git a/FishFactoryContracts/ViewModels/ClientViewModel.cs b/FishFactoryContracts/ViewModels/ClientViewModel.cs index 8f1ed41..f95c7d7 100644 --- a/FishFactoryContracts/ViewModels/ClientViewModel.cs +++ b/FishFactoryContracts/ViewModels/ClientViewModel.cs @@ -1,17 +1,18 @@ -using FishFactoryDataModel.Models; -using System.ComponentModel; +using FishFactoryContracts.Attributes; +using FishFactoryDataModel.Models; namespace FishFactoryContracts.ViewModels { public class ClientViewModel : IClientModel { - public int Id { get; set; } - [DisplayName("ФИО клиента")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Логин (эл. почта)")] - public string Email { get; set; } = string.Empty; - [DisplayName("Пароль")] - public string Password { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "ФИО клиента", width: 150)] + public string ClientFIO { get; set; } = string.Empty; + [Column(title: "Логин (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Email { get; set; } = string.Empty; + [Column(title: "Пароль", width: 150)] + public string Password { get; set; } = string.Empty; } } diff --git a/FishFactoryContracts/ViewModels/ComponentViewModel.cs b/FishFactoryContracts/ViewModels/ComponentViewModel.cs index 1d54793..27a206f 100644 --- a/FishFactoryContracts/ViewModels/ComponentViewModel.cs +++ b/FishFactoryContracts/ViewModels/ComponentViewModel.cs @@ -1,19 +1,15 @@ -using FishFactoryDataModel.Models; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; +using FishFactoryContracts.Attributes; +using FishFactoryDataModel.Models; namespace FishFactoryContracts.ViewModels { public class ComponentViewModel : IComponentModel { - public int Id { get; set; } - [DisplayName("Название компонента")] - public string ComponentName { get; set; } = string.Empty; - [DisplayName("Цена")] - public double Cost { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ComponentName { get; set; } = string.Empty; + [Column(title: "Цена", width: 150)] + public double Cost { get; set; } } } diff --git a/FishFactoryContracts/ViewModels/ImplementerViewModel.cs b/FishFactoryContracts/ViewModels/ImplementerViewModel.cs index ceaae40..c39caa0 100644 --- a/FishFactoryContracts/ViewModels/ImplementerViewModel.cs +++ b/FishFactoryContracts/ViewModels/ImplementerViewModel.cs @@ -1,18 +1,18 @@ - -using System.ComponentModel; +using FishFactoryContracts.Attributes; namespace FishFactoryContracts.ViewModels { public class ImplementerViewModel { - public int Id { get; set; } - [DisplayName("ФИО исполнителя")] - public string ImplementerFIO { get; set; } - [DisplayName("Пароль")] - public string Password { get; set; } - [DisplayName("Опыт работы")] - public int WorkExperience { get; set; } - [DisplayName("Квалификация")] - public int Qualification { get; set; } + [Column(visible: false)] + public int Id { get; set; } + [Column(title: "ФИО исполнителя", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string ImplementerFIO { get; set; } + [Column(title: "Пароль", width: 100)] + public string Password { get; set; } + [Column(title: "Опыт работы", width: 50)] + public int WorkExperience { get; set; } + [Column(title: "Квалификация", width: 50)] + public int Qualification { get; set; } } } diff --git a/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs b/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs index ae69112..da4cf02 100644 --- a/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs +++ b/FishFactoryContracts/ViewModels/MessageInfoViewModel.cs @@ -1,24 +1,29 @@ -using FishFactoryDataModel.Models; +using FishFactoryContracts.Attributes; +using FishFactoryDataModel.Models; using System.ComponentModel; namespace FishFactoryContracts.ViewModels { public class MessageInfoViewModel : IMessageInfoModel { - public string MessageId { get; set; } = string.Empty; + [Column(visible: false)] + public int Id { get; set; } + [Column(visible: false)] + public string MessageId { get; set; } = string.Empty; - public int? ClientId { get; set; } + [Column(visible: false)] + public int? ClientId { get; set; } - [DisplayName("Отправитель")] - public string SenderName { get; set; } = string.Empty; + [Column(title: "Отправитель", width: 150)] + public string SenderName { get; set; } = string.Empty; - [DisplayName("Дата письма")] - public DateTime DateDelivery { get; set; } + [Column(title: "Дата письма", width: 120)] + public DateTime DateDelivery { get; set; } - [DisplayName("Заголовок")] - public string Subject { get; set; } = string.Empty; + [Column(title: "Заголовок", width: 120)] + public string Subject { get; set; } = string.Empty; - [DisplayName("Текст")] - public string Body { get; set; } = string.Empty; + [Column(title: "Текст", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public string Body { get; set; } = string.Empty; } } diff --git a/FishFactoryContracts/ViewModels/OrderViewModel.cs b/FishFactoryContracts/ViewModels/OrderViewModel.cs index 36c200d..e4e8df8 100644 --- a/FishFactoryContracts/ViewModels/OrderViewModel.cs +++ b/FishFactoryContracts/ViewModels/OrderViewModel.cs @@ -1,4 +1,5 @@ -using FishFactoryDataModel.Enums; +using FishFactoryContracts.Attributes; +using FishFactoryDataModel.Enums; using System.ComponentModel; namespace FishFactoryContracts.ViewModels @@ -7,26 +8,30 @@ namespace FishFactoryContracts.ViewModels { [DisplayName("Номер")] public int Id { get; set; } + + [Column(visible: false)] public int ClientId { get; set; } - [DisplayName("Клиент")] - public string ClientFIO { get; set; } = string.Empty; - [DisplayName("Почта клиента")] + [Column(title: "Клиент", width: 200)] + public string ClientFIO { get; set; } = string.Empty; + [Column(visible: false)] public string ClientEmail { get; set; } = string.Empty; - public int? ImplementerId { get; set; } - [DisplayName("Исполнитель")] - public string? ImplementerFIO { get; set; } = null; - public int CannedId { get; set; } - [DisplayName("Изделие")] - public string CannedName { get; set; } = string.Empty; - [DisplayName("Количество")] - public int Count { get; set; } - [DisplayName("Сумма")] - public double Sum { get; set; } - [DisplayName("Статус")] - public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; - [DisplayName("Дата создания")] - public DateTime DateCreate { get; set; } = DateTime.Now; - [DisplayName("Дата выполнения")] - public DateTime? DateImplement { get; set; } + [Column(visible: false)] + public int? ImplementerId { get; set; } + [Column(title: "Исполнитель", width: 200)] + public string? ImplementerFIO { get; set; } = null; + [Column(visible: false)] + public int CannedId { get; set; } + [Column(title: "Консерва", width: 120, isUseAutoSize: true)] + public string CannedName { get; set; } = string.Empty; + [Column(title: "Количество", width: 100)] + public int Count { get; set; } + [Column(title: "Сумма", width: 120)] + public double Sum { get; set; } + [Column(title: "Статус", width: 90)] + public OrderStatus Status { get; set; } = OrderStatus.Неизвестен; + [Column(title: "Дата создания", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public DateTime DateCreate { get; set; } = DateTime.Now; + [Column(title: "Дата выполнения", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)] + public DateTime? DateImplement { get; set; } } } diff --git a/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs b/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs index ce76f07..c493102 100644 --- a/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs +++ b/FishFactoryContracts/ViewModels/ReportOrdersViewModel.cs @@ -1,9 +1,12 @@  +using FishFactoryContracts.Attributes; + namespace FishFactoryContracts.ViewModels { public class ReportOrdersViewModel { - public int Id { get; set; } + [Column(visible: false)] + public int Id { get; set; } public DateTime DateCreate { get; set; } public string CannedName { get; set; } = string.Empty; public string Status { get; set; } = string.Empty; diff --git a/FishFactoryDataModels/Models/IMessageInfoModel.cs b/FishFactoryDataModels/Models/IMessageInfoModel.cs index 1273459..c946c95 100644 --- a/FishFactoryDataModels/Models/IMessageInfoModel.cs +++ b/FishFactoryDataModels/Models/IMessageInfoModel.cs @@ -1,6 +1,6 @@ namespace FishFactoryDataModel.Models { - public interface IMessageInfoModel + public interface IMessageInfoModel : IId { string MessageId { get; } int? ClientId { get; } diff --git a/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj b/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj index 6c0d603..14e7c1f 100644 --- a/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj +++ b/FishFactoryDatabaseImplement/FishFactoryDatabaseImplement.csproj @@ -21,4 +21,8 @@ + + + + diff --git a/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs b/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..4bbb715 --- /dev/null +++ b/FishFactoryDatabaseImplement/Implements/BackUpInfo.cs @@ -0,0 +1,26 @@ +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryDatabaseImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + using var context = new FishFactoryDatabase(); + return context.Set().ToList(); + } + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/FishFactoryDatabaseImplement/Implements/ImplementationExtension.cs b/FishFactoryDatabaseImplement/Implements/ImplementationExtension.cs new file mode 100644 index 0000000..b6b2762 --- /dev/null +++ b/FishFactoryDatabaseImplement/Implements/ImplementationExtension.cs @@ -0,0 +1,21 @@ +using FishFactoryContracts.DependencyInjection; +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryDatabaseImplement.Implements +{ + public class ImplementationExtension + { + public int Priority => 2; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/FishFactoryDatabaseImplement/Models/Canned.cs b/FishFactoryDatabaseImplement/Models/Canned.cs index 9bbb908..1bcfabb 100644 --- a/FishFactoryDatabaseImplement/Models/Canned.cs +++ b/FishFactoryDatabaseImplement/Models/Canned.cs @@ -3,18 +3,24 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Canned : ICannedModel + [DataContract] + public class Canned : ICannedModel { - public int Id { get; set; } + [DataMember] + public int Id { get; set; } + [DataMember] [Required] public string CannedName { get; set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Price { get; set; } private Dictionary? _cannedComponents = null; - [NotMapped] + [DataMember] + [NotMapped] public Dictionary CannedComponents { get diff --git a/FishFactoryDatabaseImplement/Models/Client.cs b/FishFactoryDatabaseImplement/Models/Client.cs index e27318e..66ddb68 100644 --- a/FishFactoryDatabaseImplement/Models/Client.cs +++ b/FishFactoryDatabaseImplement/Models/Client.cs @@ -1,17 +1,27 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; +using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryDatabaseImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { - public int Id { get; set; } - public string ClientFIO { get; set; } = string.Empty; - public string Password { get; set; } = string.Empty; - public string Email { get; set; } = string.Empty; + [DataMember] + public int Id { get; set; } + [DataMember] + [Required] + public string ClientFIO { get; set; } = string.Empty; + [DataMember] + [Required] + public string Password { get; set; } = string.Empty; + [DataMember] + [Required] + public string Email { get; set; } = string.Empty; [ForeignKey("ClientId")] public virtual List ClientMessages { get; set; } = new(); diff --git a/FishFactoryDatabaseImplement/Models/Component.cs b/FishFactoryDatabaseImplement/Models/Component.cs index d811164..dab92f5 100644 --- a/FishFactoryDatabaseImplement/Models/Component.cs +++ b/FishFactoryDatabaseImplement/Models/Component.cs @@ -3,15 +3,20 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - [Required] + [DataMember] + public int Id { get; private set; } + [DataMember] + [Required] public string ComponentName { get; private set; } = string.Empty; - [Required] + [DataMember] + [Required] public double Cost { get; set; } [ForeignKey("ComponentId")] public virtual List CannedComponents { get; set; } = new(); diff --git a/FishFactoryDatabaseImplement/Models/Implementer.cs b/FishFactoryDatabaseImplement/Models/Implementer.cs index 7a5c70c..61985b0 100644 --- a/FishFactoryDatabaseImplement/Models/Implementer.cs +++ b/FishFactoryDatabaseImplement/Models/Implementer.cs @@ -2,20 +2,27 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; using System.ComponentModel.DataAnnotations.Schema; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } - public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] + public string ImplementerFIO { get; private set; } = string.Empty; - public string Password { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; - public int WorkExperience { get; private set; } = 0; + [DataMember] + public int WorkExperience { get; private set; } = 0; - public int Qualification { get; private set; } = 0; + [DataMember] + public int Qualification { get; private set; } = 0; [ForeignKey("ImplementerId")] public virtual List Order { get; set; } = new(); diff --git a/FishFactoryDatabaseImplement/Models/MessageInfo.cs b/FishFactoryDatabaseImplement/Models/MessageInfo.cs index c3f4e42..e4d004c 100644 --- a/FishFactoryDatabaseImplement/Models/MessageInfo.cs +++ b/FishFactoryDatabaseImplement/Models/MessageInfo.cs @@ -2,27 +2,36 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; using System.ComponentModel.DataAnnotations; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class MessageInfo : IMessageInfoModel + [DataContract] + public class MessageInfo : IMessageInfoModel { - [Key] + public int Id => throw new NotImplementedException(); + [DataMember] + [Key] public string MessageId { get; set; } = string.Empty; - public int? ClientId { get; set; } + [DataMember] + public int? ClientId { get; set; } public virtual Client? Client { get; set; } - [Required] + [DataMember] + [Required] public string SenderName { get; set; } = string.Empty; + [DataMember] [Required] public DateTime DateDelivery { get; set; } + [DataMember] [Required] public string Subject { get; set; } = string.Empty; + [DataMember] [Required] public string Body { get; set; } = string.Empty; diff --git a/FishFactoryDatabaseImplement/Models/Order.cs b/FishFactoryDatabaseImplement/Models/Order.cs index 64e66f3..6061aeb 100644 --- a/FishFactoryDatabaseImplement/Models/Order.cs +++ b/FishFactoryDatabaseImplement/Models/Order.cs @@ -3,32 +3,43 @@ using FishFactoryDataModel.Enums; using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; +using System.Runtime.Serialization; namespace FishFactoryDatabaseImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] [Required] public int CannedId { get; private set; } public virtual Canned Canned { get; set; } + [DataMember] [Required] public int ClientId { get; private set; } public virtual Client Client { get; set; } - public int? ImplementerId { get; private set; } + [DataMember] + public int? ImplementerId { get; private set; } public virtual Implementer? Implementer { get; set; } = new(); - [Required] + [DataMember] + [Required] public int Count { get; private set; } + [DataMember] [Required] public double Sum { get; private set; } + [DataMember] [Required] public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен; + [DataMember] [Required] public DateTime DateCreate { get; private set; } = DateTime.Now; - public DateTime? DateImplement { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order Create (FishFactoryDatabase context, OrderBindingModel model) { return new Order() diff --git a/FishFactoryFileImplement/FishFactoryFileImplement.csproj b/FishFactoryFileImplement/FishFactoryFileImplement.csproj index 1cbc85b..6e9dfe2 100644 --- a/FishFactoryFileImplement/FishFactoryFileImplement.csproj +++ b/FishFactoryFileImplement/FishFactoryFileImplement.csproj @@ -11,4 +11,8 @@ + + + + \ No newline at end of file diff --git a/FishFactoryFileImplement/Implements/BackUpInfo.cs b/FishFactoryFileImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..7f8755e --- /dev/null +++ b/FishFactoryFileImplement/Implements/BackUpInfo.cs @@ -0,0 +1,39 @@ +using FishFactoryContracts.StoragesContracts; +using System.Reflection; + +namespace FishFactoryFileImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + private readonly DataFileSingleton source; + private readonly PropertyInfo[] sourceProperties; + + public BackUpInfo() + { + source = DataFileSingleton.GetInstance(); + sourceProperties = source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public); + } + + public List? GetList() where T : class, new() + { + var requredType = typeof(T); + return (List?)sourceProperties.FirstOrDefault(x => x.PropertyType.IsGenericType && x.PropertyType.GetGenericArguments()[0] == requredType) + ?.GetValue(source); + + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + var assembly = typeof(BackUpInfo).Assembly; + var types = assembly.GetTypes(); + foreach (var type in types) + { + if (type.IsClass && type.GetInterface(modelInterfaceName) != null) + { + return type; + } + } + return null; + } + } +} diff --git a/FishFactoryFileImplement/Implements/ImplementationExtension.cs b/FishFactoryFileImplement/Implements/ImplementationExtension.cs new file mode 100644 index 0000000..8359cb8 --- /dev/null +++ b/FishFactoryFileImplement/Implements/ImplementationExtension.cs @@ -0,0 +1,21 @@ +using FishFactoryContracts.DependencyInjection; +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryFileImplement.Implements +{ + public class ImplementationExtension : IImplementationExtension + { + public int Priority => 1; + + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/FishFactoryFileImplement/Models/Canned.cs b/FishFactoryFileImplement/Models/Canned.cs index 551c2e9..67e344e 100644 --- a/FishFactoryFileImplement/Models/Canned.cs +++ b/FishFactoryFileImplement/Models/Canned.cs @@ -1,19 +1,24 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; -using FishFactoryFileImplement; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - internal class Canned : ICannedModel + [DataContract] + public class Canned : ICannedModel { - public int Id { get; private set; } - public string CannedName { get; private set; } = string.Empty; - public double Price { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string CannedName { get; private set; } = string.Empty; + [DataMember] + public double Price { get; private set; } public Dictionary Components { get; private set; } = new(); private Dictionary? _cannedComponents = null; - public Dictionary CannedComponents + [DataMember] + public Dictionary CannedComponents { get { diff --git a/FishFactoryFileImplement/Models/Client.cs b/FishFactoryFileImplement/Models/Client.cs index dcf6996..aca8ff4 100644 --- a/FishFactoryFileImplement/Models/Client.cs +++ b/FishFactoryFileImplement/Models/Client.cs @@ -1,11 +1,13 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Client : IClientModel + [DataContract] + public class Client : IClientModel { public int Id { get; set; } public string ClientFIO { get; set; } = string.Empty; diff --git a/FishFactoryFileImplement/Models/Component.cs b/FishFactoryFileImplement/Models/Component.cs index 66c5569..bf6c56d 100644 --- a/FishFactoryFileImplement/Models/Component.cs +++ b/FishFactoryFileImplement/Models/Component.cs @@ -1,15 +1,20 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Component : IComponentModel + [DataContract] + public class Component : IComponentModel { - public int Id { get; private set; } - public string ComponentName { get; private set; } = string.Empty; - public double Cost { get; set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ComponentName { get; private set; } = string.Empty; + [DataMember] + public double Cost { get; set; } public static Component? Create(ComponentBindingModel? model) { if (model == null) diff --git a/FishFactoryFileImplement/Models/Implementer.cs b/FishFactoryFileImplement/Models/Implementer.cs index 99afe6d..4ecd7a4 100644 --- a/FishFactoryFileImplement/Models/Implementer.cs +++ b/FishFactoryFileImplement/Models/Implementer.cs @@ -1,22 +1,24 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; -using System.Reflection; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Implementer : IImplementerModel + [DataContract] + public class Implementer : IImplementerModel { - public int Id { get; private set; } - - public string ImplementerFIO { get; private set; } = string.Empty; - - public string Password { get; private set; } = string.Empty; - - public int WorkExperience { get; private set; } - - public int Qualification { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public string ImplementerFIO { get; private set; } = string.Empty; + [DataMember] + public string Password { get; private set; } = string.Empty; + [DataMember] + public int WorkExperience { get; private set; } + [DataMember] + public int Qualification { get; private set; } public static Implementer? Create(XElement element) { diff --git a/FishFactoryFileImplement/Models/MessageInfo.cs b/FishFactoryFileImplement/Models/MessageInfo.cs index c87fd34..75d7d43 100644 --- a/FishFactoryFileImplement/Models/MessageInfo.cs +++ b/FishFactoryFileImplement/Models/MessageInfo.cs @@ -1,23 +1,27 @@ using FishFactoryContracts.BindingModels; using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class MessageInfo : IMessageInfoModel + [DataContract] + public class MessageInfo : IMessageInfoModel { + public int Id => throw new NotImplementedException(); + [DataMember] public string MessageId { get; private set; } = string.Empty; - - public int? ClientId { get; private set; } - - public string SenderName { get; private set; } = string.Empty; - - public DateTime DateDelivery { get; private set; } = DateTime.Now; - - public string Subject { get; private set; } = string.Empty; - - public string Body { get; private set; } = string.Empty; + [DataMember] + public int? ClientId { get; private set; } + [DataMember] + public string SenderName { get; private set; } = string.Empty; + [DataMember] + public DateTime DateDelivery { get; private set; } = DateTime.Now; + [DataMember] + public string Subject { get; private set; } = string.Empty; + [DataMember] + public string Body { get; private set; } = string.Empty; public static MessageInfo? Create(MessageInfoBindingModel model) { @@ -62,5 +66,6 @@ namespace FishFactoryFileImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; - } + + } } diff --git a/FishFactoryFileImplement/Models/Order.cs b/FishFactoryFileImplement/Models/Order.cs index f308eea..04a5642 100644 --- a/FishFactoryFileImplement/Models/Order.cs +++ b/FishFactoryFileImplement/Models/Order.cs @@ -2,21 +2,32 @@ using FishFactoryContracts.ViewModels; using FishFactoryDataModel.Enums; using FishFactoryDataModel.Models; +using System.Runtime.Serialization; using System.Xml.Linq; namespace FishFactoryFileImplement.Models { - public class Order : IOrderModel + [DataContract] + public class Order : IOrderModel { - public int Id { get; private set; } - public int CannedId { get; private set; } + [DataMember] + public int Id { get; private set; } + [DataMember] + public int CannedId { get; private set; } + [DataMember] public int ClientId { get; private set; } - public int? ImplementerId { get; set; } - public int Count { get; private set; } - public double Sum { get; private set; } - public OrderStatus Status { get; private set; } - public DateTime DateCreate { get; private set; } - public DateTime? DateImplement { get; private set; } + [DataMember] + public int? ImplementerId { get; set; } + [DataMember] + public int Count { get; private set; } + [DataMember] + public double Sum { get; private set; } + [DataMember] + public OrderStatus Status { get; private set; } + [DataMember] + public DateTime DateCreate { get; private set; } + [DataMember] + public DateTime? DateImplement { get; private set; } public static Order? Create(XElement element) { if (element == null) diff --git a/FishFactoryListImplement/FishFactoryListImplement.csproj b/FishFactoryListImplement/FishFactoryListImplement.csproj index 437b436..b42bd05 100644 --- a/FishFactoryListImplement/FishFactoryListImplement.csproj +++ b/FishFactoryListImplement/FishFactoryListImplement.csproj @@ -12,4 +12,7 @@ + + + diff --git a/FishFactoryListImplement/Implements/BackUpInfo.cs b/FishFactoryListImplement/Implements/BackUpInfo.cs new file mode 100644 index 0000000..8bce840 --- /dev/null +++ b/FishFactoryListImplement/Implements/BackUpInfo.cs @@ -0,0 +1,17 @@ +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryListImplement.Implements +{ + public class BackUpInfo : IBackUpInfo + { + public List? GetList() where T : class, new() + { + throw new NotImplementedException(); + } + + public Type? GetTypeByModelInterface(string modelInterfaceName) + { + throw new NotImplementedException(); + } + } +} diff --git a/FishFactoryListImplement/Implements/ListImplementationExtension.cs b/FishFactoryListImplement/Implements/ListImplementationExtension.cs new file mode 100644 index 0000000..456ff9d --- /dev/null +++ b/FishFactoryListImplement/Implements/ListImplementationExtension.cs @@ -0,0 +1,20 @@ +using FishFactoryContracts.DependencyInjection; +using FishFactoryContracts.StoragesContracts; + +namespace FishFactoryListImplement.Implements +{ + public class ListImplementationExtension : IImplementationExtension + { + public int Priority => 0; + public void RegisterServices() + { + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + DependencyManager.Instance.RegisterType(); + } + } +} diff --git a/FishFactoryListImplement/Models/MessageInfo.cs b/FishFactoryListImplement/Models/MessageInfo.cs index 6e1a05a..e965424 100644 --- a/FishFactoryListImplement/Models/MessageInfo.cs +++ b/FishFactoryListImplement/Models/MessageInfo.cs @@ -6,7 +6,9 @@ namespace FishFactoryListImplement.Models { public class MessageInfo : IMessageInfoModel { - public string MessageId { get; private set; } = string.Empty; + public int Id => throw new NotImplementedException(); + + public string MessageId { get; private set; } = string.Empty; public int? ClientId { get; private set; } @@ -44,5 +46,6 @@ namespace FishFactoryListImplement.Models SenderName = SenderName, DateDelivery = DateDelivery, }; - } + + } }