Исправил лабу.

.gitignore

@@ -14,6 +14,8 @@
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
 
+ImplementationExtensions
+
 # Mono auto generated files
 mono_crash.*
 

BlacksmithWorkshop/BlackmithWorkshopRestApi/Controllers/ClientController.cs

@@ -15,13 +15,17 @@ namespace BlacksmithWorkshopRestApi.Controllers
 
         private readonly IClientLogic _logic;
 
-        public ClientController(IClientLogic logic, ILogger<ClientController> logger)
-        {
-            _logger = logger;
-            _logic = logic;
-        }
+		private readonly IMessageInfoLogic _mailLogic;
 
-        [HttpGet]
+		public ClientController(IClientLogic logic, IMessageInfoLogic mailLogic, ILogger<ClientController> logger)
+		{
+			_logger = logger;
+			_logic = logic;
+			_mailLogic = mailLogic;
+		}
+
+
+		[HttpGet]
         public ClientViewModel? Login(string login, string password)
         {
             try
@@ -69,5 +73,22 @@ namespace BlacksmithWorkshopRestApi.Controllers
                 throw;
             }
         }
-    }
+
+		[HttpGet]
+		public List<MessageInfoViewModel>? GetMessages(int clientId)
+		{
+			try
+			{
+				return _mailLogic.ReadList(new MessageInfoSearchModel
+				{
+					ClientId = clientId
+				});
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка получения писем клиента");
+				throw;
+			}
+		}
+	}
 }

BlacksmithWorkshop/BlackmithWorkshopRestApi/Controllers/MainController.cs

@@ -73,7 +73,7 @@ namespace BlacksmithWorkshopRestApi.Controllers
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Ошибка получения списка заказов клиента id ={ Id}", clientId);
-                throw;
+            throw;
             }
         }
 

BlacksmithWorkshop/BlackmithWorkshopRestApi/Controllers/ShopController.cs

@@ -1,110 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using Microsoft.AspNetCore.Mvc;
-
-namespace BlacksmithWorkshopRestApi.Controllers
-{
-	//настройка у контроллера, так как снова используем несколько Post и Get запросов
-	[Route("api/[controller]/[action]")]
-	[ApiController]
-	public class ShopController : Controller
-	{
-		private readonly ILogger _logger;
-
-		private readonly IShopLogic _logic;
-
-		public ShopController(IShopLogic logic, ILogger<ShopController> logger)
-		{
-			_logger = logger;
-			_logic = logic;
-		}
-
-		[HttpGet]
-		public List<ShopViewModel>? GetShopList()
-		{
-			try
-			{
-				return _logic.ReadList(null);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения списка магазинов");
-				throw;
-			}
-		}
-
-		[HttpGet]
-		public ShopViewModel? GetShop(int shopId)
-		{
-			try
-			{
-				return _logic.ReadElement(new ShopSearchModel { Id = shopId });
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка получения магазина по id={Id}", shopId);
-				throw;
-			}
-		}
-
-		[HttpPost]
-		public void CreateShop(ShopBindingModel model)
-		{
-			try
-			{
-				//создание магазина
-				_logic.Create(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка создания магазина");
-				throw;
-			}
-		}
-
-		[HttpPost]
-		public void UpdateShop(ShopBindingModel model)
-		{
-			try
-			{
-				//изменение магазина
-				_logic.Update(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка обновления данных магазина");
-				throw;
-			}
-		}
-
-		[HttpPost]
-		public void DeleteShop(ShopBindingModel model)
-		{
-			try
-			{
-				_logic.Delete(model);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка удаления магазина");
-				throw;
-			}
-		}
-
-		[HttpPost]
-		public void AddManufacture(Tuple<ShopSearchModel, ManufactureBindingModel, int> model)
-		{
-			try
-			{
-				_logic.AddManufacture(model.Item1, model.Item2, model.Item3);
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка добавления изделия в магазин");
-				throw;
-			}
-		}
-	}
-}

BlacksmithWorkshop/BlackmithWorkshopRestApi/Program.cs

@@ -1,4 +1,6 @@
 using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopBusinessLogic.MailWorker;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
 using BlacksmithWorkshopContracts.StoragesContracts;
 using BlacksmithWorkshopDatabaseImplement.Implements;
@@ -14,12 +16,16 @@ builder.Logging.AddLog4Net("log4net.config");
 builder.Services.AddTransient<IClientStorage, ClientStorage>();
 builder.Services.AddTransient<IOrderStorage, OrderStorage>();
 builder.Services.AddTransient<IManufactureStorage, ManufactureStorage>();
-builder.Services.AddTransient<IShopStorage, ShopStorage>();
+builder.Services.AddTransient<IImplementerStorage, ImplementerStorage>();
+builder.Services.AddTransient<IMessageInfoStorage, MessageInfoStorage>();
 
 builder.Services.AddTransient<IOrderLogic, OrderLogic>();
 builder.Services.AddTransient<IClientLogic, ClientLogic>();
 builder.Services.AddTransient<IManufactureLogic, ManufactureLogic>();
-builder.Services.AddTransient<IShopLogic, ShopLogic>();
+builder.Services.AddTransient<IImplementerLogic, ImplementerLogic>();
+builder.Services.AddTransient<IMessageInfoLogic, MessageInfoLogic>();
+
+builder.Services.AddSingleton<AbstractMailWorker, MailKitWorker>();
 
 builder.Services.AddControllers();
 
@@ -34,6 +40,18 @@ builder.Services.AddSwaggerGen(c =>
 
 var app = builder.Build();
 
+var mailSender = app.Services.GetService<AbstractMailWorker>();
+
+mailSender?.MailConfig(new MailConfigBindingModel
+{
+    MailLogin = builder.Configuration?.GetSection("MailLogin")?.Value?.ToString() ?? string.Empty,
+    MailPassword = builder.Configuration?.GetSection("MailPassword")?.Value?.ToString() ?? string.Empty,
+    SmtpClientHost = builder.Configuration?.GetSection("SmtpClientHost")?.Value?.ToString() ?? string.Empty,
+    SmtpClientPort = Convert.ToInt32(builder.Configuration?.GetSection("SmtpClientPort")?.Value?.ToString()),
+    PopHost = builder.Configuration?.GetSection("PopHost")?.Value?.ToString() ?? string.Empty,
+    PopPort = Convert.ToInt32(builder.Configuration?.GetSection("PopPort")?.Value?.ToString())
+});
+
 // Configure the HTTP request pipeline.
 if (app.Environment.IsDevelopment())
 {

BlacksmithWorkshop/BlackmithWorkshopRestApi/appsettings.json

@@ -5,5 +5,12 @@
       "Microsoft.AspNetCore": "Warning"
     }
   },
-  "AllowedHosts": "*"
+  "AllowedHosts": "*",
+
+  "SmtpClientHost": "smtp.gmail.com",
+  "SmtpClientPort": "587",
+  "PopHost": "pop.gmail.com",
+  "PopPort": "995",
+  "MailLogin": "uveselchak99@gmail.com",
+  "MailPassword": "nqkv jzzq fryi leao"
 }

BlacksmithWorkshop/BlacksmithWorkshop.sln

@@ -17,11 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopFileImple
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopDatabaseImplement", "BlacksmithWorkshopDatabaseImplement\BlacksmithWorkshopDatabaseImplement.csproj", "{EE03BAE3-52EE-4E3B-8992-382D89E61E1A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopRestApi", "BlackmithWorkshopRestApi\BlacksmithWorkshopRestApi.csproj", "{23DBD9A3-2107-44AB-8B87-6982BFD2E69A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopRestApi", "BlackmithWorkshopRestApi\BlacksmithWorkshopRestApi.csproj", "{23DBD9A3-2107-44AB-8B87-6982BFD2E69A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopClientApp", "BlacksmithWorkshopClientApp\BlacksmithWorkshopClientApp.csproj", "{FCA95914-11AF-494A-8116-BB7B3253D925}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopShopApp", "BlacksmithWorkshopShopApp\BlacksmithWorkshopShopApp.csproj", "{3ADC69D9-EACA-4D59-840E-EB4A7F40BAEE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshopClientApp", "BlacksmithWorkshopClientApp\BlacksmithWorkshopClientApp.csproj", "{FCA95914-11AF-494A-8116-BB7B3253D925}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -65,10 +63,6 @@ Global
 		{FCA95914-11AF-494A-8116-BB7B3253D925}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCA95914-11AF-494A-8116-BB7B3253D925}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FCA95914-11AF-494A-8116-BB7B3253D925}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3ADC69D9-EACA-4D59-840E-EB4A7F40BAEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3ADC69D9-EACA-4D59-840E-EB4A7F40BAEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3ADC69D9-EACA-4D59-840E-EB4A7F40BAEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3ADC69D9-EACA-4D59-840E-EB4A7F40BAEE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

BlacksmithWorkshop/BlacksmithWorkshop/App.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <appSettings>
+    <add key="SmtpClientHost" value="smtp.gmail.com" />
+    <add key="SmtpClientPort" value="587" />
+    <add key="PopHost" value="pop.gmail.com" />
+    <add key="PopPort" value="995" />
+    <add key="MailLogin" value="uveselchak99@gmail.com" />
+    <add key="MailPassword" value="nqkv jzzq fryi leao" />
+  </appSettings>
+</configuration>

BlacksmithWorkshop/BlacksmithWorkshop/BlacksmithWorkshop.csproj

@@ -9,12 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.ReportingServices.ReportViewerControl.Winforms" Version="140.340.80" />
+    <PackageReference Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
     <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.17" />
   </ItemGroup>
@@ -27,4 +30,10 @@
     <ProjectReference Include="..\BlacksmithWorkshopListImplement\BlacksmithWorkshopListImplement.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Update="App.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
 </Project>

BlacksmithWorkshop/BlacksmithWorkshop/DataGridViewExtension.cs

@@ -0,0 +1,63 @@
+using BlacksmithWorkshopContracts.Attributes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshop
+{
+    public static class DataGridViewExtension
+    {
+        public static void FillandConfigGrid<T>(this DataGridView grid, List<T>? 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;
+                    }
+                }
+            }
+        }
+    }
+
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormAddManufacture.Designer.cs

@@ -1,151 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormAddManufacture
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelIceCream = new System.Windows.Forms.Label();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.labelShop = new System.Windows.Forms.Label();
-            this.comboBoxManufacture = new System.Windows.Forms.ComboBox();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.comboBoxShop = new System.Windows.Forms.ComboBox();
-            this.SuspendLayout();
-            // 
-            // labelIceCream
-            // 
-            this.labelIceCream.AutoSize = true;
-            this.labelIceCream.Location = new System.Drawing.Point(28, 58);
-            this.labelIceCream.Name = "labelIceCream";
-            this.labelIceCream.Size = new System.Drawing.Size(56, 15);
-            this.labelIceCream.TabIndex = 0;
-            this.labelIceCream.Text = "Изделие:";
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(28, 91);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(75, 15);
-            this.labelCount.TabIndex = 1;
-            this.labelCount.Text = "Количество:";
-            // 
-            // labelShop
-            // 
-            this.labelShop.AutoSize = true;
-            this.labelShop.Location = new System.Drawing.Point(28, 23);
-            this.labelShop.Name = "labelShop";
-            this.labelShop.Size = new System.Drawing.Size(57, 15);
-            this.labelShop.TabIndex = 2;
-            this.labelShop.Text = "Магазин:";
-            // 
-            // comboBoxManufacture
-            // 
-            this.comboBoxManufacture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxManufacture.FormattingEnabled = true;
-            this.comboBoxManufacture.Location = new System.Drawing.Point(149, 55);
-            this.comboBoxManufacture.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxManufacture.Name = "comboBoxManufacture";
-            this.comboBoxManufacture.Size = new System.Drawing.Size(230, 23);
-            this.comboBoxManufacture.TabIndex = 3;
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(149, 88);
-            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(230, 23);
-            this.textBoxCount.TabIndex = 4;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(209, 123);
-            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(82, 22);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(297, 123);
-            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(82, 22);
-            this.buttonCancel.TabIndex = 7;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // comboBoxShop
-            // 
-            this.comboBoxShop.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxShop.FormattingEnabled = true;
-            this.comboBoxShop.Location = new System.Drawing.Point(149, 23);
-            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.comboBoxShop.Name = "comboBoxShop";
-            this.comboBoxShop.Size = new System.Drawing.Size(230, 23);
-            this.comboBoxShop.TabIndex = 8;
-            // 
-            // FormAddManufacture
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(394, 159);
-            this.Controls.Add(this.comboBoxShop);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxManufacture);
-            this.Controls.Add(this.labelShop);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.labelIceCream);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormAddManufacture";
-            this.Text = "Пополнение магазина";
-            this.Load += new System.EventHandler(this.FormAddManufacture_Load_1);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelIceCream;
-        private Label labelCount;
-        private Label labelShop;
-        private ComboBox comboBoxManufacture;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private ComboBox comboBoxShop;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormAddManufacture.cs

@@ -1,128 +0,0 @@
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-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 BlacksmithWorkshop
-{
-    public partial class FormAddManufacture : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IManufactureLogic _logicI;
-        private readonly IShopLogic _logicS;
-
-        public FormAddManufacture(ILogger<FormAddManufacture> logger, IManufactureLogic logicI, IShopLogic logicS)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logicI = logicI;
-            _logicS = logicS;
-        }
-
-        private void FormAddManufacture_Load_1(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка списка изделий для пополнения");
-
-            try
-            {
-                var list = _logicI.ReadList(null);
-
-                if (list != null)
-                {
-                    comboBoxManufacture.DisplayMember = "ManufactureName";
-                    comboBoxManufacture.ValueMember = "Id";
-                    comboBoxManufacture.DataSource = list;
-                    comboBoxManufacture.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка изделий");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-
-            _logger.LogInformation("Загрузка списка магазинов для пополнения");
-            try
-            {
-                var list = _logicS.ReadList(null);
-
-                if (list != null)
-                {
-                    comboBoxShop.DisplayMember = "ShopName";
-                    comboBoxShop.ValueMember = "Id";
-                    comboBoxShop.DataSource = list;
-                    comboBoxShop.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxManufacture.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxShop.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите магазин", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _logger.LogInformation("Пополнение магазина");
-
-            try
-            {
-                var operationResult = _logicS.AddManufacture(new ShopSearchModel
-                {
-                    Id = Convert.ToInt32(comboBoxShop.SelectedValue)
-                },
-
-                _logicI.ReadElement(new ManufactureSearchModel()
-                {
-                    Id = Convert.ToInt32(comboBoxManufacture.SelectedValue)
-                })!, Convert.ToInt32(textBoxCount.Text));
-
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при пополнении магазина. Дополнительная информация в логах.");
-                }
-
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка создания заказа");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormClients.cs

@@ -36,21 +36,12 @@ namespace BlacksmithWorkshop
 
 		private void LoadData()
 		{
-			_logger.LogInformation("Загрузка клиентов");
-
-			try
-			{
-				var list = _clientLogic.ReadList(null);
-
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-				}
-
-				_logger.LogInformation("Успешная загрузка клиентов");
-			}
-			catch (Exception ex)
+            try
+            {
+                dataGridView.FillandConfigGrid(_clientLogic.ReadList(null));
+                _logger.LogInformation("Загрузка клиентов");
+            }
+            catch (Exception ex)
 			{
 				_logger.LogError(ex, "Ошибка загрузки клиентов");
 				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);

BlacksmithWorkshop/BlacksmithWorkshop/FormImplementers.cs

@@ -1,5 +1,7 @@
-using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -34,19 +36,11 @@ namespace BlacksmithWorkshop
 
 		private void LoadData()
 		{
-			try
-			{
-				var list = _logic.ReadList(null);
+            try
+            {
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
 
-				//растягиваем колонку Название на всю ширину, колонку Id скрываем
-				if (list != null)
-				{
-					dataGridView.DataSource = list;
-					dataGridView.Columns["Id"].Visible = false;
-					dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-				}
-
-				_logger.LogInformation("Загрузка исполнителей");
+                _logger.LogInformation("Загрузка исполнителей");
 			}
 			catch (Exception ex)
 			{
@@ -58,14 +52,11 @@ namespace BlacksmithWorkshop
 
 		private void ButtonCreate_Click(object sender, EventArgs e)
 		{
-			var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+			var form = DependencyManager.Instance.Resolve<FormImplementer>();
 
-			if (service is FormImplementer form)
+			if (form.ShowDialog() == DialogResult.OK)
 			{
-				if (form.ShowDialog() == DialogResult.OK)
-				{
-					LoadData();
-				}
+				LoadData();
 			}
 		}
 
@@ -73,16 +64,13 @@ namespace BlacksmithWorkshop
 		{
 			if (dataGridView.SelectedRows.Count == 1)
 			{
-				var service = Program.ServiceProvider?.GetService(typeof(FormImplementer));
+				var form = DependencyManager.Instance.Resolve<FormImplementer>();
 
-				if (service is FormImplementer form)
+				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+
+				if (form.ShowDialog() == DialogResult.OK)
 				{
-					form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-
-					if (form.ShowDialog() == DialogResult.OK)
-					{
-						LoadData();
-					}
+					LoadData();
 				}
 			}
 		}

BlacksmithWorkshop/BlacksmithWorkshop/FormMails.Designer.cs

@@ -0,0 +1,63 @@
+namespace BlacksmithWorkshop
+{
+	partial class FormMails
+	{
+		/// <summary>
+		/// Required designer variable.
+		/// </summary>
+		private System.ComponentModel.IContainer components = null;
+
+		/// <summary>
+		/// Clean up any resources being used.
+		/// </summary>
+		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+		protected override void Dispose(bool disposing)
+		{
+			if (disposing && (components != null))
+			{
+				components.Dispose();
+			}
+			base.Dispose(disposing);
+		}
+
+		#region Windows Form Designer generated code
+
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			dataGridView = new DataGridView();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// dataGridView
+			// 
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Dock = DockStyle.Fill;
+			dataGridView.Location = new Point(0, 0);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowHeadersWidth = 51;
+			dataGridView.RowTemplate.Height = 29;
+			dataGridView.Size = new Size(800, 450);
+			dataGridView.TabIndex = 0;
+			// 
+			// FormMails
+			// 
+			AutoScaleDimensions = new SizeF(8F, 20F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(800, 450);
+			Controls.Add(dataGridView);
+			Name = "FormMails";
+			Text = "Письма";
+			Load += FormMails_Load;
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+		}
+
+		#endregion
+
+		private DataGridView dataGridView;
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormMails.cs

@@ -0,0 +1,52 @@
+using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopContracts.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 BlacksmithWorkshop
+{
+	public partial class FormMails : Form
+	{
+		private readonly ILogger _logger;
+
+		private readonly IMessageInfoLogic _messageLogic;
+
+		public FormMails(ILogger<FormMails> logger, IMessageInfoLogic messageLogic)
+		{
+			InitializeComponent();
+
+			_logger = logger;
+			_messageLogic = messageLogic;
+		}
+
+		private void FormMails_Load(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+
+		private void LoadData()
+		{
+			_logger.LogInformation("Загрузка писем");
+
+			try
+			{
+                dataGridView.FillandConfigGrid(_messageLogic.ReadList(null));
+
+                _logger.LogInformation("Успешная загрузка писем");
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки писем");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs

@@ -36,21 +36,17 @@
             toolStripMenuItem = new ToolStripMenuItem();
             workPieceToolStripMenuItem = new ToolStripMenuItem();
             manufactureToolStripMenuItem = new ToolStripMenuItem();
-            shopToolStripMenuItem = new ToolStripMenuItem();
-            addManufactureToolStripMenuItem = new ToolStripMenuItem();
-            reportToolStripMenuItem = new ToolStripMenuItem();
-            groupedOrdersReportToolStripMenuItem = new ToolStripMenuItem();
-            ordersReportToolStripMenuItem = new ToolStripMenuItem();
-            workloadStoresReportToolStripMenuItem = new ToolStripMenuItem();
-            shopsReportToolStripMenuItem = new ToolStripMenuItem();
-            reportManufactureToolStripMenuItem = new ToolStripMenuItem();
+            mailsToolStripMenuItem = new ToolStripMenuItem();
+            reportsToolStripMenuItem = new ToolStripMenuItem();
+            workPiecesToolStripMenuItem = new ToolStripMenuItem();
             workPieceManufacturesToolStripMenuItem = new ToolStripMenuItem();
-            workWithImplementerToolStripMenuItem = new ToolStripMenuItem();
-            implementerToolStripMenuItem = new ToolStripMenuItem();
-            работаСКлиентамиToolStripMenuItem = new ToolStripMenuItem();
+            ordersToolStripMenuItem = new ToolStripMenuItem();
+            workWithClientsToolStripMenuItem = new ToolStripMenuItem();
             clientsToolStripMenuItem = new ToolStripMenuItem();
-            startWorkToolStripMenuItem = new ToolStripMenuItem();
-            buttonSellManufacture = new Button();
+            работаСИсполнителямиToolStripMenuItem = new ToolStripMenuItem();
+            implementerToolStripMenuItem = new ToolStripMenuItem();
+            startingWorkToolStripMenuItem = new ToolStripMenuItem();
+            createBackUpToolStripMenuItem = new ToolStripMenuItem();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             menuStrip.SuspendLayout();
             SuspendLayout();
@@ -58,16 +54,16 @@
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(11, 36);
+            dataGridView.Location = new Point(12, 36);
             dataGridView.Name = "dataGridView";
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 29;
-            dataGridView.Size = new Size(937, 448);
+            dataGridView.Size = new Size(1209, 402);
             dataGridView.TabIndex = 0;
             // 
             // buttonCreateOrder
             // 
-            buttonCreateOrder.Location = new Point(1014, 67);
+            buttonCreateOrder.Location = new Point(1247, 70);
             buttonCreateOrder.Name = "buttonCreateOrder";
             buttonCreateOrder.Size = new Size(235, 29);
             buttonCreateOrder.TabIndex = 1;
@@ -77,7 +73,7 @@
             // 
             // buttonIssuedOrder
             // 
-            buttonIssuedOrder.Location = new Point(1014, 141);
+            buttonIssuedOrder.Location = new Point(1247, 144);
             buttonIssuedOrder.Name = "buttonIssuedOrder";
             buttonIssuedOrder.Size = new Size(235, 29);
             buttonIssuedOrder.TabIndex = 4;
@@ -87,7 +83,7 @@
             // 
             // buttonRef
             // 
-            buttonRef.Location = new Point(1014, 214);
+            buttonRef.Location = new Point(1247, 221);
             buttonRef.Name = "buttonRef";
             buttonRef.Size = new Size(235, 29);
             buttonRef.TabIndex = 5;
@@ -98,17 +94,16 @@
             // menuStrip
             // 
             menuStrip.ImageScalingSize = new Size(20, 20);
-            menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, reportToolStripMenuItem, workWithImplementerToolStripMenuItem, работаСКлиентамиToolStripMenuItem, startWorkToolStripMenuItem });
+            menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, reportsToolStripMenuItem, workWithClientsToolStripMenuItem, работаСИсполнителямиToolStripMenuItem, startingWorkToolStripMenuItem, createBackUpToolStripMenuItem });
             menuStrip.Location = new Point(0, 0);
             menuStrip.Name = "menuStrip";
-            menuStrip.Padding = new Padding(6, 3, 0, 3);
-            menuStrip.Size = new Size(1297, 30);
+            menuStrip.Size = new Size(1506, 28);
             menuStrip.TabIndex = 6;
             menuStrip.Text = "menuStrip1";
             // 
             // toolStripMenuItem
             // 
-            toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { workPieceToolStripMenuItem, manufactureToolStripMenuItem, shopToolStripMenuItem, addManufactureToolStripMenuItem });
+            toolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { workPieceToolStripMenuItem, manufactureToolStripMenuItem, mailsToolStripMenuItem });
             toolStripMenuItem.Name = "toolStripMenuItem";
             toolStripMenuItem.Size = new Size(117, 24);
             toolStripMenuItem.Text = "Справочники";
@@ -116,131 +111,99 @@
             // workPieceToolStripMenuItem
             // 
             workPieceToolStripMenuItem.Name = "workPieceToolStripMenuItem";
-            workPieceToolStripMenuItem.Size = new Size(251, 26);
+            workPieceToolStripMenuItem.Size = new Size(162, 26);
             workPieceToolStripMenuItem.Text = "Заготовки";
             workPieceToolStripMenuItem.Click += WorkPieceToolStripMenuItem_Click;
             // 
             // manufactureToolStripMenuItem
             // 
             manufactureToolStripMenuItem.Name = "manufactureToolStripMenuItem";
-            manufactureToolStripMenuItem.Size = new Size(251, 26);
+            manufactureToolStripMenuItem.Size = new Size(162, 26);
             manufactureToolStripMenuItem.Text = "Изделия";
             manufactureToolStripMenuItem.Click += ManufactureToolStripMenuItem_Click;
             // 
-            // shopToolStripMenuItem
+            // mailsToolStripMenuItem
             // 
-            shopToolStripMenuItem.Name = "shopToolStripMenuItem";
-            shopToolStripMenuItem.Size = new Size(251, 26);
-            shopToolStripMenuItem.Text = "Магазины";
-            shopToolStripMenuItem.Click += ShopToolStripMenuItem_Click;
+            mailsToolStripMenuItem.Name = "mailsToolStripMenuItem";
+            mailsToolStripMenuItem.Size = new Size(162, 26);
+            mailsToolStripMenuItem.Text = "Письма";
+            mailsToolStripMenuItem.Click += MailsToolStripMenuItem_Click;
             // 
-            // addManufactureToolStripMenuItem
+            // reportsToolStripMenuItem
             // 
-            addManufactureToolStripMenuItem.Name = "addManufactureToolStripMenuItem";
-            addManufactureToolStripMenuItem.Size = new Size(251, 26);
-            addManufactureToolStripMenuItem.Text = "Пополнение магазина";
-            addManufactureToolStripMenuItem.Click += AddManufactureToolStripMenuItem_Click;
+            reportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { workPiecesToolStripMenuItem, workPieceManufacturesToolStripMenuItem, ordersToolStripMenuItem });
+            reportsToolStripMenuItem.Name = "reportsToolStripMenuItem";
+            reportsToolStripMenuItem.Size = new Size(73, 24);
+            reportsToolStripMenuItem.Text = "Отчёты";
             // 
-            // reportToolStripMenuItem
+            // workPiecesToolStripMenuItem
             // 
-            reportToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { groupedOrdersReportToolStripMenuItem, ordersReportToolStripMenuItem, workloadStoresReportToolStripMenuItem, shopsReportToolStripMenuItem, reportManufactureToolStripMenuItem, workPieceManufacturesToolStripMenuItem });
-            reportToolStripMenuItem.Name = "reportToolStripMenuItem";
-            reportToolStripMenuItem.Size = new Size(73, 24);
-            reportToolStripMenuItem.Text = "Отчёты";
-            // 
-            // groupedOrdersReportToolStripMenuItem
-            // 
-            groupedOrdersReportToolStripMenuItem.Name = "groupedOrdersReportToolStripMenuItem";
-            groupedOrdersReportToolStripMenuItem.Size = new Size(310, 26);
-            groupedOrdersReportToolStripMenuItem.Text = "Список заказов за весь период";
-            groupedOrdersReportToolStripMenuItem.Click += GroupedOrdersReportToolStripMenuItem_Click;
-            // 
-            // ordersReportToolStripMenuItem
-            // 
-            ordersReportToolStripMenuItem.Name = "ordersReportToolStripMenuItem";
-            ordersReportToolStripMenuItem.Size = new Size(310, 26);
-            ordersReportToolStripMenuItem.Text = "Список заказов";
-            ordersReportToolStripMenuItem.Click += OrdersReportToolStripMenuItem_Click;
-            // 
-            // workloadStoresReportToolStripMenuItem
-            // 
-            workloadStoresReportToolStripMenuItem.Name = "workloadStoresReportToolStripMenuItem";
-            workloadStoresReportToolStripMenuItem.Size = new Size(310, 26);
-            workloadStoresReportToolStripMenuItem.Text = "Загруженность магазинов";
-            workloadStoresReportToolStripMenuItem.Click += WorkloadStoresReportToolStripMenuItem_Click;
-            // 
-            // shopsReportToolStripMenuItem
-            // 
-            shopsReportToolStripMenuItem.Name = "shopsReportToolStripMenuItem";
-            shopsReportToolStripMenuItem.Size = new Size(310, 26);
-            shopsReportToolStripMenuItem.Text = "Таблица магазинов";
-            shopsReportToolStripMenuItem.Click += ShopsReportToolStripMenuItem_Click;
-            // 
-            // reportManufactureToolStripMenuItem
-            // 
-            reportManufactureToolStripMenuItem.Name = "reportManufactureToolStripMenuItem";
-            reportManufactureToolStripMenuItem.Size = new Size(310, 26);
-            reportManufactureToolStripMenuItem.Text = "Список изделий";
-            reportManufactureToolStripMenuItem.Click += ReportManufactureToolStripMenuItem_Click;
+            workPiecesToolStripMenuItem.Name = "workPiecesToolStripMenuItem";
+            workPiecesToolStripMenuItem.Size = new Size(256, 26);
+            workPiecesToolStripMenuItem.Text = "Список заготовок";
+            workPiecesToolStripMenuItem.Click += WorkPiecesToolStripMenuItem_Click;
             // 
             // workPieceManufacturesToolStripMenuItem
             // 
             workPieceManufacturesToolStripMenuItem.Name = "workPieceManufacturesToolStripMenuItem";
-            workPieceManufacturesToolStripMenuItem.Size = new Size(310, 26);
+            workPieceManufacturesToolStripMenuItem.Size = new Size(256, 26);
             workPieceManufacturesToolStripMenuItem.Text = "Заготовки по изделиям";
             workPieceManufacturesToolStripMenuItem.Click += WorkPieceManufacturesToolStripMenuItem_Click;
             // 
-            // workWithImplementerToolStripMenuItem
+            // ordersToolStripMenuItem
             // 
-            workWithImplementerToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { implementerToolStripMenuItem });
-            workWithImplementerToolStripMenuItem.Name = "workWithImplementerToolStripMenuItem";
-            workWithImplementerToolStripMenuItem.Size = new Size(196, 24);
-            workWithImplementerToolStripMenuItem.Text = "Работа с исполнителями";
+            ordersToolStripMenuItem.Name = "ordersToolStripMenuItem";
+            ordersToolStripMenuItem.Size = new Size(256, 26);
+            ordersToolStripMenuItem.Text = "Список заказов";
+            ordersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
+            // 
+            // workWithClientsToolStripMenuItem
+            // 
+            workWithClientsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { clientsToolStripMenuItem });
+            workWithClientsToolStripMenuItem.Name = "workWithClientsToolStripMenuItem";
+            workWithClientsToolStripMenuItem.Size = new Size(161, 24);
+            workWithClientsToolStripMenuItem.Text = "Работа с клиентами";
+            // 
+            // clientsToolStripMenuItem
+            // 
+            clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
+            clientsToolStripMenuItem.Size = new Size(152, 26);
+            clientsToolStripMenuItem.Text = "Клиенты";
+            clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
+            // 
+            // работаСИсполнителямиToolStripMenuItem
+            // 
+            работаСИсполнителямиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { implementerToolStripMenuItem });
+            работаСИсполнителямиToolStripMenuItem.Name = "работаСИсполнителямиToolStripMenuItem";
+            работаСИсполнителямиToolStripMenuItem.Size = new Size(196, 24);
+            работаСИсполнителямиToolStripMenuItem.Text = "Работа с исполнителями";
             // 
             // implementerToolStripMenuItem
             // 
             implementerToolStripMenuItem.Name = "implementerToolStripMenuItem";
             implementerToolStripMenuItem.Size = new Size(185, 26);
             implementerToolStripMenuItem.Text = "Исполнители";
-            implementerToolStripMenuItem.Click += ImplementerToolStripMenuItem_Click_1;
+            implementerToolStripMenuItem.Click += ImplementerToolStripMenuItem_Click;
             // 
-            // работаСКлиентамиToolStripMenuItem
+            // startingWorkToolStripMenuItem
             // 
-            работаСКлиентамиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { clientsToolStripMenuItem });
-            работаСКлиентамиToolStripMenuItem.Name = "работаСКлиентамиToolStripMenuItem";
-            работаСКлиентамиToolStripMenuItem.Size = new Size(161, 24);
-            работаСКлиентамиToolStripMenuItem.Text = "Работа с клиентами";
+            startingWorkToolStripMenuItem.Name = "startingWorkToolStripMenuItem";
+            startingWorkToolStripMenuItem.Size = new Size(114, 24);
+            startingWorkToolStripMenuItem.Text = "Запуск работ";
+            startingWorkToolStripMenuItem.Click += StartingWorkToolStripMenuItem_Click;
             // 
-            // clientsToolStripMenuItem
+            // createBackUpToolStripMenuItem
             // 
-            clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
-            clientsToolStripMenuItem.Size = new Size(224, 26);
-            clientsToolStripMenuItem.Text = "Клиенты";
-            clientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click_1;
-            // 
-            // startWorkToolStripMenuItem
-            // 
-            startWorkToolStripMenuItem.Name = "startWorkToolStripMenuItem";
-            startWorkToolStripMenuItem.Size = new Size(114, 24);
-            startWorkToolStripMenuItem.Text = "Запуск работ";
-            startWorkToolStripMenuItem.Click += StartWorkToolStripMenuItem_Click;
-            // 
-            // buttonSellManufacture
-            // 
-            buttonSellManufacture.Location = new Point(1014, 285);
-            buttonSellManufacture.Name = "buttonSellManufacture";
-            buttonSellManufacture.Size = new Size(233, 29);
-            buttonSellManufacture.TabIndex = 7;
-            buttonSellManufacture.Text = "Продажа изделий";
-            buttonSellManufacture.UseVisualStyleBackColor = true;
-            buttonSellManufacture.Click += ButtonSellManufacture_Click;
+            createBackUpToolStripMenuItem.Name = "createBackUpToolStripMenuItem";
+            createBackUpToolStripMenuItem.Size = new Size(123, 24);
+            createBackUpToolStripMenuItem.Text = "Создать бекап";
+            createBackUpToolStripMenuItem.Click += CreateBackUpToolStripMenuItem_Click;
             // 
             // FormMain
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(1297, 496);
-            Controls.Add(buttonSellManufacture);
+            ClientSize = new Size(1506, 450);
             Controls.Add(buttonRef);
             Controls.Add(buttonIssuedOrder);
             Controls.Add(buttonCreateOrder);
@@ -267,20 +230,16 @@
         private ToolStripMenuItem toolStripMenuItem;
         private ToolStripMenuItem workPieceToolStripMenuItem;
         private ToolStripMenuItem manufactureToolStripMenuItem;
-        private ToolStripMenuItem shopToolStripMenuItem;
-        private ToolStripMenuItem addManufactureToolStripMenuItem;
-        private Button buttonSellManufacture;
-        private ToolStripMenuItem reportToolStripMenuItem;
-        private ToolStripMenuItem groupedOrdersReportToolStripMenuItem;
-        private ToolStripMenuItem ordersReportToolStripMenuItem;
-        private ToolStripMenuItem workloadStoresReportToolStripMenuItem;
-        private ToolStripMenuItem shopsReportToolStripMenuItem;
-        private ToolStripMenuItem reportManufactureToolStripMenuItem;
+        private ToolStripMenuItem reportsToolStripMenuItem;
+        private ToolStripMenuItem workPiecesToolStripMenuItem;
         private ToolStripMenuItem workPieceManufacturesToolStripMenuItem;
-        private ToolStripMenuItem workWithImplementerToolStripMenuItem;
-        private ToolStripMenuItem implementerToolStripMenuItem;
-        private ToolStripMenuItem работаСКлиентамиToolStripMenuItem;
+        private ToolStripMenuItem ordersToolStripMenuItem;
+        private ToolStripMenuItem workWithClientsToolStripMenuItem;
         private ToolStripMenuItem clientsToolStripMenuItem;
-        private ToolStripMenuItem startWorkToolStripMenuItem;
+        private ToolStripMenuItem startingWorkToolStripMenuItem;
+        private ToolStripMenuItem работаСИсполнителямиToolStripMenuItem;
+        private ToolStripMenuItem implementerToolStripMenuItem;
+        private ToolStripMenuItem mailsToolStripMenuItem;
+        private ToolStripMenuItem createBackUpToolStripMenuItem;
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs

@@ -1,6 +1,7 @@
 using BlacksmithWorkshopBusinessLogic.BusinessLogic;
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.DI;
 using BlacksmithWorkshopDataModels.Enums;
 using Microsoft.Extensions.Logging;
 using System;
@@ -25,7 +26,9 @@ namespace BlacksmithWorkshop
 
         private readonly IWorkProcess _workProcess;
 
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess)
+        private readonly IBackUpLogic _backUpLogic;
+
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
         {
             InitializeComponent();
 
@@ -33,6 +36,7 @@ namespace BlacksmithWorkshop
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
             _workProcess = workProcess;
+            _backUpLogic = backUpLogic;
         }
 
         private void FormMain_Load(object sender, EventArgs e)
@@ -46,18 +50,7 @@ namespace BlacksmithWorkshop
 
             try
             {
-                var list = _orderLogic.ReadList(null);
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["ManufactureId"].Visible = false;
-                    dataGridView.Columns["ImplementerId"].Visible = false;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                    dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ClientFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ImplementerFIO"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
+                dataGridView.FillandConfigGrid(_orderLogic.ReadList(null));
 
                 _logger.LogInformation("Загрузка заказов");
             }
@@ -70,34 +63,24 @@ namespace BlacksmithWorkshop
 
         private void WorkPieceToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormWorkPieces));
+            var form = DependencyManager.Instance.Resolve<FormWorkPieces>();
 
-            if (service is FormWorkPieces form)
-            {
-                form.ShowDialog();
-            }
+            form.ShowDialog();
         }
 
         private void ManufactureToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormManufactures));
+            var form = DependencyManager.Instance.Resolve<FormManufactures>();
 
-            if (service is FormManufactures form)
-            {
-                form.ShowDialog();
-            }
+            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();
-            }
+            var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
 
+            form.ShowDialog();
+            LoadData();
         }
 
         private void ButtonIssuedOrder_Click(object sender, EventArgs e)
@@ -136,106 +119,7 @@ namespace BlacksmithWorkshop
             LoadData();
         }
 
-        private void ButtonSellManufacture_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormSellManufacture));
-            if (service is FormSellManufacture form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
-        }
-
-        private void ShopToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
-
-            if (service is FormShops form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void AddManufactureToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormAddManufacture));
-
-            if (service is FormAddManufacture form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
-        }
-
-        private void GroupedOrdersReportToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders));
-
-            if (service is FormReportGroupedOrders form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void WorkloadStoresReportToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportShopManufactures));
-
-            if (service is FormReportShopManufactures form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void ShopsReportToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveShopsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            }
-        }
-
-        private void WorkPieceManufacturesToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportManufactureWorkPieces));
-
-            if (service is FormReportManufactureWorkPieces form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void ImplementerToolStripMenuItem_Click_1(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormImplementers));
-
-            if (service is FormImplementers form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void ClientsToolStripMenuItem_Click_1(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
-
-            if (service is FormClients form)
-            {
-                form.ShowDialog();
-            }
-        }
-
-        private void StartWorkToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            _workProcess.DoWork((Program.ServiceProvider?.GetService(typeof(IImplementerLogic)) as IImplementerLogic)!, _orderLogic);
-
-            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-        }
-
-        private void ReportManufactureToolStripMenuItem_Click(object sender, EventArgs e)
+        private void WorkPiecesToolStripMenuItem_Click(object sender, EventArgs e)
         {
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
 
@@ -250,13 +134,71 @@ namespace BlacksmithWorkshop
             }
         }
 
-        private void OrdersReportToolStripMenuItem_Click(object sender, EventArgs e)
+        private void WorkPieceManufacturesToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+            var form = DependencyManager.Instance.Resolve<FormReportManufactureWorkPieces>();
 
-            if (service is FormReportOrders form)
+            form.ShowDialog();
+
+        }
+
+        private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var form = DependencyManager.Instance.Resolve<FormReportOrders>();
+
+            form.ShowDialog();
+        }
+
+        private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var form = DependencyManager.Instance.Resolve<FormClients>();
+
+            form.ShowDialog();
+        }
+
+        private void StartingWorkToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            _workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>()!, _orderLogic);
+
+            MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+        }
+
+        private void ImplementerToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var form = DependencyManager.Instance.Resolve<FormImplementers>();
+
+            form.ShowDialog();
+        }
+
+        private void MailsToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var form = DependencyManager.Instance.Resolve<FormMails>();
+
+            form.ShowDialog();
+        }
+
+        private void CreateBackUpToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
             {
-                form.ShowDialog();
+                if (_backUpLogic != null)
+                {
+                    var fbd = new FolderBrowserDialog();
+
+                    if (fbd.ShowDialog() == DialogResult.OK)
+                    {
+                        _backUpLogic.CreateBackUp(new BackUpSaveBinidngModel
+                        {
+                            FolderName = fbd.SelectedPath
+                        });
+
+                        MessageBox.Show("Бекап создан", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
     }

BlacksmithWorkshop/BlacksmithWorkshop/FormMain.resx

@@ -61,6 +61,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>63</value>
+    <value>81</value>
   </metadata>
 </root>

BlacksmithWorkshop/BlacksmithWorkshop/FormManufacture.cs

@@ -1,5 +1,6 @@
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.DI;
 using BlacksmithWorkshopContracts.SearchModels;
 using BlacksmithWorkshopDataModels.Models;
 using Microsoft.Extensions.Logging;
@@ -89,30 +90,27 @@ namespace BlacksmithWorkshop
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormManufactureWorkPiece));
-           
-            if (service is FormManufactureWorkPiece form)
+            var form = DependencyManager.Instance.Resolve<FormManufactureWorkPiece>();
+
+            if (form.ShowDialog() == DialogResult.OK)
             {
-                if (form.ShowDialog() == DialogResult.OK)
+                if (form.WorkPieceModel == null)
                 {
-                    if (form.WorkPieceModel == null)
-                    {
-                        return;
-                    }
-
-                    _logger.LogInformation("Добавление новой заготовки:{WorkPieceName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count);
-
-                    if (_manufactureWorkPieces.ContainsKey(form.Id))
-                    {
-                        _manufactureWorkPieces[form.Id] = (form.WorkPieceModel, form.Count);
-                    }
-                    else
-                    {
-                        _manufactureWorkPieces.Add(form.Id, (form.WorkPieceModel, form.Count));
-                    }
-
-                    LoadData();
+                    return;
                 }
+
+                _logger.LogInformation("Добавление новой заготовки:{WorkPieceName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count);
+
+                if (_manufactureWorkPieces.ContainsKey(form.Id))
+                {
+                    _manufactureWorkPieces[form.Id] = (form.WorkPieceModel, form.Count);
+                }
+                else
+                {
+                    _manufactureWorkPieces.Add(form.Id, (form.WorkPieceModel, form.Count));
+                }
+
+                LoadData();
             }
         }
 
@@ -120,26 +118,23 @@ namespace BlacksmithWorkshop
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormManufactureWorkPiece));
+                var form = DependencyManager.Instance.Resolve<FormManufactureWorkPiece>();
                 
-                if (service is FormManufactureWorkPiece form)
+                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                form.Id = id;
+                form.Count = _manufactureWorkPieces[id].Item2;
+
+                if (form.ShowDialog() == DialogResult.OK)
                 {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                    form.Id = id;
-                    form.Count = _manufactureWorkPieces[id].Item2;
-
-                    if (form.ShowDialog() == DialogResult.OK)
+                    if (form.WorkPieceModel == null)
                     {
-                        if (form.WorkPieceModel == null)
-                        {
-                            return;
-                        }
-
-                        _logger.LogInformation("Изменение компонента:{WorkPieceName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count); 
-                        _manufactureWorkPieces[form.Id] = (form.WorkPieceModel, form.Count);
-
-                        LoadData();
+                        return;
                     }
+
+                    _logger.LogInformation("Изменение компонента:{WorkPieceName} - {Count}", form.WorkPieceModel.WorkPieceName, form.Count); 
+                    _manufactureWorkPieces[form.Id] = (form.WorkPieceModel, form.Count);
+
+                    LoadData();
                 }
             }
         }

BlacksmithWorkshop/BlacksmithWorkshop/FormManufactures.cs

@@ -1,5 +1,7 @@
-using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -37,15 +39,7 @@ namespace BlacksmithWorkshop
         {
             try
             {
-                var list = _logic.ReadList(null);
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ManufactureWorkPieces"].Visible = false;
-                    dataGridView.Columns["ManufactureName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
 
                 _logger.LogInformation("Загрузка изделий");
             }
@@ -58,14 +52,11 @@ namespace BlacksmithWorkshop
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
+            var form = DependencyManager.Instance.Resolve<FormManufacture>();
 
-            if (service is FormManufacture form)
+            if (form.ShowDialog() == DialogResult.OK)
             {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
+                LoadData();
             }
         }
 
@@ -73,16 +64,13 @@ namespace BlacksmithWorkshop
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormManufacture));
+                var form = DependencyManager.Instance.Resolve<FormManufacture>();
 
-                if (service is FormManufacture form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
                     
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
                 }
             }
         }

BlacksmithWorkshop/BlacksmithWorkshop/FormReportGroupedOrders.Designer.cs

@@ -1,92 +0,0 @@
-namespace BlacksmithWorkshop
-{
-	partial class FormReportGroupedOrders
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			panel = new Panel();
-			buttonToPdf = new Button();
-			buttonMake = new Button();
-			panel.SuspendLayout();
-			SuspendLayout();
-			// 
-			// panel
-			// 
-			panel.Controls.Add(buttonToPdf);
-			panel.Controls.Add(buttonMake);
-			panel.Dock = DockStyle.Top;
-			panel.Location = new Point(0, 0);
-			panel.Margin = new Padding(4, 3, 4, 3);
-			panel.Name = "panel";
-			panel.Size = new Size(1031, 40);
-			panel.TabIndex = 0;
-			// 
-			// buttonToPdf
-			// 
-			buttonToPdf.Anchor = AnchorStyles.Top | AnchorStyles.Right;
-			buttonToPdf.Location = new Point(878, 8);
-			buttonToPdf.Margin = new Padding(4, 3, 4, 3);
-			buttonToPdf.Name = "buttonToPdf";
-			buttonToPdf.Size = new Size(139, 27);
-			buttonToPdf.TabIndex = 5;
-			buttonToPdf.Text = "В Pdf";
-			buttonToPdf.UseVisualStyleBackColor = true;
-			buttonToPdf.Click += ButtonToPdf_Click;
-			// 
-			// buttonMake
-			// 
-			buttonMake.Location = new Point(476, 8);
-			buttonMake.Margin = new Padding(4, 3, 4, 3);
-			buttonMake.Name = "buttonMake";
-			buttonMake.Size = new Size(139, 27);
-			buttonMake.TabIndex = 4;
-			buttonMake.Text = "Сформировать";
-			buttonMake.UseVisualStyleBackColor = true;
-			buttonMake.Click += ButtonMake_Click;
-			// 
-			// FormReportOrders
-			// 
-			AutoScaleDimensions = new SizeF(7F, 15F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(1031, 647);
-			Controls.Add(panel);
-			Margin = new Padding(4, 3, 4, 3);
-			Name = "FormReportOrders";
-			StartPosition = FormStartPosition.CenterScreen;
-			Text = "Заказы";
-			panel.ResumeLayout(false);
-			panel.PerformLayout();
-			ResumeLayout(false);
-		}
-
-		#endregion
-
-		private Panel panel;
-		private Button buttonToPdf;
-		private Button buttonMake;
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportGroupedOrders.cs

@@ -1,87 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-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 BlacksmithWorkshop
-{
-	public partial class FormReportGroupedOrders : Form
-	{
-		private readonly ReportViewer reportViewer;
-
-		private readonly ILogger _logger;
-
-		private readonly IReportLogic _logic;
-
-		public FormReportGroupedOrders(ILogger<FormReportGroupedOrders> logger, IReportLogic logic)
-		{
-			InitializeComponent();
-
-			_logger = logger;
-			_logic = logic;
-
-			reportViewer = new ReportViewer
-			{
-				Dock = DockStyle.Fill
-			};
-
-			reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\Programmist73\\Desktop\\Практика\\2-й курс\\4-й семестр\\PIbd-21_Eliseev_E.E._BlacksmithWorkshop\\BlacksmithWorkshop\\BlacksmithWorkshop\\ReportGroupedOrders.rdlc", FileMode.Open));
-			Controls.Clear();
-			Controls.Add(reportViewer);
-			Controls.Add(panel);
-		}
-
-		private void ButtonMake_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				var dataSource = _logic.GetGroupedOrders();
-				var source = new ReportDataSource("DataSetGroupedOrders", dataSource);
-
-				reportViewer.LocalReport.DataSources.Clear();
-				reportViewer.LocalReport.DataSources.Add(source);
-
-				reportViewer.RefreshReport();
-				_logger.LogInformation("Загрузка списка заказов");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки списка заказов");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void ButtonToPdf_Click(object sender, EventArgs e)
-		{
-			using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
-
-			if (dialog.ShowDialog() == DialogResult.OK)
-			{
-				try
-				{
-					_logic.SaveGroupedOrdersToPdfFile(new ReportBindingModel
-					{
-						FileName = dialog.FileName
-					});
-
-					_logger.LogInformation("Загрузка списка заказов");
-					MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка сохранения списка заказов");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportGroupedOrders.resx

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

BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs

@@ -28,92 +28,81 @@
         /// </summary>
         private void InitializeComponent()
         {
-			dataGridView = new DataGridView();
-			buttonSaveToExcel = new Button();
-			ColumnManufacture = new DataGridViewTextBoxColumn();
-			ColumnWorkPiece = new DataGridViewTextBoxColumn();
-			ColumnCount = new DataGridViewTextBoxColumn();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
+            this.buttonSaveToExcel = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumWorkPiece = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnManufacture = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
             // 
-			// dataGridView
+            // buttonSaveToExcel
             // 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.AllowUserToOrderColumns = true;
-			dataGridView.AllowUserToResizeColumns = false;
-			dataGridView.AllowUserToResizeRows = false;
-			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnManufacture, ColumnWorkPiece, ColumnCount });
-			dataGridView.Dock = DockStyle.Bottom;
-			dataGridView.Location = new Point(0, 63);
-			dataGridView.Margin = new Padding(4, 5, 4, 5);
-			dataGridView.MultiSelect = false;
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridView.RowHeadersVisible = false;
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.Size = new Size(704, 680);
-			dataGridView.TabIndex = 0;
+            this.buttonSaveToExcel.Location = new System.Drawing.Point(33, 25);
+            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+            this.buttonSaveToExcel.Size = new System.Drawing.Size(256, 29);
+            this.buttonSaveToExcel.TabIndex = 0;
+            this.buttonSaveToExcel.Text = "Сохранить в Excel";
+            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+            this.buttonSaveToExcel.Click += new System.EventHandler(this.ButtonSaveToExcel_Click);
             // 
-			// buttonSaveToExcel
+            // dataGridView
             // 
-			buttonSaveToExcel.Location = new Point(16, 18);
-			buttonSaveToExcel.Margin = new Padding(4, 5, 4, 5);
-			buttonSaveToExcel.Name = "buttonSaveToExcel";
-			buttonSaveToExcel.Size = new Size(212, 35);
-			buttonSaveToExcel.TabIndex = 1;
-			buttonSaveToExcel.Text = "Сохранить в Excel";
-			buttonSaveToExcel.UseVisualStyleBackColor = true;
-			buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumWorkPiece,
+            this.ColumnManufacture,
+            this.ColumnCount});
+            this.dataGridView.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.dataGridView.Location = new System.Drawing.Point(0, 73);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(800, 395);
+            this.dataGridView.TabIndex = 1;
             // 
-			// ColumnManufacture
+            // ColumWorkPiece
             // 
-			ColumnManufacture.HeaderText = "Изделие";
-			ColumnManufacture.MinimumWidth = 6;
-			ColumnManufacture.Name = "ColumnManufacture";
-			ColumnManufacture.ReadOnly = true;
-			ColumnManufacture.Width = 200;
+            this.ColumWorkPiece.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumWorkPiece.HeaderText = "Заготовка";
+            this.ColumWorkPiece.MinimumWidth = 6;
+            this.ColumWorkPiece.Name = "ColumWorkPiece";
             // 
-			// ColumnWorkPiece
+            // ColumnManufacture
             // 
-			ColumnWorkPiece.HeaderText = "Заготовка";
-			ColumnWorkPiece.MinimumWidth = 6;
-			ColumnWorkPiece.Name = "ColumnWorkPiece";
-			ColumnWorkPiece.ReadOnly = true;
-			ColumnWorkPiece.Width = 200;
+            this.ColumnManufacture.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnManufacture.HeaderText = "Изделие";
+            this.ColumnManufacture.MinimumWidth = 6;
+            this.ColumnManufacture.Name = "ColumnManufacture";
             // 
             // ColumnCount
             // 
-			ColumnCount.HeaderText = "Количество";
-			ColumnCount.MinimumWidth = 6;
-			ColumnCount.Name = "ColumnCount";
-			ColumnCount.ReadOnly = true;
-			ColumnCount.Width = 125;
+            this.ColumnCount.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.MinimumWidth = 6;
+            this.ColumnCount.Name = "ColumnCount";
             // 
             // FormReportManufactureWorkPieces
             // 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(704, 743);
-			Controls.Add(buttonSaveToExcel);
-			Controls.Add(dataGridView);
-			Margin = new Padding(4, 5, 4, 5);
-			Name = "FormReportManufactureWorkPieces";
-			Text = "Заготовки по изделиям";
-			Load += FormReportManufactureWorkPieces_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 468);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonSaveToExcel);
+            this.Name = "FormReportManufactureWorkPieces";
+            this.Text = "Заготовки по изделиям";
+            this.Load += new System.EventHandler(this.FormReportManufactureWorkPieces_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+
         }
 
         #endregion
 
-		private DataGridView dataGridView;
         private Button buttonSaveToExcel;
+        private DataGridView dataGridView;
         private DataGridViewTextBoxColumn ColumWorkPiece;
         private DataGridViewTextBoxColumn ColumnManufacture;
-		private DataGridViewTextBoxColumn ColumnWorkPiece;
         private DataGridViewTextBoxColumn ColumnCount;
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs

@@ -34,9 +34,7 @@
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker();
-			this.labelTo = new System.Windows.Forms.Label();
             this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker();
-			this.labelFrom = new System.Windows.Forms.Label();
             this.panel.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -47,23 +45,18 @@
             this.panel.Controls.Add(this.label2);
             this.panel.Controls.Add(this.label1);
             this.panel.Controls.Add(this.dateTimePickerTo);
-			this.panel.Controls.Add(this.labelTo);
             this.panel.Controls.Add(this.dateTimePickerFrom);
-			this.panel.Controls.Add(this.labelFrom);
             this.panel.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel.Location = new System.Drawing.Point(0, 0);
-			this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.panel.Name = "panel";
-			this.panel.Size = new System.Drawing.Size(1031, 40);
+            this.panel.Size = new System.Drawing.Size(1112, 51);
             this.panel.TabIndex = 0;
             // 
             // buttonToPdf
             // 
-			this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-			this.buttonToPdf.Location = new System.Drawing.Point(878, 8);
-			this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.buttonToPdf.Location = new System.Drawing.Point(894, 10);
             this.buttonToPdf.Name = "buttonToPdf";
-			this.buttonToPdf.Size = new System.Drawing.Size(139, 27);
+            this.buttonToPdf.Size = new System.Drawing.Size(157, 29);
             this.buttonToPdf.TabIndex = 5;
             this.buttonToPdf.Text = "В Pdf";
             this.buttonToPdf.UseVisualStyleBackColor = true;
@@ -71,60 +64,53 @@
             // 
             // buttonMake
             // 
-			this.buttonMake.Location = new System.Drawing.Point(476, 8);
-			this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.buttonMake.Location = new System.Drawing.Point(612, 10);
             this.buttonMake.Name = "buttonMake";
-			this.buttonMake.Size = new System.Drawing.Size(139, 27);
+            this.buttonMake.Size = new System.Drawing.Size(157, 29);
             this.buttonMake.TabIndex = 4;
             this.buttonMake.Text = "Сформировать";
             this.buttonMake.UseVisualStyleBackColor = true;
             this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click);
             // 
-			// dateTimePickerTo
+            // label2
             // 
-			this.dateTimePickerTo.Location = new System.Drawing.Point(237, 7);
-			this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
-			this.dateTimePickerTo.Name = "dateTimePickerTo";
-			this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23);
-			this.dateTimePickerTo.TabIndex = 3;
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(263, 17);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(27, 20);
+            this.label2.TabIndex = 3;
+            this.label2.Text = "по";
             // 
-			// labelTo
+            // label1
             // 
-			this.labelTo.AutoSize = true;
-			this.labelTo.Location = new System.Drawing.Point(208, 10);
-			this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.labelTo.Name = "labelTo";
-			this.labelTo.Size = new System.Drawing.Size(21, 15);
-			this.labelTo.TabIndex = 2;
-			this.labelTo.Text = "по";
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(25, 17);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(18, 20);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "С";
+            // 
+            // dateTimePickerTo
+            // 
+            this.dateTimePickerTo.Location = new System.Drawing.Point(313, 12);
+            this.dateTimePickerTo.Name = "dateTimePickerTo";
+            this.dateTimePickerTo.Size = new System.Drawing.Size(169, 27);
+            this.dateTimePickerTo.TabIndex = 1;
             // 
             // dateTimePickerFrom
             // 
-			this.dateTimePickerFrom.Location = new System.Drawing.Point(37, 7);
-			this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
+            this.dateTimePickerFrom.Location = new System.Drawing.Point(65, 12);
             this.dateTimePickerFrom.Name = "dateTimePickerFrom";
-			this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23);
-			this.dateTimePickerFrom.TabIndex = 1;
-			// 
-			// labelFrom
-			// 
-			this.labelFrom.AutoSize = true;
-			this.labelFrom.Location = new System.Drawing.Point(14, 10);
-			this.labelFrom.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-			this.labelFrom.Name = "labelFrom";
-			this.labelFrom.Size = new System.Drawing.Size(15, 15);
-			this.labelFrom.TabIndex = 0;
-			this.labelFrom.Text = "С";
+            this.dateTimePickerFrom.Size = new System.Drawing.Size(176, 27);
+            this.dateTimePickerFrom.TabIndex = 0;
             // 
             // FormReportOrders
             // 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1031, 647);
+            this.ClientSize = new System.Drawing.Size(1112, 450);
             this.Controls.Add(this.panel);
-			this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3);
             this.Name = "FormReportOrders";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Заказы";
             this.panel.ResumeLayout(false);
             this.panel.PerformLayout();
@@ -135,13 +121,11 @@
         #endregion
 
         private Panel panel;
-		private Button buttonToPdf;
         private Button buttonMake;
         private Label label2;
         private Label label1;
         private DateTimePicker dateTimePickerTo;
-		private Label labelTo;
         private DateTimePicker dateTimePickerFrom;
-		private Label labelFrom;
+        private Button buttonToPdf;
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs

@@ -46,7 +46,9 @@ namespace BlacksmithWorkshop
         {
             if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
             {
-				MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", 
+                    MessageBoxButtons.OK, MessageBoxIcon.Error);
+                
                 return;
             }
             try
@@ -62,14 +64,14 @@ namespace BlacksmithWorkshop
                 reportViewer.LocalReport.DataSources.Clear();
                 reportViewer.LocalReport.DataSources.Add(source);
 
-				var parameters = new[] {  new ReportParameter("ReportParameterPeriod",
+                var parameters = new[] { new ReportParameter("ReportParameterPeriod", 
                     $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") };
                 
                 reportViewer.LocalReport.SetParameters(parameters);
-
                 reportViewer.RefreshReport();
 
-				_logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+                _logger.LogInformation("Загрузка списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), 
+                    dateTimePickerTo.Value.ToShortDateString());
             }
             catch (Exception ex)
             {
@@ -87,7 +89,10 @@ namespace BlacksmithWorkshop
                 return;
             }
 
-			using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "pdf|*.pdf"
+            };
 
             if (dialog.ShowDialog() == DialogResult.OK)
             {
@@ -100,7 +105,9 @@ namespace BlacksmithWorkshop
                         DateTo = dateTimePickerTo.Value
                     });
 
-					_logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+                    _logger.LogInformation("Сохранение списка заказов на период {From}-{To}", 
+                        dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+
                     MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
                 catch (Exception ex)

BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx

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

BlacksmithWorkshop/BlacksmithWorkshop/FormReportShopManufactures.Designer.cs

@@ -1,118 +0,0 @@
-namespace BlacksmithWorkshop
-{
-	partial class FormReportShopManufactures
-	{
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.IContainer components = null;
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-		protected override void Dispose(bool disposing)
-		{
-			if (disposing && (components != null))
-			{
-				components.Dispose();
-			}
-			base.Dispose(disposing);
-		}
-
-		#region Windows Form Designer generated code
-
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			dataGridView = new DataGridView();
-			buttonSaveToExcel = new Button();
-			ColumnShop = new DataGridViewTextBoxColumn();
-			ColumnManufacture = new DataGridViewTextBoxColumn();
-			ColumnCount = new DataGridViewTextBoxColumn();
-			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-			SuspendLayout();
-			// 
-			// dataGridView
-			// 
-			dataGridView.AllowUserToAddRows = false;
-			dataGridView.AllowUserToDeleteRows = false;
-			dataGridView.AllowUserToOrderColumns = true;
-			dataGridView.AllowUserToResizeColumns = false;
-			dataGridView.AllowUserToResizeRows = false;
-			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnManufacture, ColumnCount });
-			dataGridView.Dock = DockStyle.Bottom;
-			dataGridView.Location = new Point(0, 63);
-			dataGridView.Margin = new Padding(4, 5, 4, 5);
-			dataGridView.MultiSelect = false;
-			dataGridView.Name = "dataGridView";
-			dataGridView.ReadOnly = true;
-			dataGridView.RowHeadersVisible = false;
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.Size = new Size(704, 680);
-			dataGridView.TabIndex = 0;
-			// 
-			// buttonSaveToExcel
-			// 
-			buttonSaveToExcel.Location = new Point(16, 18);
-			buttonSaveToExcel.Margin = new Padding(4, 5, 4, 5);
-			buttonSaveToExcel.Name = "buttonSaveToExcel";
-			buttonSaveToExcel.Size = new Size(212, 35);
-			buttonSaveToExcel.TabIndex = 1;
-			buttonSaveToExcel.Text = "Сохранить в Excel";
-			buttonSaveToExcel.UseVisualStyleBackColor = true;
-			buttonSaveToExcel.Click += ButtonSaveToExcel_Click;
-			// 
-			// ColumnShop
-			// 
-			ColumnShop.HeaderText = "Магазин";
-			ColumnShop.MinimumWidth = 6;
-			ColumnShop.Name = "ColumnShop";
-			ColumnShop.ReadOnly = true;
-			ColumnShop.Width = 200;
-			// 
-			// ColumnManufacture
-			// 
-			ColumnManufacture.HeaderText = "Изделие";
-			ColumnManufacture.MinimumWidth = 6;
-			ColumnManufacture.Name = "ColumnManufacture";
-			ColumnManufacture.ReadOnly = true;
-			ColumnManufacture.Width = 200;
-			// 
-			// ColumnCount
-			// 
-			ColumnCount.HeaderText = "Количество";
-			ColumnCount.MinimumWidth = 6;
-			ColumnCount.Name = "ColumnCount";
-			ColumnCount.ReadOnly = true;
-			ColumnCount.Width = 125;
-			// 
-			// FormReportShopManufactures
-			// 
-			AutoScaleDimensions = new SizeF(8F, 20F);
-			AutoScaleMode = AutoScaleMode.Font;
-			ClientSize = new Size(704, 743);
-			Controls.Add(buttonSaveToExcel);
-			Controls.Add(dataGridView);
-			Margin = new Padding(4, 5, 4, 5);
-			Name = "FormReportShopManufactures";
-			Text = "Загруженность магазинов";
-			Load += FormReportShopManufactures_Load;
-			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-			ResumeLayout(false);
-		}
-
-		#endregion
-
-		private DataGridView dataGridView;
-		private Button buttonSaveToExcel;
-		private DataGridViewTextBoxColumn ColumnShop;
-		private DataGridViewTextBoxColumn ColumnManufacture;
-		private DataGridViewTextBoxColumn ColumnCount;
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportShopManufactures.cs

@@ -1,86 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.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 BlacksmithWorkshop
-{
-	public partial class FormReportShopManufactures : Form
-	{
-		private readonly ILogger _logger;
-
-		private readonly IReportLogic _logic;
-
-		public FormReportShopManufactures(ILogger<FormReportShopManufactures> logger, IReportLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void FormReportShopManufactures_Load(object sender, EventArgs e)
-		{
-			try
-			{
-				var dict = _logic.GetShopManufactures();
-
-				if (dict != null)
-				{
-					dataGridView.Rows.Clear();
-
-					foreach (var elem in dict)
-					{
-						dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
-
-						foreach (var listElem in elem.Manufactures)
-						{
-							dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
-						}
-
-						dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount });
-						dataGridView.Rows.Add(Array.Empty<object>());
-					}
-				}
-
-				_logger.LogInformation("Загрузка списка магазинов по изделиям");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки списка магазинов по изделиям");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-			}
-		}
-
-		private void ButtonSaveToExcel_Click(object sender, EventArgs e)
-		{
-			using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" };
-
-			if (dialog.ShowDialog() == DialogResult.OK)
-			{
-				try
-				{
-					_logic.SaveShopManufacturesToExcelFile(new ReportBindingModel
-					{
-						FileName = dialog.FileName
-					});
-
-					_logger.LogInformation("Сохранение списка магазинов по изделиям");
-					MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-				}
-				catch (Exception ex)
-				{
-					_logger.LogError(ex, "Ошибка сохранения списка магазинов по изделиям");
-					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				}
-			}
-		}
-	}
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormReportShopManufactures.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.Designer.cs

@@ -1,121 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormSellManufacture
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelManufacture = new System.Windows.Forms.Label();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.comboBoxManufacture = new System.Windows.Forms.ComboBox();
-            this.textBoxCount = new System.Windows.Forms.TextBox();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.SuspendLayout();
-            // 
-            // labelManufacture
-            // 
-            this.labelManufacture.AutoSize = true;
-            this.labelManufacture.Location = new System.Drawing.Point(32, 32);
-            this.labelManufacture.Name = "labelManufacture";
-            this.labelManufacture.Size = new System.Drawing.Size(71, 20);
-            this.labelManufacture.TabIndex = 0;
-            this.labelManufacture.Text = "Изделие:";
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(34, 85);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(93, 20);
-            this.labelCount.TabIndex = 1;
-            this.labelCount.Text = "Количество:";
-            // 
-            // comboBoxManufacture
-            // 
-            this.comboBoxManufacture.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxManufacture.FormattingEnabled = true;
-            this.comboBoxManufacture.Location = new System.Drawing.Point(170, 32);
-            this.comboBoxManufacture.Name = "comboBoxManufacture";
-            this.comboBoxManufacture.Size = new System.Drawing.Size(262, 28);
-            this.comboBoxManufacture.TabIndex = 3;
-            // 
-            // textBoxCount
-            // 
-            this.textBoxCount.Location = new System.Drawing.Point(170, 85);
-            this.textBoxCount.Name = "textBoxCount";
-            this.textBoxCount.Size = new System.Drawing.Size(262, 27);
-            this.textBoxCount.TabIndex = 4;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(239, 141);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(94, 29);
-            this.buttonSave.TabIndex = 6;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(339, 141);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(94, 29);
-            this.buttonCancel.TabIndex = 7;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // FormSellManufacture
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(440, 180);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.textBoxCount);
-            this.Controls.Add(this.comboBoxManufacture);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.labelManufacture);
-            this.Name = "FormSellManufacture";
-            this.Text = "Продажа изделий";
-            this.Load += new System.EventHandler(this.FormSellManufacture_Load);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelManufacture;
-        private Label labelCount;
-        private ComboBox comboBoxManufacture;
-        private TextBox textBoxCount;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.cs

@@ -1,100 +0,0 @@
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-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 BlacksmithWorkshop
-{
-    public partial class FormSellManufacture : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IManufactureLogic _logicI;
-
-        private readonly IShopLogic _logicS;
-
-        public FormSellManufacture(ILogger<FormAddManufacture> logger, IManufactureLogic logicI, IShopLogic logicS)
-        {
-            InitializeComponent();
-
-            _logger = logger;
-            _logicI = logicI;
-            _logicS = logicS;
-        }
-
-        private void FormSellManufacture_Load(object sender, EventArgs e)
-        {
-            _logger.LogInformation("Загрузка списка изделий для продажи");
-
-            try
-            {
-                var list = _logicI.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxManufacture.DisplayMember = "ManufactureName";
-                    comboBoxManufacture.ValueMember = "Id";
-                    comboBoxManufacture.DataSource = list;
-                    comboBoxManufacture.SelectedItem = null;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка изделий");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxCount.Text))
-            {
-                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            if (comboBoxManufacture.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите изделие", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-
-            _logger.LogInformation("Продажа изделия");
-
-            try
-            {
-                var operationResult = _logicS.SellManufatures(_logicI.ReadElement(new ManufactureSearchModel()
-                {
-                    Id = Convert.ToInt32(comboBoxManufacture.SelectedValue)
-                })!, Convert.ToInt32(textBoxCount.Text));
-
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при продаже изделия. Дополнительная информация в логах.");
-                }
-
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка продажи изделия");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormSellManufacture.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.Designer.cs

@@ -1,229 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormShop
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.labelName = new System.Windows.Forms.Label();
-            this.labelAddress = new System.Windows.Forms.Label();
-            this.textBoxName = new System.Windows.Forms.TextBox();
-            this.textBoxAddress = new System.Windows.Forms.TextBox();
-            this.groupBoxIceCreams = new System.Windows.Forms.GroupBox();
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.ID = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnManufactureName = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            this.labelDate = new System.Windows.Forms.Label();
-            this.dateTimePickerDate = new System.Windows.Forms.DateTimePicker();
-            this.labelCount = new System.Windows.Forms.Label();
-            this.numericUpDownCount = new System.Windows.Forms.NumericUpDown();
-            this.groupBoxIceCreams.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // labelName
-            // 
-            this.labelName.AutoSize = true;
-            this.labelName.Location = new System.Drawing.Point(21, 13);
-            this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(80, 20);
-            this.labelName.TabIndex = 0;
-            this.labelName.Text = "Название:";
-            // 
-            // labelAddress
-            // 
-            this.labelAddress.AutoSize = true;
-            this.labelAddress.Location = new System.Drawing.Point(304, 12);
-            this.labelAddress.Name = "labelAddress";
-            this.labelAddress.Size = new System.Drawing.Size(54, 20);
-            this.labelAddress.TabIndex = 1;
-            this.labelAddress.Text = "Адрес:";
-            // 
-            // textBoxName
-            // 
-            this.textBoxName.Location = new System.Drawing.Point(107, 10);
-            this.textBoxName.Name = "textBoxName";
-            this.textBoxName.Size = new System.Drawing.Size(157, 27);
-            this.textBoxName.TabIndex = 2;
-            // 
-            // textBoxAddress
-            // 
-            this.textBoxAddress.Location = new System.Drawing.Point(364, 9);
-            this.textBoxAddress.Name = "textBoxAddress";
-            this.textBoxAddress.Size = new System.Drawing.Size(157, 27);
-            this.textBoxAddress.TabIndex = 3;
-            // 
-            // groupBoxIceCreams
-            // 
-            this.groupBoxIceCreams.Controls.Add(this.dataGridView);
-            this.groupBoxIceCreams.Location = new System.Drawing.Point(14, 94);
-            this.groupBoxIceCreams.Name = "groupBoxIceCreams";
-            this.groupBoxIceCreams.Size = new System.Drawing.Size(823, 275);
-            this.groupBoxIceCreams.TabIndex = 4;
-            this.groupBoxIceCreams.TabStop = false;
-            this.groupBoxIceCreams.Text = "Изделия";
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.ID,
-            this.ColumnManufactureName,
-            this.ColumnCount});
-            this.dataGridView.Location = new System.Drawing.Point(6, 27);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(810, 243);
-            this.dataGridView.TabIndex = 0;
-            // 
-            // ID
-            // 
-            this.ID.HeaderText = "ID";
-            this.ID.MinimumWidth = 6;
-            this.ID.Name = "ID";
-            this.ID.Visible = false;
-            this.ID.Width = 125;
-            // 
-            // ColumnManufactureName
-            // 
-            this.ColumnManufactureName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
-            this.ColumnManufactureName.HeaderText = "Изделие";
-            this.ColumnManufactureName.MinimumWidth = 6;
-            this.ColumnManufactureName.Name = "ColumnManufactureName";
-            this.ColumnManufactureName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
-            // 
-            // ColumnCount
-            // 
-            this.ColumnCount.HeaderText = "Количество";
-            this.ColumnCount.MinimumWidth = 6;
-            this.ColumnCount.Name = "ColumnCount";
-            this.ColumnCount.Width = 125;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(470, 381);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(155, 29);
-            this.buttonSave.TabIndex = 5;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.ButtonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(662, 381);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(155, 29);
-            this.buttonCancel.TabIndex = 6;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
-            // 
-            // labelDate
-            // 
-            this.labelDate.AutoSize = true;
-            this.labelDate.Location = new System.Drawing.Point(562, 12);
-            this.labelDate.Name = "labelDate";
-            this.labelDate.Size = new System.Drawing.Size(113, 20);
-            this.labelDate.TabIndex = 7;
-            this.labelDate.Text = "Дата открытия:";
-            // 
-            // dateTimePickerDate
-            // 
-            this.dateTimePickerDate.Location = new System.Drawing.Point(681, 9);
-            this.dateTimePickerDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.dateTimePickerDate.Name = "dateTimePickerDate";
-            this.dateTimePickerDate.Size = new System.Drawing.Size(145, 27);
-            this.dateTimePickerDate.TabIndex = 9;
-            // 
-            // labelCount
-            // 
-            this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(21, 55);
-            this.labelCount.Name = "labelCount";
-            this.labelCount.Size = new System.Drawing.Size(173, 20);
-            this.labelCount.TabIndex = 10;
-            this.labelCount.Text = "Вместимость магазина:";
-            // 
-            // numericUpDownCount
-            // 
-            this.numericUpDownCount.Location = new System.Drawing.Point(200, 53);
-            this.numericUpDownCount.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.numericUpDownCount.Name = "numericUpDownCount";
-            this.numericUpDownCount.Size = new System.Drawing.Size(145, 27);
-            this.numericUpDownCount.TabIndex = 11;
-            // 
-            // FormShop
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(850, 425);
-            this.Controls.Add(this.numericUpDownCount);
-            this.Controls.Add(this.labelCount);
-            this.Controls.Add(this.dateTimePickerDate);
-            this.Controls.Add(this.labelDate);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.groupBoxIceCreams);
-            this.Controls.Add(this.textBoxAddress);
-            this.Controls.Add(this.textBoxName);
-            this.Controls.Add(this.labelAddress);
-            this.Controls.Add(this.labelName);
-            this.Name = "FormShop";
-            this.Text = "Магазин";
-            this.Load += new System.EventHandler(this.FormShop_Load);
-            this.groupBoxIceCreams.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownCount)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelName;
-        private Label labelAddress;
-        private TextBox textBoxName;
-        private TextBox textBoxAddress;
-        private GroupBox groupBoxIceCreams;
-        private DataGridView dataGridView;
-        private Button buttonSave;
-        private Button buttonCancel;
-        private Label labelDate;
-        private DateTimePicker dateTimePickerDate;
-        private DataGridViewTextBoxColumn ID;
-        private DataGridViewTextBoxColumn ColumnManufactureName;
-        private DataGridViewTextBoxColumn ColumnCount;
-        private Label labelCount;
-        private NumericUpDown numericUpDownCount;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.cs

@@ -1,138 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopDataModels.Models;
-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 BlacksmithWorkshop
-{
-    public partial class FormShop : Form
-    {
-        private readonly ILogger _logger;
-
-        private readonly IShopLogic _logic;
-
-        private int? _id;
-
-        private Dictionary<int, (IManufactureModel, int)> _shopManufactures;
-
-        public int Id { set { _id = value; } }
-
-        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-
-            _logger = logger;
-            _logic = logic;
-            _shopManufactures = new Dictionary<int, (IManufactureModel, int)>();
-        }
-
-        private void FormShop_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                _logger.LogInformation("Загрузка магазина");
-                try
-                {
-                    var view = _logic.ReadElement(new ShopSearchModel
-                    {
-                        Id = _id.Value
-                    });
-
-                    if (view != null)
-                    {
-                        textBoxName.Text = view.ShopName;
-                        textBoxAddress.Text = view.Address.ToString();
-                        dateTimePickerDate.Value = view.DateOpen;
-                        numericUpDownCount.Value = view.MaxCountManufactures;
-                        _shopManufactures = view.ShopManufactures ?? new Dictionary<int, (IManufactureModel, int)>();
-                        LoadData();
-                    }
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка загрузки магазина");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка изделий в магазине");
-            try
-            {
-                if (_shopManufactures != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var element in _shopManufactures)
-                    {
-                        dataGridView.Rows.Add(new object[] { element.Key, element.Value.Item1.ManufactureName, element.Value.Item2 });
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки изделий в магазине");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonSave_Click(object sender, EventArgs e)
-        {
-            if (string.IsNullOrEmpty(textBoxName.Text))
-            {
-                MessageBox.Show("Заполните название", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxAddress.Text))
-            {
-                MessageBox.Show("Заполните адрес", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение магазина");
-            try
-            {
-                var model = new ShopBindingModel
-                {
-                    Id = _id ?? 0,
-                    ShopName = textBoxName.Text,
-                    Address = textBoxAddress.Text,
-                    DateOpen = dateTimePickerDate.Value.Date,
-                    MaxCountManufactures = (int)numericUpDownCount.Value
-                };
-
-                var operationResult = _id.HasValue ? _logic.Update(model) : _logic.Create(model);
-                
-                if (!operationResult)
-                {
-                    throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                }
-
-                MessageBox.Show("Сохранение прошло успешно", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                DialogResult = DialogResult.OK;
-                Close();
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка сохранения магазина");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonCancel_Click(object sender, EventArgs e)
-        {
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShop.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.Designer.cs

@@ -1,121 +0,0 @@
-namespace BlacksmithWorkshop
-{
-    partial class FormShops
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.dataGridView = new System.Windows.Forms.DataGridView();
-            this.buttonAdd = new System.Windows.Forms.Button();
-            this.buttonUpd = new System.Windows.Forms.Button();
-            this.buttonDel = new System.Windows.Forms.Button();
-            this.buttonRef = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // dataGridView
-            // 
-            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(10, 9);
-            this.dataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(444, 320);
-            this.dataGridView.TabIndex = 1;
-            // 
-            // buttonAdd
-            // 
-            this.buttonAdd.Location = new System.Drawing.Point(465, 37);
-            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonAdd.Name = "buttonAdd";
-            this.buttonAdd.Size = new System.Drawing.Size(133, 22);
-            this.buttonAdd.TabIndex = 2;
-            this.buttonAdd.Text = "Добавить";
-            this.buttonAdd.UseVisualStyleBackColor = true;
-            this.buttonAdd.Click += new System.EventHandler(this.ButtonAdd_Click);
-            // 
-            // buttonUpd
-            // 
-            this.buttonUpd.Location = new System.Drawing.Point(465, 119);
-            this.buttonUpd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonUpd.Name = "buttonUpd";
-            this.buttonUpd.Size = new System.Drawing.Size(133, 22);
-            this.buttonUpd.TabIndex = 3;
-            this.buttonUpd.Text = "Изменить";
-            this.buttonUpd.UseVisualStyleBackColor = true;
-            this.buttonUpd.Click += new System.EventHandler(this.ButtonUpd_Click);
-            // 
-            // buttonDel
-            // 
-            this.buttonDel.Location = new System.Drawing.Point(465, 197);
-            this.buttonDel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonDel.Name = "buttonDel";
-            this.buttonDel.Size = new System.Drawing.Size(133, 22);
-            this.buttonDel.TabIndex = 4;
-            this.buttonDel.Text = "Удалить";
-            this.buttonDel.UseVisualStyleBackColor = true;
-            this.buttonDel.Click += new System.EventHandler(this.ButtonDel_Click);
-            // 
-            // buttonRef
-            // 
-            this.buttonRef.Location = new System.Drawing.Point(465, 274);
-            this.buttonRef.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.buttonRef.Name = "buttonRef";
-            this.buttonRef.Size = new System.Drawing.Size(133, 22);
-            this.buttonRef.TabIndex = 5;
-            this.buttonRef.Text = "Обновить";
-            this.buttonRef.UseVisualStyleBackColor = true;
-            this.buttonRef.Click += new System.EventHandler(this.ButtonRef_Click);
-            // 
-            // FormShops
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(610, 338);
-            this.Controls.Add(this.buttonRef);
-            this.Controls.Add(this.buttonDel);
-            this.Controls.Add(this.buttonUpd);
-            this.Controls.Add(this.buttonAdd);
-            this.Controls.Add(this.dataGridView);
-            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.Name = "FormShops";
-            this.Text = "Магазины";
-            this.Load += new System.EventHandler(this.FormShops_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DataGridView dataGridView;
-        private Button buttonAdd;
-        private Button buttonUpd;
-        private Button buttonDel;
-        private Button buttonRef;
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.cs

@@ -1,119 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopDataModels.Models;
-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 BlacksmithWorkshop
-{
-    public partial class FormShops : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IShopLogic _logic;
-
-        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormShops_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-                var list = _logic.ReadList(null);
-
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["ShopManufactures"].Visible = false;
-                    dataGridView.Columns["ShopName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
-
-                _logger.LogInformation("Загрузка магазинов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки магазинов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void ButtonAdd_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
-            if (service is FormShop form)
-            {
-                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(FormShop));
-                if (service is FormShop form)
-                {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
-                }
-            }
-        }
-
-        private void ButtonDel_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
-                {
-                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление магазина");
-                    try
-                    {
-                        if (!_logic.Delete(new ShopBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления изделия");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-
-        private void ButtonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshop/FormShops.resx

@@ -1,60 +0,0 @@
-<root>
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

BlacksmithWorkshop/BlacksmithWorkshop/FormWorkPieces.cs

@@ -1,5 +1,7 @@
-using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopBusinessLogic.BusinessLogic;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -35,15 +37,7 @@ namespace BlacksmithWorkshop
         {
             try
             {
-                var list = _logic.ReadList(null);
-
-                //растягиваем колонку Название на всю ширину, колонку Id скрываем
-                if(list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["Id"].Visible = false;
-                    dataGridView.Columns["WorkPieceName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                }
+                dataGridView.FillandConfigGrid(_logic.ReadList(null));
 
                 _logger.LogInformation("Загрузка заготовок");
             }
@@ -57,14 +51,11 @@ namespace BlacksmithWorkshop
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var service = Program.ServiceProvider?.GetService(typeof(FormWorkPiece));
+            var form = DependencyManager.Instance.Resolve<FormWorkPiece>();
 
-            if (service is FormWorkPiece form)
+            if (form.ShowDialog() == DialogResult.OK)
             {
-                if (form.ShowDialog() == DialogResult.OK)
-                {
-                    LoadData();
-                }
+                LoadData();
             }
         }
 
@@ -73,15 +64,12 @@ namespace BlacksmithWorkshop
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var service = Program.ServiceProvider?.GetService(typeof(FormWorkPiece));
-                
-                if (service is FormWorkPiece form)
+                var form = DependencyManager.Instance.Resolve<FormWorkPiece>();
+
+                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                if (form.ShowDialog() == DialogResult.OK)
                 {
-                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    if (form.ShowDialog() == DialogResult.OK)
-                    {
-                        LoadData();
-                    }
+                    LoadData();
                 }
             }
         }

BlacksmithWorkshop/BlacksmithWorkshop/Program.cs

@@ -1,7 +1,10 @@
 using BlacksmithWorkshopBusinessLogic.BusinessLogic;
-using BlacksmithWorkshopBusinessLogic.OfficePackage.Implements;
+using BlacksmithWorkshopBusinessLogic.MailWorker;
 using BlacksmithWorkshopBusinessLogic.OfficePackage;
+using BlacksmithWorkshopBusinessLogic.OfficePackage.Implements;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.DI;
 using BlacksmithWorkshopContracts.StoragesContracts;
 using BlacksmithWorkshopDatabaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,10 +15,6 @@ namespace BlacksmithWorkshop
 {
     internal static class Program
     {
-        private static ServiceProvider? _serviceProvider;
-
-        public static ServiceProvider? ServiceProvider => _serviceProvider;
-
         /// <summary>
         /// The main entry point for the application.
         /// </summary>
@@ -26,58 +25,76 @@ namespace BlacksmithWorkshop
             // see https://aka.ms/applicationconfiguration.
             ApplicationConfiguration.Initialize();
             var services = new ServiceCollection();
-            ConfigureServices(services);
-            _serviceProvider = services.BuildServiceProvider();
-            Application.Run(_serviceProvider.GetRequiredService<FormMain>());
+            InitDependency();
+
+            try
+			{
+                var mailSender = DependencyManager.Instance.Resolve<AbstractMailWorker>();
+                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"])
+				});
+
+				// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+				var timer = new System.Threading.Timer(new TimerCallback(MailCheck!), null, 0, 100000);
+			}
+			catch (Exception ex)
+			{
+				var logger = DependencyManager.Instance.Resolve<ILogger>();
+
+                logger?.LogError(ex, "<22><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>");
+			}
+
+
+            Application.Run(DependencyManager.Instance.Resolve<FormMain>());
         }
 
-        private static void ConfigureServices(ServiceCollection services)
+        private static void InitDependency()
         {
-            services.AddLogging(option =>
+            DependencyManager.InitDependency();
+
+            DependencyManager.Instance.AddLogging(option =>
             {
                 option.SetMinimumLevel(LogLevel.Information);
                 option.AddNLog("nlog.config");
             });
 
-            services.AddTransient<IWorkPieceStorage, WorkPieceStorage>();
-            services.AddTransient<IOrderStorage, OrderStorage>();
-            services.AddTransient<IManufactureStorage, ManufactureStorage>();
-            services.AddTransient<IShopStorage, ShopStorage>();
-            services.AddTransient<IImplementerStorage, ImplementerStorage>();
-            services.AddTransient<IClientStorage, ClientStorage>();
+            DependencyManager.Instance.RegisterType<IWorkPieceLogic, WorkPieceLogic>();
+            DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
+            DependencyManager.Instance.RegisterType<IManufactureLogic, ManufactureLogic>();
+            DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
+            DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
+            DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
+            DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
+            DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
 
-            services.AddTransient<IWorkPieceLogic, WorkPieceLogic>();
-            services.AddTransient<IOrderLogic, OrderLogic>();
-            services.AddTransient<IManufactureLogic, ManufactureLogic>();
-            services.AddTransient<IShopLogic, ShopLogic>();
-			services.AddTransient<IReportLogic, ReportLogic>();
-            services.AddTransient<IImplementerLogic, ImplementerLogic>();
-            services.AddTransient<IClientLogic, ClientLogic>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
+            DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
 
-            services.AddTransient<IWorkProcess, WorkModeling>();
+            DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
+            DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(true);
 
-            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
-			services.AddTransient<AbstractSaveToWord, SaveToWord>();
-			services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
-
-			services.AddTransient<FormMain>();
-            services.AddTransient<FormWorkPiece>();
-            services.AddTransient<FormWorkPieces>();
-            services.AddTransient<FormCreateOrder>();
-            services.AddTransient<FormManufacture>();
-            services.AddTransient<FormManufactures>();
-            services.AddTransient<FormManufactureWorkPiece>();
-            services.AddTransient<FormShop>();
-            services.AddTransient<FormShops>();
-            services.AddTransient<FormAddManufacture>();
-            services.AddTransient<FormSellManufacture>();
-			services.AddTransient<FormReportManufactureWorkPieces>();
-			services.AddTransient<FormReportShopManufactures>();
-			services.AddTransient<FormReportOrders>();
-			services.AddTransient<FormReportGroupedOrders>();
-            services.AddTransient<FormClients>();
-            services.AddTransient<FormImplementers>();
-            services.AddTransient<FormImplementer>();
+            DependencyManager.Instance.RegisterType<FormMain>();
+            DependencyManager.Instance.RegisterType<FormWorkPiece>();
+            DependencyManager.Instance.RegisterType<FormWorkPieces>();
+            DependencyManager.Instance.RegisterType<FormCreateOrder>();
+            DependencyManager.Instance.RegisterType<FormManufacture>();
+            DependencyManager.Instance.RegisterType<FormManufactureWorkPiece>();
+            DependencyManager.Instance.RegisterType<FormManufactures>();
+            DependencyManager.Instance.RegisterType<FormReportManufactureWorkPieces>();
+            DependencyManager.Instance.RegisterType<FormReportOrders>();
+            DependencyManager.Instance.RegisterType<FormClients>();
+            DependencyManager.Instance.RegisterType<FormImplementer>();
+            DependencyManager.Instance.RegisterType<FormImplementers>();
+            DependencyManager.Instance.RegisterType<FormMails>();
         }
+
+        private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
     }
 }

BlacksmithWorkshop/BlacksmithWorkshop/ReportGroupedOrders.rdlc

@@ -1,410 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Report xmlns="http://schemas.microsoft.com/sqlserver/reporting/2016/01/reportdefinition" xmlns:rd="http://schemas.microsoft.com/SQLServer/reporting/reportdesigner">
-  <AutoRefresh>0</AutoRefresh>
-  <DataSources>
-    <DataSource Name="BlacksmithWorkshopContractsViewModels">
-      <ConnectionProperties>
-        <DataProvider>System.Data.DataSet</DataProvider>
-        <ConnectString>/* Local Connection */</ConnectString>
-      </ConnectionProperties>
-      <rd:DataSourceID>10791c83-cee8-4a38-bbd0-245fc17cefb3</rd:DataSourceID>
-    </DataSource>
-  </DataSources>
-  <DataSets>
-    <DataSet Name="DataSetGroupedOrders">
-      <Query>
-        <DataSourceName>BlacksmithWorkshopContractsViewModels</DataSourceName>
-        <CommandText>/* Local Query */</CommandText>
-      </Query>
-      <Fields>
-        <Field Name="DateCreate">
-          <DataField>DateCreate</DataField>
-          <rd:TypeName>System.DateTime</rd:TypeName>
-        </Field>
-        <Field Name="Count">
-          <DataField>Count</DataField>
-          <rd:TypeName>System.Int32</rd:TypeName>
-        </Field>
-        <Field Name="Sum">
-          <DataField>Sum</DataField>
-          <rd:TypeName>System.Decimal</rd:TypeName>
-        </Field>
-      </Fields>
-      <rd:DataSetInfo>
-        <rd:DataSetName>BlacksmithWorkshopContracts.ViewModels</rd:DataSetName>
-        <rd:TableName>ReportGroupedOrdersViewModel</rd:TableName>
-        <rd:ObjectDataSourceType>BlacksmithWorkshopContracts.ViewModels.ReportGroupedOrdersViewModel, BlacksmithWorkshopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</rd:ObjectDataSourceType>
-      </rd:DataSetInfo>
-    </DataSet>
-  </DataSets>
-  <ReportSections>
-    <ReportSection>
-      <Body>
-        <ReportItems>
-          <Textbox Name="TextboxTitle">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Заказы</Value>
-                    <Style>
-                      <FontSize>16pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Center</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Height>1cm</Height>
-            <Width>10.19559cm</Width>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <VerticalAlign>Middle</VerticalAlign>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Tablix Name="Tablix1">
-            <TablixBody>
-              <TablixColumns>
-                <TablixColumn>
-                  <Width>3.21438cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.21438cm</Width>
-                </TablixColumn>
-                <TablixColumn>
-                  <Width>3.21438cm</Width>
-                </TablixColumn>
-              </TablixColumns>
-              <TablixRows>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox1">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Дата создания</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox1</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox3">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Количество заказов</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox3</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox2">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Сумма по заказам</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox2</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-                <TablixRow>
-                  <Height>0.6cm</Height>
-                  <TablixCells>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="DateCreate">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!DateCreate.Value</Value>
-                                  <Style>
-                                    <Format>d</Format>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>DateCreate</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Count">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Count.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Count</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
-                      <CellContents>
-                        <Textbox Name="Sum">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!Sum.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Sum</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                  </TablixCells>
-                </TablixRow>
-              </TablixRows>
-            </TablixBody>
-            <TablixColumnHierarchy>
-              <TablixMembers>
-                <TablixMember />
-                <TablixMember />
-                <TablixMember />
-              </TablixMembers>
-            </TablixColumnHierarchy>
-            <TablixRowHierarchy>
-              <TablixMembers>
-                <TablixMember>
-                  <KeepWithGroup>After</KeepWithGroup>
-                </TablixMember>
-                <TablixMember>
-                  <Group Name="Подробности" />
-                </TablixMember>
-              </TablixMembers>
-            </TablixRowHierarchy>
-            <DataSetName>DataSetGroupedOrders</DataSetName>
-            <Top>2.48391cm</Top>
-            <Left>0.55245cm</Left>
-            <Height>1.2cm</Height>
-            <Width>9.64314cm</Width>
-            <ZIndex>1</ZIndex>
-            <Style>
-              <Border>
-                <Style>Double</Style>
-              </Border>
-            </Style>
-          </Tablix>
-          <Textbox Name="TextboxTotalSum">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>Итого:</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>5.19559cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>2</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-          <Textbox Name="SumTotal">
-            <CanGrow>true</CanGrow>
-            <KeepTogether>true</KeepTogether>
-            <Paragraphs>
-              <Paragraph>
-                <TextRuns>
-                  <TextRun>
-                    <Value>=Sum(Fields!Sum.Value, "DataSetGroupedOrders")</Value>
-                    <Style>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                </TextRuns>
-                <Style>
-                  <TextAlign>Right</TextAlign>
-                </Style>
-              </Paragraph>
-            </Paragraphs>
-            <Top>4cm</Top>
-            <Left>7.69559cm</Left>
-            <Height>0.6cm</Height>
-            <Width>2.5cm</Width>
-            <ZIndex>3</ZIndex>
-            <Style>
-              <Border>
-                <Style>None</Style>
-              </Border>
-              <PaddingLeft>2pt</PaddingLeft>
-              <PaddingRight>2pt</PaddingRight>
-              <PaddingTop>2pt</PaddingTop>
-              <PaddingBottom>2pt</PaddingBottom>
-            </Style>
-          </Textbox>
-        </ReportItems>
-        <Height>5.62292cm</Height>
-        <Style />
-      </Body>
-      <Width>10.23146cm</Width>
-      <Page>
-        <PageHeight>29.7cm</PageHeight>
-        <PageWidth>21cm</PageWidth>
-        <LeftMargin>2cm</LeftMargin>
-        <RightMargin>2cm</RightMargin>
-        <TopMargin>2cm</TopMargin>
-        <BottomMargin>2cm</BottomMargin>
-        <ColumnSpacing>0.13cm</ColumnSpacing>
-        <Style />
-      </Page>
-    </ReportSection>
-  </ReportSections>
-  <ReportParametersLayout>
-    <GridLayoutDefinition>
-      <NumberOfColumns>4</NumberOfColumns>
-      <NumberOfRows>2</NumberOfRows>
-    </GridLayoutDefinition>
-  </ReportParametersLayout>
-  <rd:ReportUnitType>Cm</rd:ReportUnitType>
-  <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
-</Report>

BlacksmithWorkshop/BlacksmithWorkshop/ReportOrders.rdlc

@@ -236,38 +236,6 @@
                       </CellContents>
                     </TablixCell>
 					<TablixCell>
-                      <CellContents>
-                        <Textbox Name="Textbox2">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>Статус заказа</Value>
-                                  <Style>
-                                    <FontWeight>Bold</FontWeight>
-                                  </Style>
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>Textbox2</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-                    <TablixCell>
                       <CellContents>
                         <Textbox Name="Textbox7">
                           <CanGrow>true</CanGrow>
@@ -299,6 +267,38 @@
                         </Textbox>
                       </CellContents>
                     </TablixCell>
+                    <TablixCell>
+                      <CellContents>
+                        <Textbox Name="Textbox2">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>Статус заказа</Value>
+                                  <Style>
+                                    <FontWeight>Bold</FontWeight>
+                                  </Style>
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>Textbox2</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
+                    </TablixCell>
                   </TablixCells>
                 </TablixRow>
                 <TablixRow>
@@ -397,36 +397,6 @@
                       </CellContents>
                     </TablixCell>
                     <TablixCell>
-                      <CellContents>
-                        <Textbox Name="OrderStatus">
-                          <CanGrow>true</CanGrow>
-                          <KeepTogether>true</KeepTogether>
-                          <Paragraphs>
-                            <Paragraph>
-                              <TextRuns>
-                                <TextRun>
-                                  <Value>=Fields!OrderStatus.Value</Value>
-                                  <Style />
-                                </TextRun>
-                              </TextRuns>
-                              <Style />
-                            </Paragraph>
-                          </Paragraphs>
-                          <rd:DefaultName>OrderStatus</rd:DefaultName>
-                          <Style>
-                            <Border>
-                              <Color>LightGrey</Color>
-                              <Style>Solid</Style>
-                            </Border>
-                            <PaddingLeft>2pt</PaddingLeft>
-                            <PaddingRight>2pt</PaddingRight>
-                            <PaddingTop>2pt</PaddingTop>
-                            <PaddingBottom>2pt</PaddingBottom>
-                          </Style>
-                        </Textbox>
-                      </CellContents>
-                    </TablixCell>
-					<TablixCell>
                       <CellContents>
                         <Textbox Name="Sum">
                           <CanGrow>true</CanGrow>
@@ -455,6 +425,36 @@
                           </Style>
                         </Textbox>
                       </CellContents>
+                    </TablixCell>
+					<TablixCell>
+                      <CellContents>
+                        <Textbox Name="OrderStatus">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!OrderStatus.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>OrderStatus</rd:DefaultName>
+                          <Style>
+                            <Border>
+                              <Color>LightGrey</Color>
+                              <Style>Solid</Style>
+                            </Border>
+                            <PaddingLeft>2pt</PaddingLeft>
+                            <PaddingRight>2pt</PaddingRight>
+                            <PaddingTop>2pt</PaddingTop>
+                            <PaddingBottom>2pt</PaddingBottom>
+                          </Style>
+                        </Textbox>
+                      </CellContents>
                     </TablixCell>
                   </TablixCells>
                 </TablixRow>

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BlacksmithWorkshopBusinessLogic.csproj

@@ -7,13 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" />
+    <PackageReference Include="DocumentFormat.OpenXml" Version="2.19.0" />
+    <PackageReference Include="MailKit" Version="4.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-    <PackageReference Include="MigraDocCore.DocumentObjectModel" Version="1.3.49" />
-    <PackageReference Include="MigraDocCore.Rendering" Version="1.3.49" />
     <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
-    <PackageReference Include="PdfSharp.MigraDoc.Standard.DocumentObjectModel" Version="1.51.15" />
-    <PackageReference Include="PdfSharpStand.MigraDoc.DocumentObjectModel.NetStandard" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup>

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/BackUpLogic.cs

@@ -0,0 +1,129 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopDataModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.IO.Compression;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization.Json;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
+{
+    public class BackUpLogic : IBackUpLogic
+    {
+        private readonly ILogger _logger;
+
+        private readonly IBackUpInfo _backUpInfo;
+
+        public BackUpLogic(ILogger<BackUpLogic> logger, IBackUpInfo backUpInfo)
+        {
+            _logger = logger;
+            _backUpInfo = backUpInfo;
+        }
+
+        public void CreateBackUp(BackUpSaveBinidngModel 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)
+                {
+                    //проверка на то, является ли тип интерфейсом и унаследован ли он от IId
+                    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<T>(string folderName) where T : class, new()
+        {
+            var records = _backUpInfo.GetList<T>();
+
+            if (records == null)
+            {
+                _logger.LogWarning("{type} type get null list", typeof(T).Name);
+
+                return;
+            }
+
+            //три строчки ниже - сериализация файлов в json
+            var jsonFormatter = new DataContractJsonSerializer(typeof(List<T>));
+
+            using var fs = new FileStream(string.Format("{0}/{1}.json", folderName, typeof(T).Name), FileMode.OpenOrCreate);
+            
+            jsonFormatter.WriteObject(fs, records);
+        }
+    }
+
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/ClientLogic.cs

@@ -8,6 +8,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
 namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
@@ -141,6 +142,16 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 				throw new ArgumentNullException("Отсутствие пароля в учётной записи", nameof(model.Password));
 			}
 
+			if (!Regex.IsMatch(model.Email, @"^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$", RegexOptions.IgnoreCase))
+			{
+				throw new ArgumentException("Некорректная почта", nameof(model.Email));
+			}
+
+			if (!Regex.IsMatch(model.Password, @"^((\w+\d+\W+)|(\w+\W+\d+)|(\d+\w+\W+)|(\d+\W+\w+)|(\W+\w+\d+)|(\W+\d+\w+))[\w\d\W]*$", RegexOptions.IgnoreCase) && model.Password.Length < 10 && model.Password.Length > 50)
+			{
+				throw new ArgumentException("Необходимо придумать другой пароль", nameof(model.Password));
+			}
+
 			_logger.LogInformation("Client. ClientFIO:{ClientFIO}. Email:{Email}. Password:{Password}. Id:{Id}",
 				model.ClientFIO, model.Email, model.Password, model.Id);
 

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/MessageInfoLogic.cs

@@ -0,0 +1,57 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.StoragesContracts;
+using BlacksmithWorkshopContracts.ViewModels;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
+{
+	public class MessageInfoLogic : IMessageInfoLogic
+	{
+		private readonly ILogger _logger;
+
+		private readonly IMessageInfoStorage _messageInfoStorage;
+
+		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage messageInfoStorage)
+		{
+			_logger = logger;
+			_messageInfoStorage = messageInfoStorage;
+		}
+
+		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
+		{
+			_logger.LogInformation("ReadList. MessageId:{MessageId}", model?.MessageId);
+
+			//list хранит весь список в случае, если model пришло со значением null на вход метода
+			var list = model == null ? _messageInfoStorage.GetFullList() : _messageInfoStorage.GetFilteredList(model);
+
+			if (list == null)
+			{
+				_logger.LogWarning("ReadList return null list");
+				return null;
+			}
+
+			_logger.LogInformation("ReadList. Count:{Count}", list.Count);
+
+			return list.OrderByDescending(x => x.DateDelivery).ToList();
+		}
+
+		public bool Create(MessageInfoBindingModel model)
+		{
+			if (_messageInfoStorage.Insert(model) == null)
+			{
+				_logger.LogWarning("Insert operation failed");
+
+				return false;
+			}
+
+			return true;
+		}
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/OrderLogic.cs

@@ -1,4 +1,5 @@
-using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopBusinessLogic.MailWorker;
+using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
 using BlacksmithWorkshopContracts.SearchModels;
 using BlacksmithWorkshopContracts.StoragesContracts;
@@ -20,27 +21,26 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 
         private readonly IOrderStorage _orderStorage;
 
-        private readonly IShopLogic _shopLogic;
+		private readonly AbstractMailWorker _mailWorker;
 
-        private readonly IManufactureStorage _manufactureStorage;
+		private readonly IClientLogic _clientLogic;
+		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
+		{
+			_logger = logger;
+			_orderStorage = orderStorage;
+			_mailWorker = mailWorker;
+			_clientLogic = clientLogic;
+		}
 
-        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, IManufactureStorage manufactureStorage) 
-        {
-            _logger = logger;
-            _orderStorage = orderStorage;
-            _shopLogic = shopLogic;
-            _manufactureStorage = manufactureStorage;
-        }
-
-        //вывод отфильтрованного списка компонентов
-        public List<OrderViewModel>? ReadList(OrderSearchModel? model)
+		//вывод отфильтрованного списка компонентов
+		public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
             _logger.LogInformation("ReadList. Id:{Id}", model?.Id);
 
             //list хранит весь список в случае, если model пришло со значением null на вход метода
             var list = model == null ? _orderStorage.GetFullList() : _orderStorage.GetFilteredList(model);
 
-            if (list == null)
+            if(list == null)
             {
                 _logger.LogWarning("ReadList return null list");
 
@@ -88,13 +88,17 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 
             model.Status = OrderStatus.Принят;
 
-            if(_orderStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
+            var result = _orderStorage.Insert(model);
 
+			if (result == null)
+            {
+                model.Status = OrderStatus.Неизвестен;
+                _logger.LogWarning("Insert operation failed");
                 return false;
             }
 
+            SendOrderMessage(result.ClientId, $"Кузнечная мастерская, Заказ №{result.Id}", $"Заказ №{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят");
+
             return true;
         }
         
@@ -171,7 +175,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
             }
 
             //проверка на возможность обновления статуса на следующий
-            if (viewModel.Status + 1 != newOrderStatus && viewModel.Status != OrderStatus.Ожидание)
+            if (viewModel.Status + 1 != newOrderStatus)
             {
                 _logger.LogWarning("Status update operation failed. New status " + newOrderStatus.ToString() + " incorrect");
                 return false;
@@ -186,25 +190,9 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
             }
 
             //проверка на выдачу
-            if (model.Status == OrderStatus.Готов || viewModel.Status == OrderStatus.Ожидание)
-            {   
-                var manufacture = _manufactureStorage.GetElement(new() { Id = viewModel.ManufactureId });
-                
-                if (manufacture == null)
-                {
-                    throw new ArgumentNullException(nameof(manufacture));
-                }
-
-                if (!_shopLogic.AddManufactures(manufacture, viewModel.Count))
-                {
-                    model.Status = OrderStatus.Ожидание;
-
-                    _logger.LogWarning($"AddManufactures operation failed. Shop is full.");
-                } 
-                else
-                {
-                    model.DateImplement = DateTime.Now;
-                }
+            if (model.Status == OrderStatus.Выдан)
+            {
+                model.DateImplement = DateTime.Now;
             }
             else
             {
@@ -213,15 +201,40 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 
             CheckModel(model, false);
 
-            //финальная проверка на возможность обновления
-            if (_orderStorage.Update(model) == null)
+            var result = _orderStorage.Update(model);
+
+			//финальная проверка на возможность обновления
+			if (result == null)
             {
+                model.Status--;
+
                 _logger.LogWarning("Update operation failed");
 
                 return false;
             }
 
-            return true;
+			SendOrderMessage(result.ClientId, $"Кузнечаня мастерская, Заказ №{result.Id}", $"Заказ №{model.Id} изменен статус на {result.Status}");
+
+			return true;
         }
+
+		private bool SendOrderMessage(int clientId, string subject, string text)
+		{
+			var client = _clientLogic.ReadElement(new() { Id = clientId });
+
+			if (client == null)
+			{
+				return false;
+			}
+
+			_mailWorker.MailSendAsync(new()
+			{
+				MailAddress = client.Email,
+				Subject = subject,
+				Text = text
+			});
+
+			return true;
+		}
 	}
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/ReportLogic.cs

@@ -1,6 +1,5 @@
 using BlacksmithWorkshopBusinessLogic.OfficePackage;
 using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
-using BlacksmithWorkshopBusinessLogic.OfficePackage;
 using BlacksmithWorkshopContracts.BindingModels;
 using BlacksmithWorkshopContracts.BusinessLogicsContracts;
 using BlacksmithWorkshopContracts.SearchModels;
@@ -21,27 +20,26 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 
         private readonly IOrderStorage _orderStorage;
 
-		private readonly IShopStorage _shopStorage;
-
         private readonly AbstractSaveToExcel _saveToExcel;
 
         private readonly AbstractSaveToWord _saveToWord;
 
         private readonly AbstractSaveToPdf _saveToPdf;
 
-		public ReportLogic(IManufactureStorage manufactureStorage, IOrderStorage orderStorage, IShopStorage shopStorage,
-			AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        //инициализируем поля класса через контейнер
+        public ReportLogic(IManufactureStorage manufactureStorage, 
+            IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, 
+            AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _manufactureStorage = manufactureStorage;
             _orderStorage = orderStorage;
-			_shopStorage = shopStorage;
 
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
         }
 
-		//Получение списка заготовок с указанием, в каких изделиях используются
+        //Получение списка компонент с указанием, в каких изделиях используются
         public List<ReportManufactureWorkPieceViewModel> GetManufactureWorkPiece()
         {
             var manufactures = _manufactureStorage.GetFullList();
@@ -59,7 +57,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 
                 foreach (var workPiece in manufacture.ManufactureWorkPieces)
                 {
-					record.WorkPieces.Add(new(workPiece.Value.Item1.WorkPieceName, workPiece.Value.Item2));
+                    record.WorkPieces.Add(new (workPiece.Value.Item1.WorkPieceName, workPiece.Value.Item2));
                     record.TotalCount += workPiece.Value.Item2;
                 }
 
@@ -69,34 +67,6 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
             return list;
         }
 
-		//Получение списка изделий с указанием, в каких магазинах в наличии
-		public List<ReportShopManufacturesViewModel> GetShopManufactures()
-		{
-			var shops = _shopStorage.GetFullList();
-
-			var list = new List<ReportShopManufacturesViewModel>();
-
-			foreach (var shop in shops)
-			{
-				var record = new ReportShopManufacturesViewModel
-				{
-					ShopName = shop.ShopName,
-					Manufactures = new List<(string, int)>(),
-					TotalCount = 0
-				};
-
-				foreach (var manufacture in shop.ShopManufactures)
-				{
-					record.Manufactures.Add(new(manufacture.Value.Item1.ManufactureName, manufacture.Value.Item2));
-					record.TotalCount += manufacture.Value.Item2;
-				}
-
-				list.Add(record);
-			}
-
-			return list;
-		}
-
         //Получение списка заказов за определенный период
         public List<ReportOrdersViewModel> GetOrders(ReportBindingModel model)
         {
@@ -112,21 +82,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
                 .ToList();
         }
 
-		//Получение списка заказов за весь период
-		public List<ReportGroupedOrdersViewModel> GetGroupedOrders()
-		{
-			return _orderStorage.GetFullList()
-					.GroupBy(x => x.DateCreate.Date)
-					.Select(x => new ReportGroupedOrdersViewModel
-					{
-						DateCreate = x.Key,
-						Count = x.Count(),
-						Sum = x.Sum(x => x.Sum)
-					})
-					.ToList();
-		}
-
-		//Сохранение изделий в файл-Word
+        //Сохранение мороженных в файл-Word
         public void SaveManufacturesToWordFile(ReportBindingModel model)
         {
             _saveToWord.CreateDoc(new WordInfo
@@ -137,18 +93,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
             });
         }
 
-		//Сохранение магазинов в файл-Word
-		public void SaveShopsToWordFile(ReportBindingModel model)
-		{
-			_saveToWord.CreateTable(new WordInfo
-			{
-				FileName = model.FileName,
-				Title = "Таблица магазинов",
-				Shops = _shopStorage.GetFullList()
-			});
-		}
-
-		//Сохранение изделий с указаеним заготовок в файл-Excel
+        //Сохранение заготовок с указаеним изделий в файл-Excel
         public void SaveManufactureWorkPieceToExcelFile(ReportBindingModel model)
         {
             _saveToExcel.CreateReport(new ExcelInfo
@@ -159,17 +104,6 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
             });
         }
 
-		//Сохранение магазинов с указанием изделий в файл-Excel
-		public void SaveShopManufacturesToExcelFile(ReportBindingModel model)
-		{
-			_saveToExcel.CreateShopReport(new ExcelInfo
-			{
-				FileName = model.FileName,
-				Title = "Список магазинов",
-				ShopManufactures = GetShopManufactures()
-			});
-		}
-
         //Сохранение заказов в файл-Pdf
         public void SaveOrdersToPdfFile(ReportBindingModel model)
         {
@@ -182,16 +116,5 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
                 Orders = GetOrders(model)
             });
         }
-
-		//Сохранение заказов за весь период в файл-Pdf
-		public void SaveGroupedOrdersToPdfFile(ReportBindingModel model)
-		{
-			_saveToPdf.CreateGroupedDoc(new PdfInfo
-			{
-				FileName = model.FileName,
-				Title = "Список заказов",
-				GroupedOrders = GetGroupedOrders()
-			});
-		}
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/ShopLogic.cs

@@ -1,246 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.BusinessLogicsContracts;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.StoragesContracts;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
-{
-    public class ShopLogic : IShopLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IShopStorage _shopStorage;
-
-        public ShopLogic(ILogger<ShopLogic> logger, IShopStorage shopStorage)
-        {
-            _logger = logger;
-            _shopStorage = shopStorage;
-        }
-
-        public ShopViewModel? ReadElement(ShopSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            _logger.LogInformation("ReadElement. ShopName:{ShopName}. Id:{Id}", model.ShopName, model.Id);
-            var element = _shopStorage.GetElement(model);
-
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-
-                return null;
-            }
-
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-
-            return element;
-        }
-
-        public List<ShopViewModel>? ReadList(ShopSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
-
-            var list = model == null ? _shopStorage.GetFullList() : _shopStorage.GetFilteredList(model);
-            
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-
-                return null;
-            }
-
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-
-            return list;
-        }
-
-        public bool AddManufacture(ShopSearchModel model, IManufactureModel manufacture, int count)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (count <= 0)
-            {
-                throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0", nameof(count));
-            }
-
-            _logger.LogInformation("AddManufacture. ShopName:{ShopName}. Id: {Id}", model?.ShopName, model?.Id);
-
-            var shop = _shopStorage.GetElement(model);
-
-            if (shop == null)
-            {
-                _logger.LogWarning("Add Manufacture operation failed");
-
-                return false;
-            }
-
-            if (shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum() < count)
-            {
-                throw new ArgumentNullException("Слишком много изделий для одного магазина", nameof(count));
-            }
-
-            if (!shop.ShopManufactures.ContainsKey(manufacture.Id))
-            {
-                shop.ShopManufactures[manufacture.Id] = (manufacture, count);
-            }
-            else
-            {
-                shop.ShopManufactures[manufacture.Id] = (manufacture, shop.ShopManufactures[manufacture.Id].Item2 + count);
-            }
-
-            _shopStorage.Update(new ShopBindingModel()
-            {
-                Id = shop.Id,
-                ShopName = shop.ShopName,
-                Address = shop.Address,
-                DateOpen = shop.DateOpen,
-                MaxCountManufactures = shop.MaxCountManufactures,
-                ShopManufactures = shop.ShopManufactures
-            });
-
-            return true;
-        }
-
-        public bool Create(ShopBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_shopStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool Update(ShopBindingModel model)
-        {
-            CheckModel(model);
-
-            if (_shopStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        public bool Delete(ShopBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-
-            if (_shopStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private void CheckModel(ShopBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-
-            if (!withParams)
-            {
-                return;
-            }
-
-            if (string.IsNullOrEmpty(model.ShopName))
-            {
-                throw new ArgumentNullException("Отсутствует названия магазина", nameof(model.ShopName));
-            }
-
-            if (string.IsNullOrEmpty(model.Address))
-            {
-                throw new ArgumentNullException("Отсутствует адреса магазина", nameof(model.Address));
-            }
-
-            _logger.LogInformation("Shop. ShopName:{ShopName}. Address:{Address}. Id: {Id}", model.ShopName, model.Address, model.Id);
-            var element = _shopStorage.GetElement(new ShopSearchModel
-            {
-                ShopName = model.ShopName
-            });
-
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Магазин с таким названием уже есть");
-            }
-        }
-
-        public bool AddManufactures(IManufactureModel model, int count)
-        {
-            if (count <= 0)
-            {
-                throw new ArgumentNullException("Количество добавляемых изделий должно быть больше 0", nameof(count));
-            }
-
-            _logger.LogInformation("AddManufactures. Manufacture: {Manufacture}. Count: {Count}", model?.ManufactureName, count);
-
-            var capacity = _shopStorage.GetFullList().Select(x => x.MaxCountManufactures - x.ShopManufactures.Select(x => x.Value.Item2).Sum()).Sum() - count;
-            
-            if (capacity < 0)
-            {
-                _logger.LogWarning("AddManufactures operation failed. Sell {count} Manufactures ", -capacity);
-                return false;
-            }
-
-            foreach (var shop in _shopStorage.GetFullList())
-            {
-                if (shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum() < count)
-                {
-                    if (!AddManufacture(new() { Id = shop.Id }, model, shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum()))
-                    {
-                        _logger.LogWarning("AddIceCreams operation failed.");
-                        return false;
-                    }
-                    count -= shop.MaxCountManufactures - shop.ShopManufactures.Select(x => x.Value.Item2).Sum();
-                }
-                else
-                {
-                    if (!AddManufacture(new() { Id = shop.Id }, model, count))
-                    {
-                        _logger.LogWarning("AddIceCreams operation failed.");
-                        return false;
-                    }
-                    count -= count;
-                }
-                if (count == 0)
-                {
-                    return true;
-                }
-            }
-
-            return true;
-        }
-
-        public bool SellManufatures(IManufactureModel model, int count)
-        {
-            return _shopStorage.SellManufactures(model, count);
-        }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogic/WorkModeling.cs

@@ -37,14 +37,18 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 				return;
 			}
 
-			var orders = _orderLogic.ReadList(new() { Status = OrderStatus.Принят });
-            if (orders == null)
-            {
-                _logger.LogWarning("DoWork. Orders is null or empty");
-                return;
-            }
+			var orders = _orderLogic.ReadList(new OrderSearchModel
+			{
+				Status = OrderStatus.Принят
+			});
 
-            _logger.LogDebug("DoWork for {Count} orders", orders.Count);
+			if (orders == null || orders.Count == 0)
+			{
+				_logger.LogWarning("DoWork. Orders is null or empty");
+				return;
+			}
+
+			_logger.LogDebug("DoWork for {Count} orders", orders.Count);
 
 			foreach (var implementer in implementers)
 			{
@@ -60,46 +64,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 				return;
 			}
 
-            await Task.Run(() =>
-            {
-                try
-                {
-                    var runOrder = _orderLogic.ReadList(new OrderSearchModel
-                    {
-                        ImplementerId = implementer.Id,
-                        Status = OrderStatus.Ожидание
-                    });
-
-                    if (runOrder == null)
-                    {
-                        return;
-                    }
-
-					foreach(var order in runOrder)
-                    {
-                        _logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
-                        _orderLogic.FinishOrder(new OrderBindingModel
-                        {
-                            Id = order.Id
-                        });
-                        // отдыхаем
-                        //Thread.Sleep(implementer.Qualification * _rnd.Next(10, 100));
-                    }
-                }
-                // заказа может не быть, просто игнорируем ошибку
-                catch (InvalidOperationException ex)
-                {
-                    _logger.LogWarning(ex, "Error try get work");
-                }
-                // а может возникнуть иная ошибка, тогда просто заканчиваем выполнение имитации
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error while do work");
-                    throw;
-                }
-            });
-
-            await RunOrderInWork(implementer);
+			await RunOrderInWork(implementer);
 
 			await Task.Run(() =>
 			{
@@ -192,5 +157,5 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogic
 				throw;
 			}
 		}
-    }
+	}
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -0,0 +1,107 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopBusinessLogic.MailWorker
+{
+	public abstract class AbstractMailWorker
+	{
+		protected string _mailLogin = string.Empty;
+
+		protected string _mailPassword = string.Empty;
+
+		protected string _smtpClientHost = string.Empty;
+
+		protected int _smtpClientPort;
+
+		protected string _popHost = string.Empty;
+
+		protected int _popPort;
+
+		private readonly IMessageInfoLogic _messageInfoLogic;
+
+		private readonly IClientLogic _clientLogic;
+
+		private readonly ILogger _logger;
+
+		public AbstractMailWorker(ILogger<AbstractMailWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic)
+		{
+			_logger = logger;
+			_messageInfoLogic = messageInfoLogic;
+			_clientLogic = clientLogic;
+		}
+
+		public void MailConfig(MailConfigBindingModel config)
+		{
+			_mailLogin = config.MailLogin;
+			_mailPassword = config.MailPassword;
+			_smtpClientHost = config.SmtpClientHost;
+			_smtpClientPort = config.SmtpClientPort;
+			_popHost = config.PopHost;
+			_popPort = config.PopPort;
+
+			_logger.LogDebug("Config: {login}, {password}, {clientHost}, {clientPOrt}, { popHost}, { popPort}", 
+				_mailLogin, _mailPassword, _smtpClientHost, _smtpClientPort, _popHost, _popPort);
+		}
+
+		public async void MailSendAsync(MailSendInfoBindingModel info)
+		{
+			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(_smtpClientHost) || _smtpClientPort == 0)
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(info.MailAddress) || string.IsNullOrEmpty(info.Subject) || string.IsNullOrEmpty(info.Text))
+			{
+				return;
+			}
+
+			_logger.LogDebug("Send Mail: {To}, {Subject}", info.MailAddress, info.Subject);
+
+			await SendMailAsync(info);
+		}
+
+		public async void MailCheck()
+		{
+			if (string.IsNullOrEmpty(_mailLogin) || string.IsNullOrEmpty(_mailPassword))
+			{
+				return;
+			}
+
+			if (string.IsNullOrEmpty(_popHost) || _popPort == 0)
+			{
+				return;
+			}
+
+			if (_messageInfoLogic == null)
+			{
+				return;
+			}
+
+			var list = await ReceiveMailAsync();
+
+			_logger.LogDebug("Check Mail: {Count} new mails", list.Count);
+
+			foreach (var mail in list)
+			{
+				mail.ClientId = _clientLogic.ReadElement(new() { Email = mail.SenderName })?.Id;
+
+				_messageInfoLogic.Create(mail);
+			}
+		}
+
+		protected abstract Task SendMailAsync(MailSendInfoBindingModel info);
+
+		protected abstract Task<List<MessageInfoBindingModel>> ReceiveMailAsync();
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/MailWorker/MailKitWorker.cs

@@ -0,0 +1,91 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.BusinessLogicsContracts;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.Mail;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using MailKit.Net.Pop3;
+using MailKit.Security;
+
+namespace BlacksmithWorkshopBusinessLogic.MailWorker
+{
+	public class MailKitWorker : AbstractMailWorker
+	{
+		public MailKitWorker(ILogger<MailKitWorker> logger, IMessageInfoLogic messageInfoLogic, IClientLogic clientLogic) 
+			: base(logger, messageInfoLogic, clientLogic) { }
+		
+		protected override async Task SendMailAsync(MailSendInfoBindingModel info)
+		{
+			using var objMailMessage = new MailMessage();
+
+			using var objSmtpClient = new SmtpClient(_smtpClientHost, _smtpClientPort);
+
+			try
+			{
+				objMailMessage.From = new MailAddress(_mailLogin);
+				objMailMessage.To.Add(new MailAddress(info.MailAddress));
+				objMailMessage.Subject = info.Subject;
+				objMailMessage.Body = info.Text;
+				objMailMessage.SubjectEncoding = Encoding.UTF8;
+				objMailMessage.BodyEncoding = Encoding.UTF8;
+
+				objSmtpClient.UseDefaultCredentials = false;
+				objSmtpClient.EnableSsl = true;
+				objSmtpClient.DeliveryMethod = SmtpDeliveryMethod.Network;
+				objSmtpClient.Credentials = new NetworkCredential(_mailLogin, _mailPassword);
+
+				await Task.Run(() => objSmtpClient.Send(objMailMessage));
+			}
+			catch (Exception)
+			{
+				throw;
+			}
+		}
+
+		protected override async Task<List<MessageInfoBindingModel>> ReceiveMailAsync()
+		{
+			var list = new List<MessageInfoBindingModel>();
+
+			using var client = new Pop3Client();
+
+			await Task.Run(() =>
+			{
+				try
+				{
+					client.Connect(_popHost, _popPort, SecureSocketOptions.SslOnConnect);
+
+					client.Authenticate(_mailLogin, _mailPassword);
+
+					for (int i = 0; i < client.Count; i++)
+					{
+						var message = client.GetMessage(i);
+
+						foreach (var mail in message.From.Mailboxes)
+						{
+							list.Add(new MessageInfoBindingModel
+							{
+								DateDelivery = message.Date.DateTime,
+								MessageId = message.MessageId,
+								SenderName = mail.Address,
+								Subject = message.Subject,
+								Body = message.TextBody
+							});
+						}
+					}
+				}
+				catch (AuthenticationException)
+				{ }
+				finally
+				{
+					client.Disconnect(true);
+				}
+			});
+
+			return list;
+		}
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -10,7 +10,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
 {
     public abstract class AbstractSaveToExcel
     {
-		//Создание отчета
+        //Создание отчета. Описание методов ниже
         public void CreateReport(ExcelInfo info)
         {
             CreateExcel(info);
@@ -50,7 +50,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
                         ColumnName = "B",
                         RowIndex = rowIndex,
                         Text = WorkPiece,
-						StyleInfo = ExcelStyleInfoType.TextWithBorder
+                        StyleInfo = ExcelStyleInfoType.TextWithBroder
                     });
 
                     InsertCellInWorksheet(new ExcelCellParameters
@@ -58,7 +58,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
                         ColumnName = "C",
                         RowIndex = rowIndex,
                         Text = Count.ToString(),
-						StyleInfo = ExcelStyleInfoType.TextWithBorder
+                        StyleInfo = ExcelStyleInfoType.TextWithBroder
                     });
 
                     rowIndex++;
@@ -86,81 +86,6 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
             SaveExcel(info);
         }
 
-		public void CreateShopReport(ExcelInfo info)
-		{
-			CreateExcel(info);
-
-			InsertCellInWorksheet(new ExcelCellParameters
-			{
-				ColumnName = "A",
-				RowIndex = 1,
-				Text = info.Title,
-				StyleInfo = ExcelStyleInfoType.Title
-			});
-
-			MergeCells(new ExcelMergeParameters
-			{
-				CellFromName = "A1",
-				CellToName = "C1"
-			});
-
-			uint rowIndex = 2;
-
-			foreach (var sm in info.ShopManufactures)
-			{
-				InsertCellInWorksheet(new ExcelCellParameters
-				{
-					ColumnName = "A",
-					RowIndex = rowIndex,
-					Text = sm.ShopName,
-					StyleInfo = ExcelStyleInfoType.Text
-				});
-
-				rowIndex++;
-
-				foreach (var (Manufacture, Count) in sm.Manufactures)
-				{
-					InsertCellInWorksheet(new ExcelCellParameters
-					{
-						ColumnName = "B",
-						RowIndex = rowIndex,
-						Text = Manufacture,
-						StyleInfo = ExcelStyleInfoType.TextWithBorder
-					});
-
-					InsertCellInWorksheet(new ExcelCellParameters
-					{
-						ColumnName = "C",
-						RowIndex = rowIndex,
-						Text = Count.ToString(),
-						StyleInfo = ExcelStyleInfoType.TextWithBorder
-					});
-
-					rowIndex++;
-				}
-
-				InsertCellInWorksheet(new ExcelCellParameters
-				{
-					ColumnName = "A",
-					RowIndex = rowIndex,
-					Text = "Итого",
-					StyleInfo = ExcelStyleInfoType.Text
-				});
-
-				InsertCellInWorksheet(new ExcelCellParameters
-				{
-					ColumnName = "C",
-					RowIndex = rowIndex,
-					Text = sm.TotalCount.ToString(),
-					StyleInfo = ExcelStyleInfoType.Text
-				});
-
-				rowIndex++;
-			}
-
-			SaveExcel(info);
-		}
-
         //Создание excel-файла
         protected abstract void CreateExcel(ExcelInfo info);
 

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -15,77 +15,60 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
         {
             CreatePdf(info);
 
-			CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-			
-			CreateParagraph(new PdfParagraph { Text = $"с {info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-			CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
-
-			CreateRow(new PdfRowParameters
+            CreateParagraph(new PdfParagraph
             {
-				Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Статус заказа", "Сумма" },
+                Text = info.Title,
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
 
-			foreach (var order in info.Orders)
-			{
-				CreateRow(new PdfRowParameters
+            CreateParagraph(new PdfParagraph
             {
-					Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ManufactureName, order.OrderStatus, order.Sum.ToString() },
+                Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", 
                 Style = "Normal",
-					ParagraphAlignment = PdfParagraphAlignmentType.Left
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
-			}
 
-			CreateParagraph(new PdfParagraph { Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right });
-
-			SavePdf(info);
-		}
-
-		public void CreateGroupedDoc(PdfInfo info)
-		{
-			CreatePdf(info);
-
-			CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
-
-			CreateTable(new List<string> { "3cm", "3cm", "3cm" });
+            CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "3cm" });
 
             CreateRow(new PdfRowParameters
             {
-				Texts = new List<string> { "Дата заказа", "Количество заказов", "Сумма" },
+                Texts = new List<string> { "Номер", "Дата заказа", "Изделие", "Сумма", "Статус заказа" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
 
-			foreach (var order in info.GroupedOrders)
+            foreach (var order in info.Orders)
             {
                 CreateRow(new PdfRowParameters
                 {
-					Texts = new List<string> { order.DateCreate.ToShortDateString(), order.Count.ToString(), order.Sum.ToString() },
+                    Texts = new List<string> { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ManufactureName, order.Sum.ToString(), order.OrderStatus },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
             }
 
-			CreateParagraph(new PdfParagraph { Text = $"Итого: {info.GroupedOrders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center });
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"\nИтого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Right
+            });
 
             SavePdf(info);
         }
 
-		//Создание doc-файла
+        /// Создание pdf-файла
         protected abstract void CreatePdf(PdfInfo info);
 
-		//Создание параграфа с текстом
+        /// Создание параграфа с текстом
         protected abstract void CreateParagraph(PdfParagraph paragraph);
 
-		//Создание таблицы
+        /// Создание таблицы
         protected abstract void CreateTable(List<string> columns);
 
-		//Создание и заполнение строки
+        /// Создание и заполнение строки
         protected abstract void CreateRow(PdfRowParameters rowParameters);
 
-		//Сохранение файла
+        /// Сохранение файла
         protected abstract void SavePdf(PdfInfo info);
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -18,7 +18,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
             //создание ряда абзацев
             CreateParagraph(new WordParagraph
             {
-				Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
+                Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) },
                 TextProperties = new WordTextProperties
                 {
                     Size = "24",
@@ -31,7 +31,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
             {
                 CreateParagraph(new WordParagraph
                 {
-					Texts = new List<(string, WordTextProperties)> { (manufacture.ManufactureName + " ", new WordTextProperties { Bold = true, Size = "24" }),
+                    Texts = new List<(string, WordTextProperties)> { (manufacture.ManufactureName + " ", new WordTextProperties { Bold = true, Size = "24", }),
                     (manufacture.Price.ToString(), new WordTextProperties { Size = "24" }) },
                     TextProperties = new WordTextProperties
                     {
@@ -41,68 +41,16 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage
                 });
             }
 
-			SaveWord(info);
-		}
-
-		public void CreateTable(WordInfo info)
-		{
-			CreateWord(info);
-
-			CreateParagraph(new WordParagraph
-			{
-				Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24" }) },
-				TextProperties = new WordTextProperties
-				{
-					Size = "24",
-					JustificationType = WordJustificationType.Center
-				}
-			});
-
-			List<List<(string, WordTextProperties)>> rowList = new()
-			{
-				new()
-				{
-					new("Название", new WordTextProperties { Bold = true, Size = "24" } ),
-					new("Адрес", new WordTextProperties { Bold = true, Size = "24" } ),
-					new("Дата открытия", new WordTextProperties { Bold = true, Size = "24" } )
-				}
-			};
-
-			foreach (var shop in info.Shops)
-			{
-				List<(string, WordTextProperties)> cellList = new()
-				{
-					new(shop.ShopName, new WordTextProperties { Size = "24" }),
-					new(shop.Address, new WordTextProperties { Size = "24" }),
-					new(shop.DateOpen.ToShortDateString(), new WordTextProperties { Size = "24"})
-				};
-
-				rowList.Add(cellList);
-			}
-
-			CreateTable(new WordParagraph
-			{
-				RowTexts = rowList,
-				TextProperties = new WordTextProperties
-				{
-					Size = "24",
-					JustificationType = WordJustificationType.Center
-				}
-			});
-
             SaveWord(info);
         }
 
-		//Создание doc-файла
+        // Создание doc-файла
         protected abstract void CreateWord(WordInfo info);
 
-		//Создание абзаца с текстом
+        // Создание абзаца с текстом
         protected abstract void CreateParagraph(WordParagraph paragraph);
 
-		//Создание таблицы
-		protected abstract void CreateTable(WordParagraph paragraph);
-
-		//Сохранение файла
+        // Сохранение файла
         protected abstract void SaveWord(WordInfo info);
 
     }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs

@@ -15,6 +15,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperEnums
         //просто текст
         Text,
 
-		TextWithBorder
+        //текст в рамке
+        TextWithBroder
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -16,16 +16,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
         //заголовок
         public string Title { get; set; } = string.Empty;
 
-		public List<ReportManufactureWorkPieceViewModel> ManufactureWorkPieces
-		{
-			get;
-			set;
-		} = new();
-
-		public List<ReportShopManufacturesViewModel> ShopManufactures
-		{
-			get;
-			set;
-		} = new();
+        //список заготовок по изделиям
+        public List<ReportManufactureWorkPieceViewModel> ManufactureWorkPieces { get; set; } = new();
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -20,7 +20,5 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
 
         //перечень заказов за указанный период для вывода/сохранения
         public List<ReportOrdersViewModel> Orders { get; set; } = new();
-		
-		public List<ReportGroupedOrdersViewModel> GroupedOrders { get; set; } = new();
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -16,7 +16,5 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
 
         //список заготовок для вывода и сохранения
         public List<ManufactureViewModel> Manufactures { get; set; } = new();
-
-		public List<ShopViewModel> Shops { get; set; } = new();
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs

@@ -14,7 +14,5 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels
 
         //свойства параграфа, если они есть
         public WordTextProperties? TextProperties { get; set; }
-
-		public List<List<(string, WordTextProperties)>> RowTexts { get; set; } = new();
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToExcel.cs

@@ -188,6 +188,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
             {
                 Uri = "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}"
             };
+
             stylesheetExtension1.AddNamespaceDeclaration("x14", "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
             stylesheetExtension1.Append(new SlicerStyles()
             {
@@ -226,7 +227,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
             return styleInfo switch
             {
                 ExcelStyleInfoType.Title => 2U,
-                ExcelStyleInfoType.TextWithBorder => 1U,
+                ExcelStyleInfoType.TextWithBroder => 1U,
                 ExcelStyleInfoType.Text => 0U,
                 _ => 0U,
             };
@@ -330,7 +331,6 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
                 };
 
                 row.InsertBefore(newCell, refCell);
-
                 cell = newCell;
             }
 

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToPdf.cs

@@ -27,7 +27,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
             {
                 PdfParagraphAlignmentType.Center => ParagraphAlignment.Center,
                 PdfParagraphAlignmentType.Left => ParagraphAlignment.Left,
-				PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
+                PdfParagraphAlignmentType.Right => ParagraphAlignment.Right,
                 _ => ParagraphAlignment.Justify,
             };
         }

BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -3,12 +3,6 @@ using BlacksmithWorkshopBusinessLogic.OfficePackage.HelperModels;
 using DocumentFormat.OpenXml;
 using DocumentFormat.OpenXml.Packaging;
 using DocumentFormat.OpenXml.Wordprocessing;
-using DocumentFormat.OpenXml;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
 {
@@ -74,7 +68,10 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
 
             if (!string.IsNullOrEmpty(paragraphProperties.Size))
             {
-				paragraphMarkRunProperties.AppendChild(new FontSize { Val = paragraphProperties.Size });
+                paragraphMarkRunProperties.AppendChild(new FontSize
+                {
+                    Val = paragraphProperties.Size
+                });
             }
 
             properties.AppendChild(paragraphMarkRunProperties);
@@ -115,6 +112,7 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
                 var docRun = new Run();
                 var properties = new RunProperties();
 
+                //задание свойств текста - размер и жирность
                 properties.AppendChild(new FontSize { Val = run.Item2.Size });
 
                 if (run.Item2.Bold)
@@ -124,7 +122,11 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
 
                 docRun.AppendChild(properties);
 
-				docRun.AppendChild(new Text { Text = run.Item1, Space = SpaceProcessingModeValues.Preserve });
+                docRun.AppendChild(new Text
+                {
+                    Text = run.Item1,
+                    Space = SpaceProcessingModeValues.Preserve
+                });
 
                 docParagraph.AppendChild(docRun);
             }
@@ -148,75 +150,5 @@ namespace BlacksmithWorkshopBusinessLogic.OfficePackage.Implements
 
             _wordDocument.Close();
         }
-
-		protected override void CreateTable(WordParagraph paragraph)
-		{
-			if (_docBody == null || paragraph == null)
-			{
-				return;
-			}
-
-			Table table = new Table();
-
-			var tableProp = new TableProperties();
-
-			tableProp.AppendChild(new TableLayout { Type = TableLayoutValues.Fixed });
-			tableProp.AppendChild(new TableBorders(
-					new TopBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-					new LeftBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-					new RightBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-					new BottomBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-					new InsideHorizontalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 },
-					new InsideVerticalBorder() { Val = new EnumValue<BorderValues>(BorderValues.Single), Size = 4 }
-				));
-			tableProp.AppendChild(new TableWidth { Type = TableWidthUnitValues.Auto });
-			
-			table.AppendChild(tableProp);
-
-			TableGrid tableGrid = new TableGrid();
-
-			for (int j = 0; j < paragraph.RowTexts[0].Count; ++j)
-			{
-				tableGrid.AppendChild(new GridColumn() { Width = "3000" });
-			}
-
-			table.AppendChild(tableGrid);
-
-			for (int i = 0; i < paragraph.RowTexts.Count; ++i)
-			{
-				TableRow docRow = new TableRow();
-
-				for (int j = 0; j < paragraph.RowTexts[i].Count; ++j)
-				{
-					var docParagraph = new Paragraph();
-
-					docParagraph.AppendChild(CreateParagraphProperties(paragraph.RowTexts[i][j].Item2));
-
-					var docRun = new Run();
-
-					var properties = new RunProperties();
-
-					properties.AppendChild(new FontSize { Val = paragraph.RowTexts[i][j].Item2.Size });
-					
-					if (paragraph.RowTexts[i][j].Item2.Bold)
-					{
-						properties.AppendChild(new Bold());
-					}
-
-					docRun.AppendChild(properties);
-
-					docRun.AppendChild(new Text { Text = paragraph.RowTexts[i][j].Item1, Space = SpaceProcessingModeValues.Preserve });
-
-					docParagraph.AppendChild(docRun);
-					TableCell docCell = new TableCell();
-					docCell.AppendChild(docParagraph);
-					docRow.AppendChild(docCell);
-				}
-
-				table.AppendChild(docRow);
-			}
-
-			_docBody.AppendChild(table);
-		}
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopClientApp/Controllers/HomeController.cs

@@ -174,5 +174,17 @@ namespace BlacksmithWorkshopClientApp.Controllers
 
 			return count * (manuf?.Price ?? 1);
 		}
+
+		//для работы с письмами
+		[HttpGet]
+		public IActionResult Mails()
+		{
+			if (APIClient.Client == null)
+			{
+				return Redirect("~/Home/Enter");
+			}
+
+			return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}"));
+		}
 	}
 }

BlacksmithWorkshop/BlacksmithWorkshopClientApp/Views/Home/Enter.cshtml

@@ -9,7 +9,7 @@
 	<div class="row">
 		<div class="col-4">Логин:</div>
 		<div class="col-8">
-			<input type="text" name="login" /
+			<input type="text" name="login" />
 		</div>
 	</div>
 	<div class="row">

BlacksmithWorkshop/BlacksmithWorkshopClientApp/Views/Home/Mails.cshtml

@@ -0,0 +1,51 @@
+@using BlacksmithWorkshopContracts.ViewModels
+
+@model List<MessageInfoViewModel>
+
+@{
+	ViewData["Title"] = "Mails";
+}
+
+<div class="text-center">
+	<h1 class="display-4">Заказы</h1>
+</div>
+<div class="text-center">
+	@{
+		if (Model == null)
+		{
+			<h3 class="display-4">Авторизируйтесь</h3>
+			return;
+		}
+		<table class="table">
+			<thead>
+				<tr>
+					<th>
+						Дата письма
+					</th>
+					<th>
+						Заголовок
+					</th>
+					<th>
+						Текст
+					</th>
+				</tr>
+			</thead>
+			<tbody>
+				@foreach (var item in Model)
+				{
+					<tr>
+						<td>
+							@Html.DisplayFor(modelItem => item.DateDelivery)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Subject)
+						</td>
+						<td>
+							@Html.DisplayFor(modelItem => item.Body)
+						</td>
+					</tr>
+				}
+			</tbody>
+		</table>
+	}
+</div>

BlacksmithWorkshop/BlacksmithWorkshopClientApp/Views/Shared/_Layout.cshtml

@@ -28,6 +28,9 @@
                         <li class="nav-item">
                             <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Privacy">Личные данные</a>
                         </li>
+                        <li class="nav-item">
+                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Mails">Письма</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Enter">Вход</a>
                         </li>

BlacksmithWorkshop/BlacksmithWorkshopContracts/Attributes/ColumnAttribute.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.Attributes
+{
+    //указываем, что данный атрибут можно прописать только в Property
+    [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; }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/Attributes/GridViewAutoSize.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.Attributes
+{
+    public enum GridViewAutoSize
+    {
+        NotSet = 0,
+
+        None = 1,
+
+        ColumnHeader = 2,
+
+        AllCellsExceptHeader = 4,
+
+        AllCells = 6,
+
+        DisplayedCellsExceptHeader = 8,
+
+        DisplayedCells = 10,
+
+        Fill = 16
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/BackUpSaveBinidngModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BindingModels
+{
+    public class BackUpSaveBinidngModel
+    {
+        public string FolderName { get; set; } = string.Empty;
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/MailConfigBindingModel.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BindingModels
+{
+	//один из двух классов для передачи данных по почте
+	public class MailConfigBindingModel
+	{
+		public string MailLogin { get; set; } = string.Empty;
+
+		public string MailPassword { get; set; } = string.Empty;
+
+		public string SmtpClientHost { get; set; } = string.Empty;
+
+		public int SmtpClientPort { get; set; }
+
+		public string PopHost { get; set; } = string.Empty;
+
+		public int PopPort { get; set; }
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/MailSendInfoBindingModel.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BindingModels
+{
+	//один из двух классов для обмена информацией по почте
+	public class MailSendInfoBindingModel
+	{
+		public string MailAddress { get; set; } = string.Empty;
+
+		public string Subject { get; set; } = string.Empty;
+
+		public string Text { get; set; } = string.Empty;
+	}
+
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/MessageInfoBindingModel.cs

@@ -0,0 +1,26 @@
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BindingModels
+{
+	public class MessageInfoBindingModel : IMessageInfoModel
+	{
+        public int Id { get; set; }
+
+        public string MessageId { get; set; } = string.Empty;
+
+		public int? ClientId { get; set; }
+
+		public string SenderName { get; set; } = string.Empty;
+
+		public DateTime DateDelivery { get; set; } = DateTime.Now;
+
+		public string Subject { get; set; } = string.Empty;
+
+		public string Body { get; set; } = string.Empty;
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ReportBindingModel.cs

@@ -12,6 +12,6 @@ namespace BlacksmithWorkshopContracts.BindingModels
 
         public DateTime? DateFrom { get; set; }
 
-		public DateTime? DateTo { get; set; }
+        public DateTime? DateTo { get; set;}
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ShopBindingModel.cs

@@ -1,24 +0,0 @@
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.BindingModels
-{
-    public class ShopBindingModel : IShopModel
-    {
-        public string ShopName { get; set; } = string.Empty;
-
-        public string Address { get; set; } = string.Empty;
-
-        public DateTime DateOpen { get; set; } = DateTime.Now;
-
-        public Dictionary<int, (IManufactureModel, int)> ShopManufactures { get; set; } = new();
-
-        public int Id { get; set; }
-
-        public int MaxCountManufactures { get; set; }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BlacksmithWorkshopContracts.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -6,6 +6,12 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Unity" Version="5.11.9" />
+    <PackageReference Include="Unity.Microsoft.Logging" Version="5.10.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj" />
   </ItemGroup>

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IBackUpLogic.cs

@@ -0,0 +1,16 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
+{
+    //интерфейс создания бекапа
+    public interface IBackUpLogic
+    {
+        //путь и имя файла для архивации
+        void CreateBackUp(BackUpSaveBinidngModel model);
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IMessageInfoLogic.cs

@@ -0,0 +1,18 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
+{
+	public interface IMessageInfoLogic
+	{
+		List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model);
+
+		bool Create(MessageInfoBindingModel model);
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs

@@ -10,34 +10,19 @@ namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
 {
     public interface IReportLogic
     {
-		//Получение списка добавок с указанием, в каких мороженых используются
+        //Получение списка заготовок с указанием, в каких изделиях используются
         List<ReportManufactureWorkPieceViewModel> GetManufactureWorkPiece();
 
-		//Получение списка мороженых с указанием, в каких магазинах в наличии
-		List<ReportShopManufacturesViewModel> GetShopManufactures();
-
         //Получение списка заказов за определенный период
         List<ReportOrdersViewModel> GetOrders(ReportBindingModel model);
 
-		//Получение списка заказов за весь период
-		List<ReportGroupedOrdersViewModel> GetGroupedOrders();
-
-		//Сохранение добавок в файл-Word
+        //Сохранение изделий в файл-Word
         void SaveManufacturesToWordFile(ReportBindingModel model);
 
-		//Сохранение магазинов в виде таблицы в файл-Word
-		void SaveShopsToWordFile(ReportBindingModel model);
-
-		//Сохранение добавок с указаеним мороженых в файл-Excel
+        //Сохранение заготовок с указанием изделий в файл-Excel
         void SaveManufactureWorkPieceToExcelFile(ReportBindingModel model);
 
-		//Сохранение магазинов с указанием мороженых в файл-Excel
-		void SaveShopManufacturesToExcelFile(ReportBindingModel model);
-
         //Сохранение заказов в файл-Pdf
         void SaveOrdersToPdfFile(ReportBindingModel model);
-
-		//Сохранение заказов за весь период в файл-Pdf
-		void SaveGroupedOrdersToPdfFile(ReportBindingModel model);
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IShopLogic.cs

@@ -1,31 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
-{
-    public interface IShopLogic
-    {
-        List<ShopViewModel>? ReadList(ShopSearchModel? model);
-
-        ShopViewModel? ReadElement(ShopSearchModel model);
-
-        bool Create(ShopBindingModel model);
-
-        bool Update(ShopBindingModel model);
-
-        bool Delete(ShopBindingModel model);
-
-        bool AddManufacture(ShopSearchModel model, IManufactureModel manufacture, int count);
-    
-        bool SellManufatures(IManufactureModel model, int count);
-
-        bool AddManufactures(IManufactureModel model, int count);
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/DependencyManager.cs

@@ -0,0 +1,63 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.DI
+{
+    /// <summary>
+    /// Менеджер для работы с зависимостями
+    /// </summary>
+    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<ILoggingBuilder> configure) => _dependencyManager.AddLogging(configure);
+
+        //Добавление зависимости
+        public void RegisterType<T, U>(bool isSingle = false) where U : class, T where T : class => _dependencyManager.RegisterType<T, U>(isSingle);
+
+        //Добавление зависимости
+        public void RegisterType<T>(bool isSingle = false) where T : class => _dependencyManager.RegisterType<T>(isSingle);
+
+        //Получение класса со всеми зависмостями
+        public T Resolve<T>() => _dependencyManager.Resolve<T>();
+    }
+
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/IDependencyContainer.cs

@@ -0,0 +1,26 @@
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.DI
+{
+    //Интерфейс установки зависмости между элементами
+    public interface IDependencyContainer
+    {
+        //Регистрация логгера
+        void AddLogging(Action<ILoggingBuilder> configure);
+
+        //Добавление зависимости
+        void RegisterType<T, U>(bool isSingle) where U : class, T where T :
+        class;
+
+        //Добавление зависимости
+        void RegisterType<T>(bool isSingle) where T : class;
+
+        //Получение класса со всеми зависмостями
+        T Resolve<T>();
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/IImplementationExtension.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.DI
+{
+
+    //Интерфейс для регистрации зависимостей в модулях
+    public interface IImplementationExtension
+    {
+        //для установления приоритета
+        public int Priority { get; }
+
+        //Регистрация сервисов
+        public void RegisterServices();
+    }
+
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/ServiceDependencyContainer.cs

@@ -0,0 +1,62 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.DI
+{
+    public class ServiceDependencyContainer : IDependencyContainer
+    {
+        private ServiceProvider? _serviceProvider;
+
+        private readonly ServiceCollection _serviceCollection;
+
+        public ServiceDependencyContainer()
+        {
+            _serviceCollection = new ServiceCollection();
+        }
+
+        public void AddLogging(Action<ILoggingBuilder> configure)
+        {
+            _serviceCollection.AddLogging(configure);
+        }
+
+        public void RegisterType<T, U>(bool isSingle) where U : class, T where T : class
+        {
+            if (isSingle)
+            {
+                _serviceCollection.AddSingleton<T, U>();
+            }
+            else
+            {
+                _serviceCollection.AddTransient<T, U>();
+            }
+            _serviceProvider = null;
+        }
+
+        public void RegisterType<T>(bool isSingle) where T : class
+        {
+            if (isSingle)
+            {
+                _serviceCollection.AddSingleton<T>();
+            }
+            else
+            {
+                _serviceCollection.AddTransient<T>();
+            }
+            _serviceProvider = null;
+        }
+
+        public T Resolve<T>()
+        {
+            if (_serviceProvider == null)
+            {
+                _serviceProvider = _serviceCollection.BuildServiceProvider();
+            }
+            return _serviceProvider.GetService<T>()!;
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/ServiceProviderLoader.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.DI
+{
+    //Загрузчик данных
+    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";
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/DI/UnityDependencyContainer.cs

@@ -0,0 +1,43 @@
+using Microsoft.Extensions.Logging;
+using Unity.Microsoft.Logging;
+using Unity;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.DI
+{
+    public class UnityDependencyContainer : IDependencyContainer
+    {
+        private readonly IUnityContainer _container;
+
+        public UnityDependencyContainer()
+        {
+            _container = new UnityContainer();
+        }
+
+        public void AddLogging(Action<ILoggingBuilder> configure)
+        {
+            var factory = LoggerFactory.Create(configure);
+            _container.AddExtension(new LoggingExtension(factory));
+        }
+
+        public void RegisterType<T>(bool isSingle) where T : class
+        {
+            _container.RegisterType<T>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
+
+        }
+
+        public T Resolve<T>()
+        {
+            return _container.Resolve<T>();
+        }
+
+        void IDependencyContainer.RegisterType<T, U>(bool isSingle)
+        {
+            _container.RegisterType<T, U>(isSingle ? TypeLifetime.Singleton : TypeLifetime.Transient);
+        }
+    }
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/MessageInfoSearchModel.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.SearchModels
+{
+	public class MessageInfoSearchModel
+	{
+		public string? MessageId { get; set; }
+
+		public int? ClientId { get; set; }
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/OrderSearchModel.cs

@@ -25,5 +25,5 @@ namespace BlacksmithWorkshopContracts.SearchModels
         public DateTime? DateTo { get; set; }
 
 		public OrderStatus? Status { get; set; }
-    }
+	}
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/SearchModels/ShopSearchModel.cs

@@ -1,18 +0,0 @@
-using BlacksmithWorkshopDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.SearchModels
-{
-    public class ShopSearchModel
-    {
-        //для поиска по идентификатору
-        public int? Id { get; set; }
-
-        //для поиска по названию
-        public string? ShopName { get; set; }
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IBackUpInfo.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.StoragesContracts
+{
+    //интерфейс получения данных по всем сущностям
+    public interface IBackUpInfo
+    {
+        //метод получения данных по всем сущностям
+        List<T>? GetList<T>() where T : class, new();
+
+        Type? GetTypeByModelInterface(string modelInterfaceName);
+    }
+
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IMessageInfoStorage.cs

@@ -0,0 +1,22 @@
+using BlacksmithWorkshopContracts.BindingModels;
+using BlacksmithWorkshopContracts.SearchModels;
+using BlacksmithWorkshopContracts.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.StoragesContracts
+{
+	public interface IMessageInfoStorage
+	{
+		List<MessageInfoViewModel> GetFullList();
+
+		List<MessageInfoViewModel> GetFilteredList(MessageInfoSearchModel model);
+
+		MessageInfoViewModel? GetElement(MessageInfoSearchModel model);
+
+		MessageInfoViewModel? Insert(MessageInfoBindingModel model);
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/StoragesContracts/IShopStorage.cs

@@ -1,29 +0,0 @@
-using BlacksmithWorkshopContracts.BindingModels;
-using BlacksmithWorkshopContracts.SearchModels;
-using BlacksmithWorkshopContracts.ViewModels;
-using BlacksmithWorkshopDataModels.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace BlacksmithWorkshopContracts.StoragesContracts
-{
-    public interface IShopStorage
-    {
-        List<ShopViewModel> GetFullList();
-
-        List<ShopViewModel> GetFilteredList(ShopSearchModel model);
-
-        ShopViewModel? GetElement(ShopSearchModel model);
-
-        ShopViewModel? Insert(ShopBindingModel model);
-
-        ShopViewModel? Update(ShopBindingModel model);
-
-        ShopViewModel? Delete(ShopBindingModel model);
-
-        bool SellManufactures(IManufactureModel model, int count);
-    }
-}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ClientViewModel.cs

@@ -1,4 +1,5 @@
-using BlacksmithWorkshopDataModels.Models;
+using BlacksmithWorkshopContracts.Attributes;
+using BlacksmithWorkshopDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,15 +11,16 @@ namespace BlacksmithWorkshopContracts.ViewModels
 {
     public class ClientViewModel : IClientModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
 
-        [DisplayName("ФИО клиента")]
+        [Column(title: "ФИО клиента", width: 150)]
         public string ClientFIO { get; set; } = string.Empty;
 
-        [DisplayName("Логин (эл. почта)")]
+        [Column(title: "Логие (эл. почта)", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string Email { get; set; } = string.Empty;
 
-        [DisplayName("Пароль")]
+        [Column(title: "Пароль", width: 150)]
         public string Password { get; set; } = string.Empty;
 
     }

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ImplementerViewModel.cs

@@ -1,4 +1,5 @@
-using BlacksmithWorkshopDataModels.Models;
+using BlacksmithWorkshopContracts.Attributes;
+using BlacksmithWorkshopDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -10,18 +11,19 @@ namespace BlacksmithWorkshopContracts.ViewModels
 {
 	public class ImplementerViewModel : IImplementerModel
 	{
-		public int Id { get; set; }
+        [Column(visible: false)]
+        public int Id { get; set; }
 
-		[DisplayName("ФИО исполнителя")]
+        [Column(title: "ФИО исполнителя", width: 150)]
 		public string ImplementerFIO { get; set; } = string.Empty;
 
-		[DisplayName("Пароль")]
-		public string Password { get; set; } = string.Empty;
+        [Column(title: "Пароль", width: 150)]
+        public string Password { get; set; } = string.Empty;
 
-		[DisplayName("Стаж")]
-		public int WorkExperience { get; set; }
+        [Column(title: "Стаж", width: 150)]
+        public int WorkExperience { get; set; }
 
-		[DisplayName("Квалификация")]
-		public int Qualification { get; set; }
+        [Column(title: "Квалификация", width: 150)]
+        public int Qualification { get; set; }
 	}
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ManufactureViewModel.cs

@@ -1,4 +1,5 @@
-using BlacksmithWorkshopDataModels.Models;
+using BlacksmithWorkshopContracts.Attributes;
+using BlacksmithWorkshopDataModels.Models;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -11,14 +12,16 @@ namespace BlacksmithWorkshopContracts.ViewModels
     //класс для отображения пользователю информаци о продуктах (изделиях)
     public class ManufactureViewModel : IManufactureModel
     {
+        [Column(visible: false)]
         public int Id { get; set; }
 
-        [DisplayName("Навание изделия")]
+        [Column(title: "Навание изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
         public string ManufactureName { get; set; } = string.Empty;
 
-        [DisplayName("Цена")]
+        [Column(title: "Цена", width: 150)]
         public double Price { get; set; }
 
+        [Column(visible: false)]
         public Dictionary<int, (IWorkPieceModel, int)> ManufactureWorkPieces { get; set; } = new();
     }
 }

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/MessageInfoViewModel.cs

@@ -0,0 +1,35 @@
+using BlacksmithWorkshopContracts.Attributes;
+using BlacksmithWorkshopDataModels.Models;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BlacksmithWorkshopContracts.ViewModels
+{
+	public class MessageInfoViewModel : IMessageInfoModel
+	{
+		[Column(visible: false)]
+        public int Id { get; set; }
+
+		[Column(visible: false)]
+        public string MessageId { get; set; } = string.Empty;
+
+		[Column(visible: false)]
+		public int? ClientId { get; set; }
+
+        [Column(title: "Отправитель", width: 150)]
+		public string SenderName { get; set; } = string.Empty;
+
+        [Column(title: "Дата отправки", width: 150)]
+		public DateTime DateDelivery { get; set; } = DateTime.Now;
+
+        [Column(title: "Заголовок", width: 150)]
+		public string Subject { get; set; } = string.Empty;
+
+        [Column(title: "Текст", width: 150)]
+        public string Body { get; set; } = string.Empty;
+	}
+}

BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs

@@ -1,4 +1,5 @@
-using BlacksmithWorkshopDataModels.Enums;
+using BlacksmithWorkshopContracts.Attributes;
+using BlacksmithWorkshopDataModels.Enums;
 using BlacksmithWorkshopDataModels.Models;
 using System;
 using System.Collections.Generic;
@@ -12,37 +13,40 @@ namespace BlacksmithWorkshopContracts.ViewModels
     //класс для отображения пользователю информации о заказах
     public class OrderViewModel : IOrderModel
     {
-        [DisplayName("Номер")]
+        [Column(visible: false)]
         public int Id { get; set; }
 
-		public int ClientId { get; set; }
+        [Column(visible: false)]
+        public int ClientId { get; set; }
 
-		public int? ImplementerId { get; set; }
+        [Column(visible: false)]
+        public int? ImplementerId { get; set; }
 
-		public int ManufactureId { get; set; }
+        [Column(visible: false)]
+        public int ManufactureId { get; set; }
 
-		[DisplayName("ФИО клиента")]
+        [Column(title: "ФИО клиента", width: 150)]
         public string ClientFIO { get; set; } = string.Empty;
 
-        [DisplayName("Изделие")]
+        [Column(title: "Изделие", width: 150)]
         public string ManufactureName { get; set; } = string.Empty;
 
-		[DisplayName("ФИО исполнителя")]
+        [Column(title: "ФИО исполнителя", width: 150)]
 		public string ImplementerFIO { get; set; } = string.Empty;
 
-		[DisplayName("Количество")]
+        [Column(title: "Количество", width: 150)]
         public int Count { get; set; }
 
-        [DisplayName("Сумма")]
+        [Column(title: "Сумма", width: 150)]
         public double Sum { get; set; }
 
-        [DisplayName("Статус")]
+        [Column(title: "Статус", width: 150)]
         public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;
 
-        [DisplayName("Дата создания")]
+        [Column(title: "Дата создания", width: 150)]
         public DateTime DateCreate { get; set; } = DateTime.Now;
 
-        [DisplayName("Дата выполнения")]
+        [Column(title: "Дата выполнения", width: 150)]
         public DateTime? DateImplement { get; set; }
 	}
 }