Merge branch 'LabWork03_Hard' into LabWork04_Hard

.gitignore

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

AutomobilePlant/AutomobilePlant.sln

@@ -13,13 +13,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantBusinessLogi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantListImplements", "AutomobilePlantListImplements\AutomobilePlantListImplements.csproj", "{B27736FF-39E9-4DEC-BCB4-35ACAF5ECEB9}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantFileImplement", "AutomobilePlantFileImplement\AutomobilePlantFileImplement.csproj", "{10818526-654C-4928-985F-9C02A2A02B15}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantFileImplement", "AutomobilePlantFileImplement\AutomobilePlantFileImplement.csproj", "{10818526-654C-4928-985F-9C02A2A02B15}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutomobilePlantDatabaseImplement", "AutomobilePlantDatabaseImplement\AutomobilePlantDatabaseImplement.csproj", "{6C1976A0-354A-4700-9CDA-3242782F5632}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantRestApi", "AutomobilePlantRestApi\AutomobilePlantRestApi.csproj", "{CDF7D2AD-E6C5-4C51-9ECC-9CD678D922BF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantClientApp", "AutomobilePlantClientApp\AutomobilePlantClientApp.csproj", "{64B4EF20-2056-46B3-A009-E6DC5682492B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AutomobilePlantDatabaseImplement", "AutomobilePlantDatabaseImplement\AutomobilePlantDatabaseImplement.csproj", "{6C1976A0-354A-4700-9CDA-3242782F5632}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -55,14 +51,6 @@ Global
 		{6C1976A0-354A-4700-9CDA-3242782F5632}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6C1976A0-354A-4700-9CDA-3242782F5632}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6C1976A0-354A-4700-9CDA-3242782F5632}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CDF7D2AD-E6C5-4C51-9ECC-9CD678D922BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CDF7D2AD-E6C5-4C51-9ECC-9CD678D922BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CDF7D2AD-E6C5-4C51-9ECC-9CD678D922BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CDF7D2AD-E6C5-4C51-9ECC-9CD678D922BF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{64B4EF20-2056-46B3-A009-E6DC5682492B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{64B4EF20-2056-46B3-A009-E6DC5682492B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{64B4EF20-2056-46B3-A009-E6DC5682492B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{64B4EF20-2056-46B3-A009-E6DC5682492B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

AutomobilePlant/AutomobilePlant/App.config

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-	<appSettings>
-		<add key="SmtpClientHost" value="smtp.rambler.ru" />
-		<add key="SmtpClientPort" value="587" />
-		<add key="PopHost" value="pop.rambler.ru" />
-		<add key="PopPort" value="995" />
-		<add key="MailLogin" value="tmpmailforlabs@rambler.ru" />
-		<add key="MailPassword" value="0paRVbmA" />
-	</appSettings>
-</configuration>

AutomobilePlant/AutomobilePlant/AutomobilePlant.csproj

@@ -31,6 +31,9 @@
     <None Update="ReportOrders.rdlc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="ReportOrdersByDate.rdlc">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>

AutomobilePlant/AutomobilePlant/DataGridViewExtension.cs

@@ -1,50 +0,0 @@
-using AutomobilePlantContracts.Attributes;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlant
-{
-	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;
-					}
-				}
-			}
-		}
-	}
-}

AutomobilePlant/AutomobilePlant/FormCar.cs

@@ -12,7 +12,6 @@ using System.Windows.Forms;
 using AutomobilePlantContracts.BusinessLogicContracts;
 using AutomobilePlantContracts.SearchModels;
 using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.DI;
 
 namespace AutomobilePlant
 {
@@ -95,45 +94,50 @@ namespace AutomobilePlant
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormCarComponent>();
-			if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormCarComponent));
+            if (service is FormCarComponent form)
             {
-				if (form.ComponentModel == null)
-                {
-					return;
-				}
-			}
-			_logger.LogInformation("Добавление нового компонента: { ComponentName}-{Count}", form.ComponentModel.ComponentName, form.Count);
-			if (_carComponents.ContainsKey(form.Id))
-			{
-				_carComponents[form.Id] = (form.ComponentModel, form.Count);
-			}
-			else
-			{
-				_carComponents.Add(form.Id, (form.ComponentModel, form.Count));
-			}
-			LoadData();
-        }
-
-        private void ButtonEdit_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                var form = DependencyManager.Instance.Resolve<FormCarComponent>();
-                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
-                form.Id = id;
-                form.Count = _carComponents[id].Item2;
-
                 if (form.ShowDialog() == DialogResult.OK)
                 {
                     if (form.ComponentModel == null)
                     {
                         return;
                     }
-					_logger.LogInformation("Изменение компонента:{ ComponentName}- { Count}", form.ComponentModel.ComponentName, form.Count);
-					_carComponents[form.Id] = (form.ComponentModel, form.Count);
-					LoadData();
-				}
+                    _logger.LogInformation("Добавление нового компонента: { ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
+                    if (_carComponents.ContainsKey(form.Id))
+                    {
+                        _carComponents[form.Id] = (form.ComponentModel, form.Count);
+                    }
+                    else
+                    {
+                        _carComponents.Add(form.Id, (form.ComponentModel, form.Count));
+                    }
+                    LoadData();
+                }
+            }
+        }
+
+        private void ButtonEdit_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                var service = Program.ServiceProvider?.GetService(typeof(FormCarComponent));
+                if (service is FormCarComponent form)
+                {
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells[0].Value);
+                    form.Id = id;
+                    form.Count = _carComponents[id].Item2;
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        if (form.ComponentModel == null)
+                        {
+                            return;
+                        }
+                        _logger.LogInformation("Изменение компонента:{ ComponentName} - { Count}", form.ComponentModel.ComponentName, form.Count);
+                        _carComponents[form.Id] = (form.ComponentModel, form.Count);
+                        LoadData();
+                    }
+                }
             }
         }
 

AutomobilePlant/AutomobilePlant/FormCars.cs

@@ -11,7 +11,6 @@ using System.Windows.Forms;
 using AutomobilePlantContracts.BusinessLogicContracts;
 using AutomobilePlantContracts.SearchModels;
 using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.DI;
 
 namespace AutomobilePlant
 {
@@ -35,8 +34,15 @@ namespace AutomobilePlant
         {
             try
             {
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка автомобилей");
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["CarName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["CarComponents"].Visible = false;
+                }
+                _logger.LogInformation("Загрузка автомобилей");
             }
             catch (Exception ex)
             {
@@ -47,10 +53,13 @@ namespace AutomobilePlant
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormCar>();
-            if (form.ShowDialog() == DialogResult.OK)
+            var service = Program.ServiceProvider?.GetService(typeof(FormCar));
+            if (service is FormCar form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
 
@@ -58,11 +67,14 @@ namespace AutomobilePlant
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormCar>();
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                var service = Program.ServiceProvider?.GetService(typeof(FormCar));
+                if (service is FormCar form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

AutomobilePlant/AutomobilePlant/FormClients.Designer.cs

@@ -1,88 +0,0 @@
-namespace AutomobilePlant
-{
-    partial class FormClients
-    {
-        /// <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.buttonDelete = new System.Windows.Forms.Button();
-            this.buttonUpdate = 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(12, 55);
-            this.dataGridView.Name = "dataGridView";
-            this.dataGridView.RowHeadersWidth = 51;
-            this.dataGridView.RowTemplate.Height = 29;
-            this.dataGridView.Size = new System.Drawing.Size(610, 383);
-            this.dataGridView.TabIndex = 0;
-            // 
-            // buttonDelete
-            // 
-            this.buttonDelete.Location = new System.Drawing.Point(352, 12);
-            this.buttonDelete.Name = "buttonDelete";
-            this.buttonDelete.Size = new System.Drawing.Size(270, 29);
-            this.buttonDelete.TabIndex = 1;
-            this.buttonDelete.Text = "Удалить выбранного клиента";
-            this.buttonDelete.UseVisualStyleBackColor = true;
-            this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
-            // 
-            // buttonUpdate
-            // 
-            this.buttonUpdate.Location = new System.Drawing.Point(228, 12);
-            this.buttonUpdate.Name = "buttonUpdate";
-            this.buttonUpdate.Size = new System.Drawing.Size(94, 29);
-            this.buttonUpdate.TabIndex = 2;
-            this.buttonUpdate.Text = "Обновить";
-            this.buttonUpdate.UseVisualStyleBackColor = true;
-            this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
-            // 
-            // FormClients
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(635, 450);
-            this.Controls.Add(this.buttonUpdate);
-            this.Controls.Add(this.buttonDelete);
-            this.Controls.Add(this.dataGridView);
-            this.Name = "FormClients";
-            this.Text = "Клиенты";
-            this.Load += new System.EventHandler(this.FormClients_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-        private DataGridView dataGridView;
-        private Button buttonDelete;
-        private Button buttonUpdate;
-    }
-}

AutomobilePlant/AutomobilePlant/FormClients.cs

@@ -1,79 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-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 AutomobilePlant
-{
-    public partial class FormClients : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IClientLogic _logic;
-        public FormClients(ILogger<FormClients> logger, IClientLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-
-        private void FormClients_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-
-        private void LoadData()
-        {
-            try
-            {
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка клиентов");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки клиентов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-        private void buttonDelete_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 ClientBindingModel
-                        {
-                            Id = id
-                        }))
-                        {
-                            throw new Exception("Ошибка при удалении клиента. Дополнительная информация в логах.");
-                        }
-                        LoadData();
-                    }
-                    catch (Exception ex)
-                    {
-                        _logger.LogError(ex, "Ошибка удаления клиента");
-                        MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                    }
-                }
-            }
-        }
-
-        private void buttonUpdate_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-    }
-}

AutomobilePlant/AutomobilePlant/FormComponents.cs

@@ -1,6 +1,5 @@
 using AutomobilePlantContracts.BindingModels;
 using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -35,8 +34,14 @@ namespace AutomobilePlant
         {
             try
             {
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка компонентов");
+                var list = _logic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ComponentName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                }
+                _logger.LogInformation("Загрузка компонентов");
             }
             catch (Exception ex)
             {
@@ -47,22 +52,28 @@ namespace AutomobilePlant
 
         private void ButtonAdd_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormComponent>();
-			if (form.ShowDialog() == DialogResult.OK)
-			{
-				LoadData();
-			}
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+            if (service is FormComponent form)
+            {
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
+            }
         }
 
         private void ButtonEdit_Click(object sender, EventArgs e)
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-				var form = DependencyManager.Instance.Resolve<FormComponent>();
-				form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-				if (form.ShowDialog() == DialogResult.OK)
+                var service = Program.ServiceProvider?.GetService(typeof(FormComponent));
+                if (service is FormComponent form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }

AutomobilePlant/AutomobilePlant/FormCreateOrder.Designer.cs

@@ -36,8 +36,6 @@
             this.textBoxSum = new System.Windows.Forms.TextBox();
             this.buttonSave = new System.Windows.Forms.Button();
             this.buttonCancel = new System.Windows.Forms.Button();
-            this.labelClient = new System.Windows.Forms.Label();
-            this.comboBoxClient = new System.Windows.Forms.ComboBox();
             this.SuspendLayout();
             // 
             // labelName
@@ -45,14 +43,14 @@
             this.labelName.AutoSize = true;
             this.labelName.Location = new System.Drawing.Point(30, 20);
             this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(99, 20);
+            this.labelName.Size = new System.Drawing.Size(79, 20);
             this.labelName.TabIndex = 0;
             this.labelName.Text = "Автомобиль:";
             // 
             // labelCount
             // 
             this.labelCount.AutoSize = true;
-            this.labelCount.Location = new System.Drawing.Point(30, 100);
+            this.labelCount.Location = new System.Drawing.Point(30, 70);
             this.labelCount.Name = "labelCount";
             this.labelCount.Size = new System.Drawing.Size(93, 20);
             this.labelCount.TabIndex = 1;
@@ -61,7 +59,7 @@
             // labelSum
             // 
             this.labelSum.AutoSize = true;
-            this.labelSum.Location = new System.Drawing.Point(30, 138);
+            this.labelSum.Location = new System.Drawing.Point(30, 119);
             this.labelSum.Name = "labelSum";
             this.labelSum.Size = new System.Drawing.Size(58, 20);
             this.labelSum.TabIndex = 2;
@@ -78,7 +76,7 @@
             // 
             // textBoxCount
             // 
-            this.textBoxCount.Location = new System.Drawing.Point(171, 100);
+            this.textBoxCount.Location = new System.Drawing.Point(171, 67);
             this.textBoxCount.Name = "textBoxCount";
             this.textBoxCount.Size = new System.Drawing.Size(262, 27);
             this.textBoxCount.TabIndex = 4;
@@ -86,14 +84,14 @@
             // 
             // textBoxSum
             // 
-            this.textBoxSum.Location = new System.Drawing.Point(171, 135);
+            this.textBoxSum.Location = new System.Drawing.Point(171, 112);
             this.textBoxSum.Name = "textBoxSum";
             this.textBoxSum.Size = new System.Drawing.Size(262, 27);
             this.textBoxSum.TabIndex = 5;
             // 
             // buttonSave
             // 
-            this.buttonSave.Location = new System.Drawing.Point(239, 171);
+            this.buttonSave.Location = new System.Drawing.Point(239, 164);
             this.buttonSave.Name = "buttonSave";
             this.buttonSave.Size = new System.Drawing.Size(94, 29);
             this.buttonSave.TabIndex = 6;
@@ -103,7 +101,7 @@
             // 
             // buttonCancel
             // 
-            this.buttonCancel.Location = new System.Drawing.Point(339, 171);
+            this.buttonCancel.Location = new System.Drawing.Point(339, 164);
             this.buttonCancel.Name = "buttonCancel";
             this.buttonCancel.Size = new System.Drawing.Size(94, 29);
             this.buttonCancel.TabIndex = 7;
@@ -111,30 +109,11 @@
             this.buttonCancel.UseVisualStyleBackColor = true;
             this.buttonCancel.Click += new System.EventHandler(this.ButtonCancel_Click);
             // 
-            // labelClient
-            // 
-            this.labelClient.AutoSize = true;
-            this.labelClient.Location = new System.Drawing.Point(30, 61);
-            this.labelClient.Name = "labelClient";
-            this.labelClient.Size = new System.Drawing.Size(61, 20);
-            this.labelClient.TabIndex = 8;
-            this.labelClient.Text = "Клиент:";
-            // 
-            // comboBoxClient
-            // 
-            this.comboBoxClient.FormattingEnabled = true;
-            this.comboBoxClient.Location = new System.Drawing.Point(171, 61);
-            this.comboBoxClient.Name = "comboBoxClient";
-            this.comboBoxClient.Size = new System.Drawing.Size(262, 28);
-            this.comboBoxClient.TabIndex = 9;
-            // 
             // FormCreateOrder
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(450, 212);
-            this.Controls.Add(this.comboBoxClient);
-            this.Controls.Add(this.labelClient);
             this.Controls.Add(this.buttonCancel);
             this.Controls.Add(this.buttonSave);
             this.Controls.Add(this.textBoxSum);
@@ -148,7 +127,6 @@
             this.Load += new System.EventHandler(this.FormCreateOrder_Load);
             this.ResumeLayout(false);
             this.PerformLayout();
-
         }
 
         #endregion
@@ -161,7 +139,5 @@
         private TextBox textBoxSum;
         private Button buttonSave;
         private Button buttonCancel;
-        private Label labelClient;
-        private ComboBox comboBoxClient;
     }
 }

AutomobilePlant/AutomobilePlant/FormCreateOrder.cs

@@ -19,15 +19,13 @@ namespace AutomobilePlant
         private readonly ILogger _logger;
         private readonly ICarLogic _logicС;
         private readonly IOrderLogic _logicO;
-        private readonly IClientLogic _logicClient;
 
-        public FormCreateOrder(ILogger<FormCreateOrder> logger, ICarLogic logicС, IOrderLogic logicO, IClientLogic logicClient)
+        public FormCreateOrder(ILogger<FormCreateOrder> logger, ICarLogic logicС, IOrderLogic logicO)
         {
             InitializeComponent();
             _logger = logger;
             _logicС = logicС;
             _logicO = logicO;
-            _logicClient = logicClient;
         }
 
         private void FormCreateOrder_Load(object sender, EventArgs e)
@@ -50,25 +48,6 @@ namespace AutomobilePlant
                 _logger.LogError(ex, "Ошибка загрузки списка автомобилей");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
-
-            _logger.LogInformation("Загрузка клиентов для заказа");
-            try
-            {
-                var list = _logicClient.ReadList(null);
-                if (list != null)
-                {
-                    comboBoxClient.DisplayMember = "ClientFIO";
-                    comboBoxClient.ValueMember = "Id";
-                    comboBoxClient.DataSource = list;
-                    comboBoxClient.SelectedItem = null;
-                }
-
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка клиентов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
         }
 
         private void CalcSum()
@@ -117,18 +96,12 @@ namespace AutomobilePlant
                 MessageBox.Show("Выберите автомобиль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 return;
             }
-            if (comboBoxClient.SelectedValue == null)
-            {
-                MessageBox.Show("Выберите клиента", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
             _logger.LogInformation("Создание заказа");
             try
             {
                 var operationResult = _logicO.CreateOrder(new OrderBindingModel
                 {
                     CarId = Convert.ToInt32(comboBoxCar.SelectedValue),
-                    ClientId = Convert.ToInt32(comboBoxClient.SelectedValue),
                     Count = Convert.ToInt32(textBoxCount.Text),
                     Sum = Convert.ToDouble(textBoxSum.Text)
                 });

AutomobilePlant/AutomobilePlant/FormCreateOrder.resx

@@ -1,4 +1,64 @@
-<root>
+<?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">

AutomobilePlant/AutomobilePlant/FormImplementer.Designer.cs

@@ -1,167 +0,0 @@
-namespace AutomobilePlant
-{
-    partial class FormImplementer
-    {
-        /// <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.labelFIO = new System.Windows.Forms.Label();
-            this.labelPassword = new System.Windows.Forms.Label();
-            this.labelWorkExp = new System.Windows.Forms.Label();
-            this.labelQualification = new System.Windows.Forms.Label();
-            this.textBoxFIO = new System.Windows.Forms.TextBox();
-            this.textBoxPassword = new System.Windows.Forms.TextBox();
-            this.numericUpDownWorkExp = new System.Windows.Forms.NumericUpDown();
-            this.numericUpDownQualification = new System.Windows.Forms.NumericUpDown();
-            this.buttonSave = new System.Windows.Forms.Button();
-            this.buttonCancel = new System.Windows.Forms.Button();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExp)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // labelFIO
-            // 
-            this.labelFIO.AutoSize = true;
-            this.labelFIO.Location = new System.Drawing.Point(24, 47);
-            this.labelFIO.Name = "labelFIO";
-            this.labelFIO.Size = new System.Drawing.Size(49, 20);
-            this.labelFIO.TabIndex = 0;
-            this.labelFIO.Text = "ФИО: ";
-            // 
-            // labelPassword
-            // 
-            this.labelPassword.AutoSize = true;
-            this.labelPassword.Location = new System.Drawing.Point(24, 92);
-            this.labelPassword.Name = "labelPassword";
-            this.labelPassword.Size = new System.Drawing.Size(65, 20);
-            this.labelPassword.TabIndex = 1;
-            this.labelPassword.Text = "Пароль:";
-            // 
-            // labelWorkExp
-            // 
-            this.labelWorkExp.AutoSize = true;
-            this.labelWorkExp.Location = new System.Drawing.Point(24, 134);
-            this.labelWorkExp.Name = "labelWorkExp";
-            this.labelWorkExp.Size = new System.Drawing.Size(102, 20);
-            this.labelWorkExp.TabIndex = 2;
-            this.labelWorkExp.Text = "Стаж работы:";
-            // 
-            // labelQualification
-            // 
-            this.labelQualification.AutoSize = true;
-            this.labelQualification.Location = new System.Drawing.Point(24, 177);
-            this.labelQualification.Name = "labelQualification";
-            this.labelQualification.Size = new System.Drawing.Size(114, 20);
-            this.labelQualification.TabIndex = 3;
-            this.labelQualification.Text = "Квалификация:";
-            // 
-            // textBoxFIO
-            // 
-            this.textBoxFIO.Location = new System.Drawing.Point(155, 47);
-            this.textBoxFIO.Name = "textBoxFIO";
-            this.textBoxFIO.Size = new System.Drawing.Size(371, 27);
-            this.textBoxFIO.TabIndex = 4;
-            // 
-            // textBoxPassword
-            // 
-            this.textBoxPassword.Location = new System.Drawing.Point(155, 85);
-            this.textBoxPassword.Name = "textBoxPassword";
-            this.textBoxPassword.Size = new System.Drawing.Size(182, 27);
-            this.textBoxPassword.TabIndex = 5;
-            // 
-            // numericUpDownWorkExp
-            // 
-            this.numericUpDownWorkExp.Location = new System.Drawing.Point(155, 132);
-            this.numericUpDownWorkExp.Name = "numericUpDownWorkExp";
-            this.numericUpDownWorkExp.Size = new System.Drawing.Size(182, 27);
-            this.numericUpDownWorkExp.TabIndex = 6;
-            // 
-            // numericUpDownQualification
-            // 
-            this.numericUpDownQualification.Location = new System.Drawing.Point(155, 175);
-            this.numericUpDownQualification.Name = "numericUpDownQualification";
-            this.numericUpDownQualification.Size = new System.Drawing.Size(182, 27);
-            this.numericUpDownQualification.TabIndex = 7;
-            // 
-            // buttonSave
-            // 
-            this.buttonSave.Location = new System.Drawing.Point(324, 233);
-            this.buttonSave.Name = "buttonSave";
-            this.buttonSave.Size = new System.Drawing.Size(103, 29);
-            this.buttonSave.TabIndex = 8;
-            this.buttonSave.Text = "Сохранить";
-            this.buttonSave.UseVisualStyleBackColor = true;
-            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
-            // 
-            // buttonCancel
-            // 
-            this.buttonCancel.Location = new System.Drawing.Point(433, 233);
-            this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(106, 29);
-            this.buttonCancel.TabIndex = 9;
-            this.buttonCancel.Text = "Отмена";
-            this.buttonCancel.UseVisualStyleBackColor = true;
-            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
-            // 
-            // FormImplementer
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(551, 274);
-            this.Controls.Add(this.buttonCancel);
-            this.Controls.Add(this.buttonSave);
-            this.Controls.Add(this.numericUpDownQualification);
-            this.Controls.Add(this.numericUpDownWorkExp);
-            this.Controls.Add(this.textBoxPassword);
-            this.Controls.Add(this.textBoxFIO);
-            this.Controls.Add(this.labelQualification);
-            this.Controls.Add(this.labelWorkExp);
-            this.Controls.Add(this.labelPassword);
-            this.Controls.Add(this.labelFIO);
-            this.Name = "FormImplementer";
-            this.Text = "Исполнитель";
-            this.Load += new System.EventHandler(this.FormImplementer_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownWorkExp)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.numericUpDownQualification)).EndInit();
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private Label labelFIO;
-        private Label labelPassword;
-        private Label labelWorkExp;
-        private Label labelQualification;
-        private TextBox textBoxFIO;
-        private TextBox textBoxPassword;
-        private NumericUpDown numericUpDownWorkExp;
-        private NumericUpDown numericUpDownQualification;
-        private Button buttonSave;
-        private Button buttonCancel;
-    }
-}

AutomobilePlant/AutomobilePlant/FormImplementer.cs

@@ -1,101 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.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 AutomobilePlant
-{
-    public partial class FormImplementer : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerLogic _logic;
-        private int? _id;
-        public int Id { set { _id = value; } }
-        public FormImplementer(ILogger<FormImplementer> logger, IImplementerLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormImplementer_Load(object sender, EventArgs e)
-        {
-            if (_id.HasValue)
-            {
-                try
-                {
-                    _logger.LogInformation("Получение информации исполнителя");
-                    var view = _logic.ReadElement(new ImplementerSearchModel
-                    {
-                        Id = _id.Value
-                    });
-                    if (view != null)
-                    {
-                        textBoxFIO.Text = view.ImplementerFIO;
-                        textBoxPassword.Text = view.Password;
-                        numericUpDownQualification.Value = view.Qualification;
-                        numericUpDownWorkExp.Value = view.WorkExperience;
-                    }
-                }
-                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(textBoxPassword.Text))
-            {
-                MessageBox.Show("Заполните пароль", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            if (string.IsNullOrEmpty(textBoxFIO.Text))
-            {
-                MessageBox.Show("Заполните ФИО", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            _logger.LogInformation("Сохранение исполнителя");
-            try
-            {
-                var model = new ImplementerBindingModel
-                {
-                    Id = _id ?? 0,
-                    ImplementerFIO = textBoxFIO.Text,
-                    Password = textBoxPassword.Text,
-                    Qualification = (int)numericUpDownQualification.Value,
-                    WorkExperience = (int)numericUpDownWorkExp.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();
-        }
-    }
-}

AutomobilePlant/AutomobilePlant/FormMails.Designer.cs

@@ -1,62 +0,0 @@
-namespace AutomobilePlant
-{
-	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.Location = new Point(12, 12);
-			dataGridView.Name = "dataGridView";
-			dataGridView.RowHeadersWidth = 51;
-			dataGridView.RowTemplate.Height = 29;
-			dataGridView.Size = new Size(776, 426);
-			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;
-	}
-}

AutomobilePlant/AutomobilePlant/FormMails.cs

@@ -1,42 +0,0 @@
-using AutomobilePlantContracts.BusinessLogicContracts;
-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 AutomobilePlant
-{
-	public partial class FormMails : Form
-	{
-		private readonly ILogger _logger;
-		private readonly IMessageInfoLogic _logic;
-
-		public FormMails(ILogger<FormMails> logger, IMessageInfoLogic logic)
-		{
-			InitializeComponent();
-			_logger = logger;
-			_logic = logic;
-		}
-
-		private void FormMails_Load(object sender, EventArgs e)
-		{
-			try
-			{
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка писем");
-			}
-			catch (Exception ex)
-			{
-				_logger.LogError(ex, "Ошибка загрузки писем");
-				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
-				MessageBoxIcon.Error);
-			}
-		}
-	}
-}

AutomobilePlant/AutomobilePlant/FormMain.Designer.cs

@@ -28,192 +28,231 @@
         /// </summary>
         private void InitializeComponent()
         {
-			this.menuStrip = new System.Windows.Forms.MenuStrip();
-			this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.автомобилиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.клиентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.исполнителиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.письмаToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.списокАвтомобилейToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.компонентыПоАвтомобилямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.запускРаботToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.создатьБэкапToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.dataGridView = new System.Windows.Forms.DataGridView();
-			this.buttonCreateOrder = new System.Windows.Forms.Button();
-			this.buttonSetToFinish = new System.Windows.Forms.Button();
-			this.buttonUpdate = new System.Windows.Forms.Button();
-			this.menuStrip.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
-			this.SuspendLayout();
-			// 
-			// menuStrip
-			// 
-			this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
-			this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuStrip = new System.Windows.Forms.MenuStrip();
+            this.справочникиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.компонентыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.автомобилиToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.отчетыToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокАвтомобилейToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.компонентыПоАвтомобилямToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокЗаказовToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.магазиныToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокМагазиновToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.автомобилиВМагазинахToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.списокЗаказовПоДатеToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.buttonSupplyShop = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonCreateOrder = new System.Windows.Forms.Button();
+            this.buttonSetToWork = new System.Windows.Forms.Button();
+            this.buttonSetToDone = new System.Windows.Forms.Button();
+            this.buttonSetToFinish = new System.Windows.Forms.Button();
+            this.buttonUpdate = new System.Windows.Forms.Button();
+            this.buttonSellCars = new System.Windows.Forms.Button();
+            this.menuStrip.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // menuStrip
+            // 
+            this.menuStrip.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.menuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.справочникиToolStripMenuItem,
-            this.отчетыToolStripMenuItem,
-            this.запускРаботToolStripMenuItem,
-            this.создатьБэкапToolStripMenuItem});
-			this.menuStrip.Location = new System.Drawing.Point(0, 0);
-			this.menuStrip.Name = "menuStrip";
-			this.menuStrip.Size = new System.Drawing.Size(1436, 28);
-			this.menuStrip.TabIndex = 0;
-			this.menuStrip.Text = "Справочники";
-			// 
-			// справочникиToolStripMenuItem
-			// 
-			this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.отчетыToolStripMenuItem});
+            this.menuStrip.Location = new System.Drawing.Point(0, 0);
+            this.menuStrip.Name = "menuStrip";
+            this.menuStrip.Size = new System.Drawing.Size(1176, 28);
+            this.menuStrip.TabIndex = 0;
+            this.menuStrip.Text = "Справочники";
+            // 
+            // справочникиToolStripMenuItem
+            // 
+            this.справочникиToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.компонентыToolStripMenuItem,
             this.автомобилиToolStripMenuItem,
-            this.клиентыToolStripMenuItem,
-            this.исполнителиToolStripMenuItem,
-            this.письмаToolStripMenuItem});
-			this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-			this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
-			this.справочникиToolStripMenuItem.Text = "Справочники";
-			// 
-			// компонентыToolStripMenuItem
-			// 
-			this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
-			this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			this.компонентыToolStripMenuItem.Text = "Компоненты";
-			this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
-			// 
-			// автомобилиToolStripMenuItem
-			// 
-			this.автомобилиToolStripMenuItem.Name = "автомобилиToolStripMenuItem";
-			this.автомобилиToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			this.автомобилиToolStripMenuItem.Text = "Автомобили";
-			this.автомобилиToolStripMenuItem.Click += new System.EventHandler(this.автомобилиToolStripMenuItem_Click);
-			// 
-			// клиентыToolStripMenuItem
-			// 
-			this.клиентыToolStripMenuItem.Name = "клиентыToolStripMenuItem";
-			this.клиентыToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			this.клиентыToolStripMenuItem.Text = "Клиенты";
-			this.клиентыToolStripMenuItem.Click += new System.EventHandler(this.клиентыToolStripMenuItem_Click);
-			// 
-			// исполнителиToolStripMenuItem
-			// 
-			this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-			this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			this.исполнителиToolStripMenuItem.Text = "Исполнители";
-			this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.исполнителиToolStripMenuItem_Click);
-			// 
-			// письмаToolStripMenuItem
-			// 
-			this.письмаToolStripMenuItem.Name = "письмаToolStripMenuItem";
-			this.письмаToolStripMenuItem.Size = new System.Drawing.Size(185, 26);
-			this.письмаToolStripMenuItem.Text = "Письма";
-			this.письмаToolStripMenuItem.Click += new System.EventHandler(this.письмаToolStripMenuItem_Click);
-			// 
-			// отчетыToolStripMenuItem
-			// 
-			this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.магазиныToolStripMenuItem});
+            this.справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
+            this.справочникиToolStripMenuItem.Size = new System.Drawing.Size(117, 24);
+            this.справочникиToolStripMenuItem.Text = "Справочники";
+            // 
+            // компонентыToolStripMenuItem
+            // 
+            this.компонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem";
+            this.компонентыToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+            this.компонентыToolStripMenuItem.Text = "Компоненты";
+            this.компонентыToolStripMenuItem.Click += new System.EventHandler(this.компонентыToolStripMenuItem_Click);
+            // 
+            // автомобилиToolStripMenuItem
+            // 
+            this.автомобилиToolStripMenuItem.Name = "автомобилиToolStripMenuItem";
+            this.автомобилиToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+            this.автомобилиToolStripMenuItem.Text = "Автомобили";
+            this.автомобилиToolStripMenuItem.Click += new System.EventHandler(this.автомобилиToolStripMenuItem_Click);
+            // 
+            // отчетыToolStripMenuItem
+            // 
+            this.отчетыToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.списокАвтомобилейToolStripMenuItem,
             this.компонентыПоАвтомобилямToolStripMenuItem,
-            this.списокЗаказовToolStripMenuItem});
-			this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
-			this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
-			this.отчетыToolStripMenuItem.Text = "Отчеты";
-			// 
-			// списокАвтомобилейToolStripMenuItem
-			// 
-			this.списокАвтомобилейToolStripMenuItem.Name = "списокАвтомобилейToolStripMenuItem";
-			this.списокАвтомобилейToolStripMenuItem.Size = new System.Drawing.Size(304, 26);
-			this.списокАвтомобилейToolStripMenuItem.Text = "Список автомобилей";
-			this.списокАвтомобилейToolStripMenuItem.Click += new System.EventHandler(this.списокАвтомобилейToolStripMenuItem_Click);
-			// 
-			// компонентыПоАвтомобилямToolStripMenuItem
-			// 
-			this.компонентыПоАвтомобилямToolStripMenuItem.Name = "компонентыПоАвтомобилямToolStripMenuItem";
-			this.компонентыПоАвтомобилямToolStripMenuItem.Size = new System.Drawing.Size(304, 26);
-			this.компонентыПоАвтомобилямToolStripMenuItem.Text = "Компоненты по автомобилям";
-			this.компонентыПоАвтомобилямToolStripMenuItem.Click += new System.EventHandler(this.компонентыПоАвтомобилямToolStripMenuItem_Click);
-			// 
-			// списокЗаказовToolStripMenuItem
-			// 
-			this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
-			this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(304, 26);
-			this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
-			this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказовToolStripMenuItem_Click);
-			// 
-			// запускРаботToolStripMenuItem
-			// 
-			this.запускРаботToolStripMenuItem.Name = "запускРаботToolStripMenuItem";
-			this.запускРаботToolStripMenuItem.Size = new System.Drawing.Size(114, 24);
-			this.запускРаботToolStripMenuItem.Text = "Запуск работ";
-			this.запускРаботToolStripMenuItem.Click += new System.EventHandler(this.запускРаботToolStripMenuItem_Click);
-			// 
-			// создатьБэкапToolStripMenuItem
-			// 
-			this.создатьБэкапToolStripMenuItem.Name = "создатьБэкапToolStripMenuItem";
-			this.создатьБэкапToolStripMenuItem.Size = new System.Drawing.Size(122, 24);
-			this.создатьБэкапToolStripMenuItem.Text = "Создать бэкап";
-			this.создатьБэкапToolStripMenuItem.Click += new System.EventHandler(this.создатьБэкапToolStripMenuItem_Click);
-			// 
-			// dataGridView
-			// 
-			this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-			this.dataGridView.Location = new System.Drawing.Point(12, 31);
-			this.dataGridView.Name = "dataGridView";
-			this.dataGridView.RowHeadersWidth = 51;
-			this.dataGridView.RowTemplate.Height = 29;
-			this.dataGridView.Size = new System.Drawing.Size(1188, 407);
-			this.dataGridView.TabIndex = 1;
-			// 
-			// buttonCreateOrder
-			// 
-			this.buttonCreateOrder.Location = new System.Drawing.Point(1220, 42);
-			this.buttonCreateOrder.Name = "buttonCreateOrder";
-			this.buttonCreateOrder.Size = new System.Drawing.Size(194, 29);
-			this.buttonCreateOrder.TabIndex = 2;
-			this.buttonCreateOrder.Text = "Создать заказ";
-			this.buttonCreateOrder.UseVisualStyleBackColor = true;
-			this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click);
-			// 
-			// buttonSetToFinish
-			// 
-			this.buttonSetToFinish.Location = new System.Drawing.Point(1220, 147);
-			this.buttonSetToFinish.Name = "buttonSetToFinish";
-			this.buttonSetToFinish.Size = new System.Drawing.Size(194, 29);
-			this.buttonSetToFinish.TabIndex = 5;
-			this.buttonSetToFinish.Text = "Заказ выдан";
-			this.buttonSetToFinish.UseVisualStyleBackColor = true;
-			this.buttonSetToFinish.Click += new System.EventHandler(this.ButtonSetToFinish_Click);
-			// 
-			// buttonUpdate
-			// 
-			this.buttonUpdate.Location = new System.Drawing.Point(1220, 409);
-			this.buttonUpdate.Name = "buttonUpdate";
-			this.buttonUpdate.Size = new System.Drawing.Size(194, 29);
-			this.buttonUpdate.TabIndex = 6;
-			this.buttonUpdate.Text = "Обновить";
-			this.buttonUpdate.UseVisualStyleBackColor = true;
-			this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click);
-			// 
-			// FormMain
-			// 
-			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
-			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(1436, 450);
-			this.Controls.Add(this.buttonUpdate);
-			this.Controls.Add(this.buttonSetToFinish);
-			this.Controls.Add(this.buttonCreateOrder);
-			this.Controls.Add(this.dataGridView);
-			this.Controls.Add(this.menuStrip);
-			this.MainMenuStrip = this.menuStrip;
-			this.Name = "FormMain";
-			this.Text = "Автомобильный завод";
-			this.Load += new System.EventHandler(this.FormMain_Load);
-			this.menuStrip.ResumeLayout(false);
-			this.menuStrip.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
-			this.ResumeLayout(false);
-			this.PerformLayout();
+            this.списокЗаказовToolStripMenuItem,
+            this.списокМагазиновToolStripMenuItem,
+            this.автомобилиВМагазинахToolStripMenuItem,
+            this.списокЗаказовПоДатеToolStripMenuItem});
+            this.отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            this.отчетыToolStripMenuItem.Size = new System.Drawing.Size(73, 24);
+            this.отчетыToolStripMenuItem.Text = "Отчеты";
+            // 
+            // списокАвтомобилейToolStripMenuItem
+            // 
+            this.списокАвтомобилейToolStripMenuItem.Name = "списокАвтомобилейToolStripMenuItem";
+            this.списокАвтомобилейToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+            this.списокАвтомобилейToolStripMenuItem.Text = "Список автомобилей";
+            this.списокАвтомобилейToolStripMenuItem.Click += new System.EventHandler(this.списокАвтомобилейToolStripMenuItem_Click);
+            // 
+            // компонентыПоАвтомобилямToolStripMenuItem
+            // 
+            this.компонентыПоАвтомобилямToolStripMenuItem.Name = "компонентыПоАвтомобилямToolStripMenuItem";
+            this.компонентыПоАвтомобилямToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+            this.компонентыПоАвтомобилямToolStripMenuItem.Text = "Компоненты по автомобилям";
+            this.компонентыПоАвтомобилямToolStripMenuItem.Click += new System.EventHandler(this.компонентыПоАвтомобилямToolStripMenuItem_Click);
+            // 
+            // списокЗаказовToolStripMenuItem
+            // 
+            this.списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+            this.списокЗаказовToolStripMenuItem.Size = new System.Drawing.Size(252, 26);
+            this.списокЗаказовToolStripMenuItem.Text = "Список заказов";
+            this.списокЗаказовToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказовToolStripMenuItem_Click);
+            // 
+            // магазиныToolStripMenuItem
+            // 
+            this.магазиныToolStripMenuItem.Name = "магазиныToolStripMenuItem";
+            this.магазиныToolStripMenuItem.Size = new System.Drawing.Size(182, 26);
+            this.магазиныToolStripMenuItem.Text = "Магазины";
+            this.магазиныToolStripMenuItem.Click += new System.EventHandler(this.магазиныToolStripMenuItem_Click);
+            // 
+            // списокМагазиновToolStripMenuItem
+            // 
+            this.списокМагазиновToolStripMenuItem.Name = "списокМагазиновToolStripMenuItem";
+            this.списокМагазиновToolStripMenuItem.Size = new System.Drawing.Size(259, 26);
+            this.списокМагазиновToolStripMenuItem.Text = "Список магазинов";
+            this.списокМагазиновToolStripMenuItem.Click += new System.EventHandler(this.списокМагазиновToolStripMenuItem_Click);
+            // 
+            // автомобилиВМагазинахToolStripMenuItem
+            // 
+            this.автомобилиВМагазинахToolStripMenuItem.Name = "автомобилиВМагазинахToolStripMenuItem";
+            this.автомобилиВМагазинахToolStripMenuItem.Size = new System.Drawing.Size(259, 26);
+            this.автомобилиВМагазинахToolStripMenuItem.Text = "Автомобили в магазинах";
+            this.автомобилиВМагазинахToolStripMenuItem.Click += new System.EventHandler(this.автомобилиВМагазинахToolStripMenuItem_Click);
+            // 
+            // buttonSupplyShop
+            // 
+            this.buttonSupplyShop.Location = new System.Drawing.Point(969, 182);
+            this.buttonSupplyShop.Name = "buttonSupplyShop";
+            this.buttonSupplyShop.Size = new System.Drawing.Size(194, 30);
+            this.buttonSupplyShop.TabIndex = 7;
+            this.buttonSupplyShop.Text = "Пополнение магазина";
+            this.buttonSupplyShop.UseVisualStyleBackColor = true;
+            this.buttonSupplyShop.Click += new System.EventHandler(this.buttonSupplyShop_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Location = new System.Drawing.Point(12, 31);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(942, 407);
+            this.dataGridView.TabIndex = 1;
+            // 
+            // buttonCreateOrder
+            // 
+            this.buttonCreateOrder.Location = new System.Drawing.Point(969, 42);
+            this.buttonCreateOrder.Name = "buttonCreateOrder";
+            this.buttonCreateOrder.Size = new System.Drawing.Size(194, 29);
+            this.buttonCreateOrder.TabIndex = 2;
+            this.buttonCreateOrder.Text = "Создать заказ";
+            this.buttonCreateOrder.UseVisualStyleBackColor = true;
+            this.buttonCreateOrder.Click += new System.EventHandler(this.ButtonCreateOrder_Click);
+            // 
+            // buttonSetToWork
+            // 
+            this.buttonSetToWork.Location = new System.Drawing.Point(969, 77);
+            this.buttonSetToWork.Name = "buttonSetToWork";
+            this.buttonSetToWork.Size = new System.Drawing.Size(194, 29);
+            this.buttonSetToWork.TabIndex = 3;
+            this.buttonSetToWork.Text = "Отдать на выполнение";
+            this.buttonSetToWork.UseVisualStyleBackColor = true;
+            this.buttonSetToWork.Click += new System.EventHandler(this.ButtonSetToWork_Click);
+            // 
+            // buttonSetToDone
+            // 
+            this.buttonSetToDone.Location = new System.Drawing.Point(969, 112);
+            this.buttonSetToDone.Name = "buttonSetToDone";
+            this.buttonSetToDone.Size = new System.Drawing.Size(194, 29);
+            this.buttonSetToDone.TabIndex = 4;
+            this.buttonSetToDone.Text = "Заказ готов";
+            this.buttonSetToDone.UseVisualStyleBackColor = true;
+            this.buttonSetToDone.Click += new System.EventHandler(this.ButtonSetToDone_Click);
+            // 
+            // buttonSetToFinish
+            // 
+            this.buttonSetToFinish.Location = new System.Drawing.Point(969, 147);
+            this.buttonSetToFinish.Name = "buttonSetToFinish";
+            this.buttonSetToFinish.Size = new System.Drawing.Size(194, 29);
+            this.buttonSetToFinish.TabIndex = 5;
+            this.buttonSetToFinish.Text = "Заказ выдан";
+            this.buttonSetToFinish.UseVisualStyleBackColor = true;
+            this.buttonSetToFinish.Click += new System.EventHandler(this.ButtonSetToFinish_Click);
+            // 
+            // buttonUpdate
+            // 
+            this.buttonUpdate.Location = new System.Drawing.Point(969, 407);
+            this.buttonUpdate.Name = "buttonUpdate";
+            this.buttonUpdate.Size = new System.Drawing.Size(194, 29);
+            this.buttonUpdate.TabIndex = 6;
+            this.buttonUpdate.Text = "Обновить";
+            this.buttonUpdate.UseVisualStyleBackColor = true;
+            this.buttonUpdate.Click += new System.EventHandler(this.ButtonUpdate_Click);
+            // 
+            // buttonSellCars
+            // 
+            this.buttonSellCars.Location = new System.Drawing.Point(969, 218);
+            this.buttonSellCars.Name = "buttonSellCars";
+            this.buttonSellCars.Size = new System.Drawing.Size(194, 29);
+            this.buttonSellCars.TabIndex = 7;
+            this.buttonSellCars.Text = "Продажа автомобилей";
+            this.buttonSellCars.UseVisualStyleBackColor = true;
+            this.buttonSellCars.Click += new System.EventHandler(this.buttonSellCars_Click);
+            // 
+            // списокЗаказовПоДатеToolStripMenuItem
+            // 
+            this.списокЗаказовПоДатеToolStripMenuItem.Name = "списокЗаказовПоДатеToolStripMenuItem";
+            this.списокЗаказовПоДатеToolStripMenuItem.Size = new System.Drawing.Size(259, 26);
+            this.списокЗаказовПоДатеToolStripMenuItem.Text = "Список заказов по дате";
+            this.списокЗаказовПоДатеToolStripMenuItem.Click += new System.EventHandler(this.списокЗаказовПоДатеToolStripMenuItem_Click);
+            // 
+            // FormMain
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(1176, 450);
+            this.Controls.Add(this.buttonSellCars);
+            this.Controls.Add(this.buttonSupplyShop);
+            this.Controls.Add(this.buttonUpdate);
+            this.Controls.Add(this.buttonSetToFinish);
+            this.Controls.Add(this.buttonSetToDone);
+            this.Controls.Add(this.buttonSetToWork);
+            this.Controls.Add(this.buttonCreateOrder);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.menuStrip);
+            this.MainMenuStrip = this.menuStrip;
+            this.Name = "FormMain";
+            this.Text = "Автомобильный завод";
+            this.Load += new System.EventHandler(this.FormMain_Load);
+            this.menuStrip.ResumeLayout(false);
+            this.menuStrip.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -225,16 +264,19 @@
         private ToolStripMenuItem автомобилиToolStripMenuItem;
         private DataGridView dataGridView;
         private Button buttonCreateOrder;
+        private Button buttonSetToWork;
+        private Button buttonSetToDone;
         private Button buttonSetToFinish;
         private Button buttonUpdate;
         private ToolStripMenuItem отчетыToolStripMenuItem;
         private ToolStripMenuItem списокАвтомобилейToolStripMenuItem;
         private ToolStripMenuItem компонентыПоАвтомобилямToolStripMenuItem;
         private ToolStripMenuItem списокЗаказовToolStripMenuItem;
-        private ToolStripMenuItem клиентыToolStripMenuItem;
-        private ToolStripMenuItem исполнителиToolStripMenuItem;
-        private ToolStripMenuItem запускРаботToolStripMenuItem;
-		private ToolStripMenuItem письмаToolStripMenuItem;
-		private ToolStripMenuItem создатьБэкапToolStripMenuItem;
-	}
+        private ToolStripMenuItem магазиныToolStripMenuItem;
+        private Button buttonSupplyShop;
+        private Button buttonSellCars;
+        private ToolStripMenuItem списокМагазиновToolStripMenuItem;
+        private ToolStripMenuItem автомобилиВМагазинахToolStripMenuItem;
+        private ToolStripMenuItem списокЗаказовПоДатеToolStripMenuItem;
+    }
 }

AutomobilePlant/AutomobilePlant/FormMain.cs

@@ -1,8 +1,8 @@
 using AutomobilePlantBusinessLogic.BusinessLogics;
 using AutomobilePlantContracts.BindingModels;
 using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.DI;
 using AutomobilePlantDataModels.Enums;
+using AutomobilePlant;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -21,17 +21,13 @@ namespace AutomobilePlant
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
         private readonly IReportLogic _reportLogic;
-        private readonly IWorkProcess _workProcess;
-		private readonly IBackUpLogic _backUpLogic;
-		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic, IWorkProcess workProcess, IBackUpLogic backUpLogic)
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
             _reportLogic = reportLogic;
-            _workProcess = workProcess;
-			_backUpLogic = backUpLogic;
-		}
+        }
 
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -43,8 +39,14 @@ namespace AutomobilePlant
             _logger.LogInformation("Загрузка заказов");
             try
             {
-				dataGridView.FillAndConfigGrid(_orderLogic.ReadList(null));
-				_logger.LogInformation("Загрузка заказов");
+                var list = _orderLogic.ReadList(null);
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["CarId"].Visible = false;
+
+                }
+                _logger.LogInformation("Загрузка заказов");
             }
             catch (Exception ex)
             {
@@ -55,39 +57,39 @@ namespace AutomobilePlant
 
         private void компонентыToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormComponents>();
-			form.ShowDialog();
-		}
+            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+            if (service is FormComponents form)
+            {
+                form.ShowDialog();
+            }
+        }
 
         private void автомобилиToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormCars>();
-			form.ShowDialog();
-		}
-
-        private void клиентыToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-			var form = DependencyManager.Instance.Resolve<FormClients>();
-			form.ShowDialog();
-		}
-
-        private void исполнителиToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-			var form = DependencyManager.Instance.Resolve<FormImplementers>();
-			form.ShowDialog();
-		}
+            var service = Program.ServiceProvider?.GetService(typeof(FormCars));
+            if (service is FormCars form)
+            {
+                form.ShowDialog();
+            }
+        }
 
         private void компонентыПоАвтомобилямToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormReportCarComponents>();
-			form.ShowDialog();
-		}
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportCarComponents));
+            if (service is FormReportCarComponents form)
+            {
+                form.ShowDialog();
+            }
+        }
 
         private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormReportOrder>();
-			form.ShowDialog();
-		}
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrder));
+            if (service is FormReportOrder form)
+            {
+                form.ShowDialog();
+            }
+        }
 
         private void списокАвтомобилейToolStripMenuItem_Click(object sender, EventArgs e)
         {
@@ -100,14 +102,111 @@ namespace AutomobilePlant
                 });
                 MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
+
+        }
+
+        private void списокМагазиновToolStripMenuItem_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 автомобилиВМагазинахToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportShopCars));
+            if (service is FormReportShopCars form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void списокЗаказовПоДатеToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportDateOrders));
+            if (service is FormReportDateOrders form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void магазиныToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShops));
+            if (service is FormShops form)
+            {
+                form.ShowDialog();
+            }
         }
 
         private void ButtonCreateOrder_Click(object sender, EventArgs e)
         {
-			var form = DependencyManager.Instance.Resolve<FormCreateOrder>();
-			form.ShowDialog();
-			LoadData();
-		}
+            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+            if (service is FormCreateOrder form)
+            {
+                form.ShowDialog();
+                LoadData();
+            }
+        }
+
+        private void ButtonSetToWork_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                _logger.LogInformation("Заказ №{id}. Меняется статус на 'В работе'", id);
+                try
+                {
+                    var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
+                    {
+                        Id = id
+                    });
+                    if (!operationResult)
+                    {
+                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                    }
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка передачи заказа в работу");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK,
+                    MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void ButtonSetToDone_Click(object sender, EventArgs e)
+        {
+            if (dataGridView.SelectedRows.Count == 1)
+            {
+                int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Готов'", id);
+                try
+                {
+                    var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
+                    {
+                        Id = id
+                    });
+                    if (!operationResult)
+                    {
+                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+                    }
+                    LoadData();
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка отметки о готовности заказа");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
 
         private void ButtonSetToFinish_Click(object sender, EventArgs e)
         {
@@ -141,39 +240,22 @@ namespace AutomobilePlant
             LoadData();
         }
 
-        private void запускРаботToolStripMenuItem_Click(object sender, EventArgs e)
+        private void buttonSupplyShop_Click(object sender, EventArgs e)
         {
-			_workProcess.DoWork(DependencyManager.Instance.Resolve<IImplementerLogic>(), _orderLogic);
-			MessageBox.Show("Процесс обработки запущен", "Сообщение", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            var service = Program.ServiceProvider?.GetService(typeof(FormShopSupply));
+            if (service is FormShopSupply form)
+            {
+                form.ShowDialog();
+            }
         }
 
-		private void письмаToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			var form = DependencyManager.Instance.Resolve<FormMails>();
-			form.ShowDialog();
-		}
-
-		private void создатьБэкапToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			try
-			{
-				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);
-			}
-		}
-	}
+        private void buttonSellCars_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShopSell));
+            if (service is FormShopSell form)
+            {
+                form.ShowDialog();
+            }
+        }
+    }
 }

AutomobilePlant/AutomobilePlant/FormMain.resx

@@ -60,7 +60,4 @@
   <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>60</value>
-  </metadata>
 </root>

AutomobilePlant/AutomobilePlant/FormReportDateOrders.Designer.cs

@@ -0,0 +1,85 @@
+namespace AutomobilePlant
+{
+    partial class FormReportDateOrders
+    {
+        /// <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.panel = new System.Windows.Forms.Panel();
+            this.buttonCreateToPdf = new System.Windows.Forms.Button();
+            this.buttonCreateReport = new System.Windows.Forms.Button();
+            this.panel.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel
+            // 
+            this.panel.Controls.Add(this.buttonCreateToPdf);
+            this.panel.Controls.Add(this.buttonCreateReport);
+            this.panel.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel.Location = new System.Drawing.Point(0, 0);
+            this.panel.Name = "panel";
+            this.panel.Size = new System.Drawing.Size(978, 69);
+            this.panel.TabIndex = 1;
+            // 
+            // buttonCreateToPdf
+            // 
+            this.buttonCreateToPdf.Location = new System.Drawing.Point(769, 39);
+            this.buttonCreateToPdf.Name = "buttonCreateToPdf";
+            this.buttonCreateToPdf.Size = new System.Drawing.Size(190, 27);
+            this.buttonCreateToPdf.TabIndex = 5;
+            this.buttonCreateToPdf.Text = "PDF";
+            this.buttonCreateToPdf.UseVisualStyleBackColor = true;
+            this.buttonCreateToPdf.Click += new System.EventHandler(this.buttonCreateToPdf_Click);
+            // 
+            // buttonCreateReport
+            // 
+            this.buttonCreateReport.Location = new System.Drawing.Point(554, 39);
+            this.buttonCreateReport.Name = "buttonCreateReport";
+            this.buttonCreateReport.Size = new System.Drawing.Size(190, 27);
+            this.buttonCreateReport.TabIndex = 4;
+            this.buttonCreateReport.Text = "Сформировать";
+            this.buttonCreateReport.UseVisualStyleBackColor = true;
+            this.buttonCreateReport.Click += new System.EventHandler(this.buttonCreateReport_Click);
+            // 
+            // FormReportDateOrders
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(978, 450);
+            this.Controls.Add(this.panel);
+            this.Name = "FormReportDateOrders";
+            this.Text = "Заказы по датам";
+            this.panel.ResumeLayout(false);
+            this.ResumeLayout(false);
+        }
+
+        #endregion
+
+        private Panel panel;
+        private Button buttonCreateToPdf;
+        private Button buttonCreateReport;
+    }
+}

AutomobilePlant/AutomobilePlant/FormReportDateOrders.cs

@@ -0,0 +1,79 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BusinessLogicContracts;
+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 AutomobilePlant
+{
+    public partial class FormReportDateOrders : Form
+    {
+        private readonly ReportViewer reportViewer;
+
+        private readonly ILogger _logger;
+
+        private readonly IReportLogic _logic;
+        public FormReportDateOrders(ILogger<FormReportDateOrders> logger, IReportLogic reportLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = reportLogic;
+            reportViewer = new ReportViewer
+            {
+                Dock = DockStyle.Fill
+            };
+            reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrdersByDate.rdlc", FileMode.Open));
+            Controls.Clear();
+            Controls.Add(reportViewer);
+            Controls.Add(panel);
+        }
+
+        private void buttonCreateReport_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                var dataSource = _logic.GetDateOrders();
+                var source = new ReportDataSource("DataSetOrders", 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 buttonCreateToPdf_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "pdf|*.pdf" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveDateOrdersToPdfFile(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);
+                }
+            }
+        }
+    }
+}

AutomobilePlant/AutomobilePlant/FormReportShopCars.Designer.cs

@@ -0,0 +1,106 @@
+namespace AutomobilePlant
+{
+    partial class FormReportShopCars
+    {
+        /// <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.buttonSaveToExcel = new System.Windows.Forms.Button();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.Shop = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Car = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.Count = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // buttonSaveToExcel
+            // 
+            this.buttonSaveToExcel.Location = new System.Drawing.Point(12, 8);
+            this.buttonSaveToExcel.Name = "buttonSaveToExcel";
+            this.buttonSaveToExcel.Size = new System.Drawing.Size(176, 29);
+            this.buttonSaveToExcel.TabIndex = 0;
+            this.buttonSaveToExcel.Text = "Сохранить в Excel";
+            this.buttonSaveToExcel.UseVisualStyleBackColor = true;
+            this.buttonSaveToExcel.Click += new System.EventHandler(this.buttonSaveToExcel_Click);
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.Shop,
+            this.Car,
+            this.Count});
+            this.dataGridView.Location = new System.Drawing.Point(12, 43);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(776, 395);
+            this.dataGridView.TabIndex = 1;
+            // 
+            // Shop
+            // 
+            this.Shop.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Shop.HeaderText = "Магазин";
+            this.Shop.MinimumWidth = 6;
+            this.Shop.Name = "Shop";
+            // 
+            // Car
+            // 
+            this.Car.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.Car.HeaderText = "Автомобиль";
+            this.Car.MinimumWidth = 6;
+            this.Car.Name = "Car";
+            // 
+            // Count
+            // 
+            this.Count.HeaderText = "Количество";
+            this.Count.MinimumWidth = 6;
+            this.Count.Name = "Count";
+            this.Count.Width = 125;
+            // 
+            // FormReportShopCars
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(800, 450);
+            this.Controls.Add(this.dataGridView);
+            this.Controls.Add(this.buttonSaveToExcel);
+            this.Name = "FormReportShopCars";
+            this.Text = "Автомобили в магазинах";
+            this.Load += new System.EventHandler(this.FormReportShopCars_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+        }
+
+        #endregion
+
+        private Button buttonSaveToExcel;
+        private DataGridView dataGridView;
+        private DataGridViewTextBoxColumn Shop;
+        private DataGridViewTextBoxColumn Car;
+        private DataGridViewTextBoxColumn Count;
+    }
+}

AutomobilePlant/AutomobilePlant/FormReportShopCars.cs

@@ -0,0 +1,84 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BusinessLogicContracts;
+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 AutomobilePlant
+{
+    public partial class FormReportShopCars : Form
+    {
+        private readonly ILogger _logger;
+        private readonly IReportLogic _logic;
+
+        public FormReportShopCars(ILogger<FormReportShopCars> logger, IReportLogic reportLogic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = reportLogic;
+        }
+
+        private void buttonSaveToExcel_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "xlsx|*.xlsx"
+            };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveShopCarsToExcelFile(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);
+                }
+            }
+        }
+
+        private void FormReportShopCars_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                var dict = _logic.GetShopCars();
+                if (dict != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in dict)
+                    {
+                        dataGridView.Rows.Add(new object[] { elem.ShopName, "", "" });
+                        foreach (var listElem in elem.Cars)
+                        {
+                            dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 });
+                        }
+                        dataGridView.Rows.Add(new object[] { "Всего:", "", elem.Count });
+                        dataGridView.Rows.Add(Array.Empty<object>());
+                    }
+                }
+                _logger.LogInformation("Загрузка списка магазинов с авто в них");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка магазинов с авто в них");
+
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}

AutomobilePlant/AutomobilePlant/FormShop.Designer.cs

@@ -0,0 +1,209 @@
+namespace AutomobilePlant
+{
+    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.textBoxAddress = new System.Windows.Forms.TextBox();
+            this.textBoxName = new System.Windows.Forms.TextBox();
+            this.labelAddress = new System.Windows.Forms.Label();
+            this.labelName = new System.Windows.Forms.Label();
+            this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.ColumnId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCarName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.ColumnCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.openingDateLabel = new System.Windows.Forms.Label();
+            this.openingDateTimePicker = new System.Windows.Forms.DateTimePicker();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.labelMaxCount = new System.Windows.Forms.Label();
+            this.textBoxMaxCountCars = new System.Windows.Forms.TextBox();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // textBoxAddress
+            // 
+            this.textBoxAddress.Location = new System.Drawing.Point(101, 45);
+            this.textBoxAddress.Name = "textBoxAddress";
+            this.textBoxAddress.Size = new System.Drawing.Size(315, 27);
+            this.textBoxAddress.TabIndex = 7;
+            // 
+            // textBoxName
+            // 
+            this.textBoxName.Location = new System.Drawing.Point(101, 12);
+            this.textBoxName.Name = "textBoxName";
+            this.textBoxName.Size = new System.Drawing.Size(315, 27);
+            this.textBoxName.TabIndex = 6;
+            // 
+            // labelAddress
+            // 
+            this.labelAddress.AutoSize = true;
+            this.labelAddress.Location = new System.Drawing.Point(14, 51);
+            this.labelAddress.Name = "labelAddress";
+            this.labelAddress.Size = new System.Drawing.Size(54, 20);
+            this.labelAddress.TabIndex = 5;
+            this.labelAddress.Text = "Адрес:";
+            // 
+            // labelName
+            // 
+            this.labelName.AutoSize = true;
+            this.labelName.Location = new System.Drawing.Point(14, 15);
+            this.labelName.Name = "labelName";
+            this.labelName.Size = new System.Drawing.Size(80, 20);
+            this.labelName.TabIndex = 4;
+            this.labelName.Text = "Название:";
+            // 
+            // dataGridView
+            // 
+            this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.ColumnId,
+            this.ColumnCarName,
+            this.ColumnCount});
+            this.dataGridView.Location = new System.Drawing.Point(14, 173);
+            this.dataGridView.Name = "dataGridView";
+            this.dataGridView.RowHeadersWidth = 51;
+            this.dataGridView.RowTemplate.Height = 29;
+            this.dataGridView.Size = new System.Drawing.Size(401, 265);
+            this.dataGridView.TabIndex = 10;
+            // 
+            // ColumnId
+            // 
+            this.ColumnId.HeaderText = "ID";
+            this.ColumnId.MinimumWidth = 6;
+            this.ColumnId.Name = "ColumnId";
+            this.ColumnId.Visible = false;
+            this.ColumnId.Width = 125;
+            // 
+            // ColumnCarName
+            // 
+            this.ColumnCarName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColumnCarName.HeaderText = "Автомобиль";
+            this.ColumnCarName.MinimumWidth = 6;
+            this.ColumnCarName.Name = "ColumnCarName";
+            // 
+            // ColumnCount
+            // 
+            this.ColumnCount.HeaderText = "Количество";
+            this.ColumnCount.MinimumWidth = 6;
+            this.ColumnCount.Name = "ColumnCount";
+            this.ColumnCount.Width = 125;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(229, 436);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(155, 41);
+            this.buttonCancel.TabIndex = 12;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(48, 436);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(155, 41);
+            this.buttonSave.TabIndex = 11;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+            // 
+            // openingDateLabel
+            // 
+            this.openingDateLabel.AutoSize = true;
+            this.openingDateLabel.Location = new System.Drawing.Point(14, 83);
+            this.openingDateLabel.Name = "openingDateLabel";
+            this.openingDateLabel.Size = new System.Drawing.Size(121, 20);
+            this.openingDateLabel.TabIndex = 13;
+            this.openingDateLabel.Text = "Дата открытия";
+            // 
+            // openingDateTimePicker
+            // 
+            this.openingDateTimePicker.Location = new System.Drawing.Point(141, 78);
+            this.openingDateTimePicker.Name = "openingDateTimePicker";
+            this.openingDateTimePicker.Size = new System.Drawing.Size(274, 27);
+            this.openingDateTimePicker.TabIndex = 14;
+            // 
+            // labelMaxCount
+            // 
+            this.labelMaxCount.AutoSize = true;
+            this.labelMaxCount.Location = new System.Drawing.Point(18, 128);
+            this.labelMaxCount.Name = "labelMaxCount";
+            this.labelMaxCount.Size = new System.Drawing.Size(216, 20);
+            this.labelMaxCount.TabIndex = 13;
+            this.labelMaxCount.Text = "Макс. количество авто";
+            // 
+            // textBoxMaxCountCars
+            // 
+            this.textBoxMaxCountCars.Location = new System.Drawing.Point(240, 128);
+            this.textBoxMaxCountCars.Name = "textBoxMaxCountCars";
+            this.textBoxMaxCountCars.Size = new System.Drawing.Size(175, 27);
+            this.textBoxMaxCountCars.TabIndex = 14;
+            // FormShop
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(445, 489);
+            this.Controls.Add(this.textBoxMaxCountCars);
+            this.Controls.Add(this.labelMaxCount);
+            this.Controls.Add(this.openingDateTimePicker);
+            this.Controls.Add(this.openingDateLabel);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.dataGridView);
+            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);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).EndInit();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private TextBox textBoxAddress;
+        private TextBox textBoxName;
+        private Label labelAddress;
+        private Label labelName;
+        private DataGridView dataGridView;
+        private Button buttonCancel;
+        private Button buttonSave;
+        private DataGridViewTextBoxColumn ColumnId;
+        private DataGridViewTextBoxColumn ColumnCarName;
+        private DataGridViewTextBoxColumn ColumnCount;
+        private Label openingDateLabel;
+        private DateTimePicker openingDateTimePicker;
+        private Label labelMaxCount;
+        private TextBox textBoxMaxCountCars;
+    }
+}

AutomobilePlant/AutomobilePlant/FormShop.cs

@@ -0,0 +1,142 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BusinessLogicContracts;
+using AutomobilePlantContracts.SearchModels;
+using AutomobilePlantDataModels.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 AutomobilePlant
+{
+    public partial class FormShop : Form
+    {
+        private readonly IShopLogic _logic;
+        private readonly ILogger _logger;
+        private Dictionary<int, (ICarModel, int)> _shopCars;
+        private int? _id;
+        public int Id { set { _id = value; } }
+
+        public FormShop(ILogger<FormShop> logger, IShopLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            _shopCars = new();
+        }
+
+        private void FormShop_Load(object sender, EventArgs e)
+        {
+            if (_id.HasValue)
+            {
+                _logger.LogInformation("Loading shop");
+
+                try
+                {
+                    var view = _logic.ReadElement(new ShopSearchModel { Id = _id.Value });
+
+                    if (view != null)
+                    {
+                        textBoxName.Text = view.Name;
+                        textBoxAddress.Text = view.Address;
+                        openingDateTimePicker.Value = view.OpeningDate;
+                        _shopCars = view.ShopCars ?? new Dictionary<int, (ICarModel, int)>();
+                        textBoxMaxCountCars.Text = view.MaxCountCars.ToString();
+                        LoadData();
+                    }
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка загрузки магазина");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
+        }
+
+        private void LoadData()
+        {
+            _logger.LogInformation("Загрузка авто магазина");
+
+            try
+            {
+                if (_shopCars != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var car in _shopCars)
+                    {
+                        dataGridView.Rows.Add(new object[] { car.Key, car.Value.Item1.CarName, car.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;
+            }
+
+            if (string.IsNullOrEmpty(textBoxMaxCountCars.Text))
+            {
+                MessageBox.Show("Заполните макс. количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
+            _logger.LogInformation("Сохранение магазина");
+
+            try
+            {
+                var model = new ShopBindingModel
+                {
+                    Id = _id ?? 0,
+                    Name = textBoxName.Text,
+                    Address = textBoxAddress.Text,
+                    OpeningDate = openingDateTimePicker.Value.Date,
+                    MaxCountCars = Convert.ToInt32(textBoxMaxCountCars.Text),
+                    ShopCars = _shopCars
+                };
+
+                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();
+        }
+    }
+}

AutomobilePlant/AutomobilePlant/FormShop.resx

@@ -0,0 +1,60 @@
+<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>

AutomobilePlant/AutomobilePlant/FormShopSell.Designer.cs

@@ -0,0 +1,119 @@
+namespace AutomobilePlant
+{
+    partial class FormShopSell
+    {
+        /// <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.labelCount = new System.Windows.Forms.Label();
+            this.labelCar = new System.Windows.Forms.Label();
+            this.comboBoxCar = new System.Windows.Forms.ComboBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.buttonSell = new System.Windows.Forms.Button();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // labelCount
+            // 
+            this.labelCount.AutoSize = true;
+            this.labelCount.Location = new System.Drawing.Point(23, 76);
+            this.labelCount.Name = "labelCount";
+            this.labelCount.Size = new System.Drawing.Size(93, 20);
+            this.labelCount.TabIndex = 1;
+            this.labelCount.Text = "Количество:";
+            // 
+            // labelCar
+            // 
+            this.labelCar.AutoSize = true;
+            this.labelCar.Location = new System.Drawing.Point(23, 24);
+            this.labelCar.Name = "labelCar";
+            this.labelCar.Size = new System.Drawing.Size(79, 20);
+            this.labelCar.TabIndex = 2;
+            this.labelCar.Text = "Автомобиль:";
+            // 
+            // comboBoxCar
+            // 
+            this.comboBoxCar.FormattingEnabled = true;
+            this.comboBoxCar.Location = new System.Drawing.Point(124, 24);
+            this.comboBoxCar.Name = "comboBoxCar";
+            this.comboBoxCar.Size = new System.Drawing.Size(278, 28);
+            this.comboBoxCar.TabIndex = 4;
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(124, 73);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(158, 27);
+            this.textBoxCount.TabIndex = 5;
+            // 
+            // buttonSell
+            // 
+            this.buttonSell.Location = new System.Drawing.Point(188, 142);
+            this.buttonSell.Name = "buttonSell";
+            this.buttonSell.Size = new System.Drawing.Size(94, 29);
+            this.buttonSell.TabIndex = 6;
+            this.buttonSell.Text = "Продажа";
+            this.buttonSell.UseVisualStyleBackColor = true;
+            this.buttonSell.Click += new System.EventHandler(this.buttonSell_Click);
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(308, 142);
+            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);
+            // 
+            // FormShopSell
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(459, 198);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSell);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.comboBoxCar);
+            this.Controls.Add(this.labelCar);
+            this.Controls.Add(this.labelCount);
+            this.Name = "FormShopSell";
+            this.Text = "Продажа из магазина";
+            this.Load += new System.EventHandler(this.FormShopSell_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+        private Label labelCount;
+        private Label labelCar;
+        private ComboBox comboBoxCar;
+        private TextBox textBoxCount;
+        private Button buttonSell;
+        private Button buttonCancel;
+    }
+}

AutomobilePlant/AutomobilePlant/FormShopSell.cs

@@ -0,0 +1,95 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BusinessLogicContracts;
+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 AutomobilePlant
+{
+    public partial class FormShopSell : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ICarLogic _logicCar;
+        private readonly IShopLogic _logicShop;
+
+        public FormShopSell(ILogger<FormShopSell> logger, ICarLogic logicCar, IShopLogic logicShop)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicCar = logicCar;
+            _logicShop = logicShop;
+        }
+
+        private void FormShopSell_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Загрузка авто для продажи");
+            try
+            {
+                var list = _logicCar.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxCar.DisplayMember = "CarName";
+                    comboBoxCar.ValueMember = "Id";
+                    comboBoxCar.DataSource = list;
+                    comboBoxCar.SelectedItem = null;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка авто");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        private void buttonSell_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(textBoxCount.Text))
+            {
+                MessageBox.Show("Заполните поле Количество", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            if (comboBoxCar.SelectedValue == null)
+            {
+                MessageBox.Show("Выберите авто", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            _logger.LogInformation("Создание продажи");
+            try
+            {
+                var operationResult = _logicShop.SellCar(
+                    new CarBindingModel
+                    {
+                        Id = Convert.ToInt32(comboBoxCar.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();
+        }
+    }
+}

AutomobilePlant/AutomobilePlant/FormShopSupply.Designer.cs

@@ -0,0 +1,149 @@
+namespace AutomobilePlant
+{
+    partial class FormShopSupply
+    {
+        /// <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.labelShop = new System.Windows.Forms.Label();
+            this.labelCar = new System.Windows.Forms.Label();
+            this.labelCarCount = new System.Windows.Forms.Label();
+            this.comboBoxShop = new System.Windows.Forms.ComboBox();
+            this.comboBoxCar = new System.Windows.Forms.ComboBox();
+            this.textBoxCount = new System.Windows.Forms.TextBox();
+            this.buttonCancel = new System.Windows.Forms.Button();
+            this.buttonSave = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // labelShop
+            // 
+            this.labelShop.AutoSize = true;
+            this.labelShop.Location = new System.Drawing.Point(23, 14);
+            this.labelShop.Name = "labelShop";
+            this.labelShop.RightToLeft = System.Windows.Forms.RightToLeft.No;
+            this.labelShop.Size = new System.Drawing.Size(57, 15);
+            this.labelShop.TabIndex = 0;
+            this.labelShop.Text = "Магазин:";
+            // 
+            // labelCar
+            // 
+            this.labelCar.AutoSize = true;
+            this.labelCar.Location = new System.Drawing.Point(23, 54);
+            this.labelCar.Name = "labelCar";
+            this.labelCar.Size = new System.Drawing.Size(40, 15);
+            this.labelCar.TabIndex = 1;
+            this.labelCar.Text = "Автомобиль:";
+            // 
+            // labelCarCount
+            // 
+            this.labelCarCount.AutoSize = true;
+            this.labelCarCount.Location = new System.Drawing.Point(23, 92);
+            this.labelCarCount.Name = "labelCarCount";
+            this.labelCarCount.Size = new System.Drawing.Size(75, 15);
+            this.labelCarCount.TabIndex = 2;
+            this.labelCarCount.Text = "Количество:";
+            // 
+            // comboBoxShop
+            // 
+            this.comboBoxShop.FormattingEnabled = true;
+            this.comboBoxShop.Location = new System.Drawing.Point(130, 14);
+            this.comboBoxShop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxShop.Name = "comboBoxShop";
+            this.comboBoxShop.Size = new System.Drawing.Size(220, 23);
+            this.comboBoxShop.TabIndex = 3;
+            // 
+            // comboBoxCar
+            // 
+            this.comboBoxCar.FormattingEnabled = true;
+            this.comboBoxCar.Location = new System.Drawing.Point(130, 52);
+            this.comboBoxCar.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.comboBoxCar.Name = "comboBoxCar";
+            this.comboBoxCar.Size = new System.Drawing.Size(220, 23);
+            this.comboBoxCar.TabIndex = 4;
+            // 
+            // textBoxCount
+            // 
+            this.textBoxCount.Location = new System.Drawing.Point(130, 89);
+            this.textBoxCount.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.textBoxCount.Name = "textBoxCount";
+            this.textBoxCount.Size = new System.Drawing.Size(110, 23);
+            this.textBoxCount.TabIndex = 5;
+            // 
+            // buttonCancel
+            // 
+            this.buttonCancel.Location = new System.Drawing.Point(288, 137);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonCancel.Name = "buttonCancel";
+            this.buttonCancel.Size = new System.Drawing.Size(82, 34);
+            this.buttonCancel.TabIndex = 9;
+            this.buttonCancel.Text = "Отмена";
+            this.buttonCancel.UseVisualStyleBackColor = true;
+            this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
+            // 
+            // buttonSave
+            // 
+            this.buttonSave.Location = new System.Drawing.Point(200, 137);
+            this.buttonSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonSave.Name = "buttonSave";
+            this.buttonSave.Size = new System.Drawing.Size(82, 34);
+            this.buttonSave.TabIndex = 8;
+            this.buttonSave.Text = "Сохранить";
+            this.buttonSave.UseVisualStyleBackColor = true;
+            this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click);
+            // 
+            // FormShopSupply
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(382, 182);
+            this.Controls.Add(this.buttonCancel);
+            this.Controls.Add(this.buttonSave);
+            this.Controls.Add(this.textBoxCount);
+            this.Controls.Add(this.comboBoxCar);
+            this.Controls.Add(this.comboBoxShop);
+            this.Controls.Add(this.labelCarCount);
+            this.Controls.Add(this.labelCar);
+            this.Controls.Add(this.labelShop);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.Name = "FormShopSupply";
+            this.Text = "Пополнение магазина";
+            this.Load += new System.EventHandler(this.FormShopSupply_Load);
+            this.ResumeLayout(false);
+            this.PerformLayout();
+        }
+
+        #endregion
+
+        private Label labelShop;
+        private Label labelCar;
+        private Label labelCarCount;
+        private ComboBox comboBoxShop;
+        private ComboBox comboBoxCar;
+        private TextBox textBoxCount;
+        private Button buttonCancel;
+        private Button buttonSave;
+    }
+}

AutomobilePlant/AutomobilePlant/FormShopSupply.cs

@@ -0,0 +1,126 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BusinessLogicContracts;
+using AutomobilePlantContracts.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 AutomobilePlant
+{
+    public partial class FormShopSupply : Form
+    {
+        private readonly ILogger _logger;
+        private readonly ICarLogic _logicCar;
+        private readonly IShopLogic _logicShop;
+
+        public FormShopSupply(ILogger<FormShopSupply> logger, ICarLogic logicCar, IShopLogic logicShop)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logicCar = logicCar;
+            _logicShop = logicShop;
+        }
+
+        private void FormShopSupply_Load(object sender, EventArgs e)
+        {
+            _logger.LogInformation("Загрузка авто для пополнения");
+
+            try
+            {
+                var list = _logicCar.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxCar.DisplayMember = "CarName";
+                    comboBoxCar.ValueMember = "Id";
+                    comboBoxCar.DataSource = list;
+                    comboBoxCar.SelectedItem = null;
+                }
+
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка авто");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+
+            _logger.LogInformation("Загрузка магазинов для пополнения");
+
+            try
+            {
+                var list = _logicShop.ReadList(null);
+                if (list != null)
+                {
+                    comboBoxShop.DisplayMember = "Name";
+                    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 (comboBoxCar.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 = _logicShop.SupplyCars(
+                    new ShopSearchModel { Id = Convert.ToInt32(comboBoxShop.SelectedValue), Name = comboBoxShop.Text },
+                    new CarBindingModel { Id = Convert.ToInt32(comboBoxCar.SelectedValue), CarName = comboBoxCar.Text },
+                    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();
+        }
+    }
+}

AutomobilePlant/AutomobilePlant/FormShops.Designer.cs

@@ -1,6 +1,6 @@
 namespace AutomobilePlant
 {
-    partial class FormImplementers
+    partial class FormShops
     {
         /// <summary>
         /// Required designer variable.
@@ -28,87 +28,93 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.buttonCreate = new System.Windows.Forms.Button();
-            this.buttonEdit = new System.Windows.Forms.Button();
-            this.buttonDelete = new System.Windows.Forms.Button();
-            this.buttonRefresh = new System.Windows.Forms.Button();
             this.dataGridView = new System.Windows.Forms.DataGridView();
+            this.buttonUpdate = new System.Windows.Forms.Button();
+            this.buttonDelete = new System.Windows.Forms.Button();
+            this.buttonEdit = new System.Windows.Forms.Button();
+            this.buttonAdd = new System.Windows.Forms.Button();
             ((System.ComponentModel.ISupportInitialize)(this.dataGridView)).BeginInit();
             this.SuspendLayout();
             // 
-            // buttonCreate
-            // 
-            this.buttonCreate.Location = new System.Drawing.Point(667, 12);
-            this.buttonCreate.Name = "buttonCreate";
-            this.buttonCreate.Size = new System.Drawing.Size(121, 29);
-            this.buttonCreate.TabIndex = 0;
-            this.buttonCreate.Text = "Добавить";
-            this.buttonCreate.UseVisualStyleBackColor = true;
-            this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click);
-            // 
-            // buttonEdit
-            // 
-            this.buttonEdit.Location = new System.Drawing.Point(667, 47);
-            this.buttonEdit.Name = "buttonEdit";
-            this.buttonEdit.Size = new System.Drawing.Size(121, 29);
-            this.buttonEdit.TabIndex = 1;
-            this.buttonEdit.Text = "Изменить";
-            this.buttonEdit.UseVisualStyleBackColor = true;
-            this.buttonEdit.Click += new System.EventHandler(this.buttonEdit_Click);
-            // 
-            // buttonDelete
-            // 
-            this.buttonDelete.Location = new System.Drawing.Point(667, 82);
-            this.buttonDelete.Name = "buttonDelete";
-            this.buttonDelete.Size = new System.Drawing.Size(121, 29);
-            this.buttonDelete.TabIndex = 2;
-            this.buttonDelete.Text = "Удалить";
-            this.buttonDelete.UseVisualStyleBackColor = true;
-            this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
-            // 
-            // buttonRefresh
-            // 
-            this.buttonRefresh.Location = new System.Drawing.Point(667, 117);
-            this.buttonRefresh.Name = "buttonRefresh";
-            this.buttonRefresh.Size = new System.Drawing.Size(121, 29);
-            this.buttonRefresh.TabIndex = 3;
-            this.buttonRefresh.Text = "Обновить";
-            this.buttonRefresh.UseVisualStyleBackColor = true;
-            this.buttonRefresh.Click += new System.EventHandler(this.buttonRefresh_Click);
-            // 
             // dataGridView
             // 
             this.dataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView.Location = new System.Drawing.Point(12, 12);
+            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(649, 426);
-            this.dataGridView.TabIndex = 4;
+            this.dataGridView.Size = new System.Drawing.Size(491, 320);
+            this.dataGridView.TabIndex = 0;
             // 
-            // FormImplementers
+            // buttonUpdate
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
+            this.buttonUpdate.Location = new System.Drawing.Point(549, 294);
+            this.buttonUpdate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonUpdate.Name = "buttonUpdate";
+            this.buttonUpdate.Size = new System.Drawing.Size(133, 33);
+            this.buttonUpdate.TabIndex = 9;
+            this.buttonUpdate.Text = "Обновить";
+            this.buttonUpdate.UseVisualStyleBackColor = true;
+            this.buttonUpdate.Click += new System.EventHandler(this.buttonUpdate_Click);
+            // 
+            // buttonDelete
+            // 
+            this.buttonDelete.Location = new System.Drawing.Point(549, 83);
+            this.buttonDelete.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonDelete.Name = "buttonDelete";
+            this.buttonDelete.Size = new System.Drawing.Size(133, 33);
+            this.buttonDelete.TabIndex = 8;
+            this.buttonDelete.Text = "Удалить";
+            this.buttonDelete.UseVisualStyleBackColor = true;
+            this.buttonDelete.Click += new System.EventHandler(this.buttonDelete_Click);
+            // 
+            // buttonEdit
+            // 
+            this.buttonEdit.Location = new System.Drawing.Point(549, 46);
+            this.buttonEdit.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonEdit.Name = "buttonEdit";
+            this.buttonEdit.Size = new System.Drawing.Size(133, 33);
+            this.buttonEdit.TabIndex = 7;
+            this.buttonEdit.Text = "Изменить";
+            this.buttonEdit.UseVisualStyleBackColor = true;
+            this.buttonEdit.Click += new System.EventHandler(this.buttonEdit_Click);
+            // 
+            // buttonAdd
+            // 
+            this.buttonAdd.Location = new System.Drawing.Point(549, 9);
+            this.buttonAdd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.buttonAdd.Name = "buttonAdd";
+            this.buttonAdd.Size = new System.Drawing.Size(133, 33);
+            this.buttonAdd.TabIndex = 6;
+            this.buttonAdd.Text = "Добавить";
+            this.buttonAdd.UseVisualStyleBackColor = true;
+            this.buttonAdd.Click += new System.EventHandler(this.buttonAdd_Click);
+            // 
+            // FormShops
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(800, 450);
-            this.Controls.Add(this.dataGridView);
-            this.Controls.Add(this.buttonRefresh);
+            this.ClientSize = new System.Drawing.Size(700, 338);
+            this.Controls.Add(this.buttonUpdate);
             this.Controls.Add(this.buttonDelete);
             this.Controls.Add(this.buttonEdit);
-            this.Controls.Add(this.buttonCreate);
-            this.Name = "FormImplementers";
-            this.Text = "Исполнители";
-            this.Load += new System.EventHandler(this.FormImplementers_Load);
+            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 Button buttonCreate;
-        private Button buttonEdit;
-        private Button buttonDelete;
-        private Button buttonRefresh;
         private DataGridView dataGridView;
+        private Button buttonUpdate;
+        private Button buttonDelete;
+        private Button buttonEdit;
+        private Button buttonAdd;
     }
 }

AutomobilePlant/AutomobilePlant/FormShops.cs

@@ -1,6 +1,5 @@
 using AutomobilePlantContracts.BindingModels;
 using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.DI;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -14,41 +13,62 @@ using System.Windows.Forms;
 
 namespace AutomobilePlant
 {
-    public partial class FormImplementers : Form
+    public partial class FormShops : Form
     {
         private readonly ILogger _logger;
-        private readonly IImplementerLogic _logic;
-        public FormImplementers(ILogger<FormImplementers> logger, IImplementerLogic logic)
+        private readonly IShopLogic _logic;
+
+        public FormShops(ILogger<FormShops> logger, IShopLogic logic)
         {
             InitializeComponent();
             _logger = logger;
             _logic = logic;
         }
 
-        private void FormImplementers_Load(object sender, EventArgs e)
+        private void FormShops_Load(object sender, EventArgs e)
         {
             LoadData();
         }
+
         private void LoadData()
         {
             try
             {
-				dataGridView.FillAndConfigGrid(_logic.ReadList(null));
-				_logger.LogInformation("Загрузка исполнителей");
+                var list = _logic.ReadList(null);
+
+                if (list != null)
+                {
+                    dataGridView.DataSource = list;
+                    dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["Name"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+                    dataGridView.Columns["ShopCars"].Visible = false;
+                }
+
+                _logger.LogInformation("Загрузка магазинов");
+
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки исполнителей");
+                _logger.LogError(ex, "Ошибка загрузки магазинов");
                 MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
-        private void buttonCreate_Click(object sender, EventArgs e)
+        private void buttonUpdate_Click(object sender, EventArgs e)
         {
-            var form = DependencyManager.Instance.Resolve<FormImplementer>();
-            if (form.ShowDialog() == DialogResult.OK)
+            LoadData();
+        }
+
+        private void buttonAdd_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+
+            if (service is FormShop form)
             {
-                LoadData();
+                if (form.ShowDialog() == DialogResult.OK)
+                {
+                    LoadData();
+                }
             }
         }
 
@@ -56,11 +76,16 @@ namespace AutomobilePlant
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                var form = DependencyManager.Instance.Resolve<FormImplementer>();
-                form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                if (form.ShowDialog() == DialogResult.OK)
+                var service = Program.ServiceProvider?.GetService(typeof(FormShop));
+
+                if (service is FormShop form)
                 {
-                    LoadData();
+                    form.Id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+
+                    if (form.ShowDialog() == DialogResult.OK)
+                    {
+                        LoadData();
+                    }
                 }
             }
         }
@@ -69,34 +94,27 @@ namespace AutomobilePlant
         {
             if (dataGridView.SelectedRows.Count == 1)
             {
-                if (MessageBox.Show("Удалить запись?", "Вопрос", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                if (MessageBox.Show("Удалить магазин?", "Подтверждение", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
                 {
-                    int id =
-                    Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                    _logger.LogInformation("Удаление исполнителя");
+                    int id = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+                    _logger.LogInformation("Удаление магазина");
+
                     try
                     {
-                        if (!_logic.Delete(new ImplementerBindingModel
-                        {
-                            Id = id
-                        }))
+                        if (!_logic.Delete(new ShopBindingModel { Id = id }))
                         {
                             throw new Exception("Ошибка при удалении. Дополнительная информация в логах.");
                         }
+
                         LoadData();
                     }
                     catch (Exception ex)
                     {
-                        _logger.LogError(ex, "Ошибка удаления исполнителя");
+                        _logger.LogError(ex, "Ошибка удаления магазина");
                         MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                     }
                 }
             }
         }
-
-        private void buttonRefresh_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
     }
 }

AutomobilePlant/AutomobilePlant/FormShops.resx

@@ -0,0 +1,120 @@
+<?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>

AutomobilePlant/AutomobilePlant/Program.cs

@@ -1,10 +1,7 @@
 using AutomobilePlantBusinessLogic.BusinessLogics;
-using AutomobilePlantBusinessLogic.MailWorker;
 using AutomobilePlantBusinessLogic.OfficePackage;
 using AutomobilePlantBusinessLogic.OfficePackage.Implements;
-using AutomobilePlantContracts.BindingModels;
 using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.DI;
 using AutomobilePlantContracts.StorageContracts;
 using AutomobilePlantDatabaseImplement.Implements;
 using Microsoft.Extensions.DependencyInjection;
@@ -15,76 +12,55 @@ namespace AutomobilePlant
 {
     internal static class Program
     {
+        private static ServiceProvider? _serviceProvider;
+        public static ServiceProvider? ServiceProvider => _serviceProvider;
+
         [STAThread]
         static void Main()
         {
             ApplicationConfiguration.Initialize();
-			InitDependency();
+            var services = new ServiceCollection();
+            ConfigureServices(services);
+            _serviceProvider = services.BuildServiceProvider();
 
-			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(_serviceProvider.GetRequiredService<FormMain>());
+        }
+        private static void ConfigureServices(ServiceCollection services)
+        {
+            services.AddLogging(option =>
+            {
+                option.SetMinimumLevel(LogLevel.Information);
+                option.AddNLog("nlog.config");
+            });
+            services.AddTransient<IComponentStorage, ComponentStorage>();
+            services.AddTransient<IOrderStorage, OrderStorage>();
+            services.AddTransient<ICarStorage, CarStorage>();
+            services.AddTransient<IShopStorage, ShopStorage>();
+            services.AddTransient<IComponentLogic, ComponentLogic>();
+            services.AddTransient<IOrderLogic, OrderLogic>();
+            services.AddTransient<ICarLogic, CarLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
 
-			Application.Run(DependencyManager.Instance.Resolve<FormMain>());
-		}
-		private static void MailCheck(object obj) => DependencyManager.Instance.Resolve<AbstractMailWorker>()?.MailCheck();
+            services.AddTransient<IShopLogic, ShopLogic>();
+            services.AddTransient<AbstractSaveToWord, SaveToWord>();
+            services.AddTransient<AbstractSaveToExcel, SaveToExcel>();
+            services.AddTransient<AbstractSaveToPdf, SaveToPdf>();
 
-		private static void InitDependency()
-		{
-			DependencyManager.InitDependency();
-
-			DependencyManager.Instance.AddLogging(option =>
-			{
-				option.SetMinimumLevel(LogLevel.Information);
-				option.AddNLog("nlog.config");
-			});
-
-			DependencyManager.Instance.RegisterType<IComponentLogic, ComponentLogic>();
-			DependencyManager.Instance.RegisterType<IOrderLogic, OrderLogic>();
-			DependencyManager.Instance.RegisterType<ICarLogic, CarLogic>();
-			DependencyManager.Instance.RegisterType<IReportLogic, ReportLogic>();
-			DependencyManager.Instance.RegisterType<IClientLogic, ClientLogic>();
-			DependencyManager.Instance.RegisterType<IImplementerLogic, ImplementerLogic>();
-			DependencyManager.Instance.RegisterType<IWorkProcess, WorkModeling>();
-			DependencyManager.Instance.RegisterType<IMessageInfoLogic, MessageInfoLogic>();
-			DependencyManager.Instance.RegisterType<IBackUpLogic, BackUpLogic>();
-
-			DependencyManager.Instance.RegisterType<AbstractSaveToWord, SaveToWord>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToExcel, SaveToExcel>();
-			DependencyManager.Instance.RegisterType<AbstractSaveToPdf, SaveToPdf>();
-
-			DependencyManager.Instance.RegisterType<AbstractMailWorker, MailKitWorker>(isSingle: true);
-
-			DependencyManager.Instance.RegisterType<FormMain>();
-			DependencyManager.Instance.RegisterType<FormComponent>();
-			DependencyManager.Instance.RegisterType<FormComponents>();
-			DependencyManager.Instance.RegisterType<FormCreateOrder>();
-			DependencyManager.Instance.RegisterType<FormCar>();
-			DependencyManager.Instance.RegisterType<FormCarComponent>();
-			DependencyManager.Instance.RegisterType<FormCars>();
-			DependencyManager.Instance.RegisterType<FormReportCarComponents>();
-			DependencyManager.Instance.RegisterType<FormReportOrder>();
-			DependencyManager.Instance.RegisterType<FormClients>();
-			DependencyManager.Instance.RegisterType<FormImplementers>();
-			DependencyManager.Instance.RegisterType<FormImplementer>();
-			DependencyManager.Instance.RegisterType<FormMails>();
-		}
-	}
+            services.AddTransient<FormMain>();
+            services.AddTransient<FormComponent>();
+            services.AddTransient<FormComponents>();
+            services.AddTransient<FormCreateOrder>();
+            services.AddTransient<FormCar>();
+            services.AddTransient<FormCarComponent>();
+            services.AddTransient<FormCars>();
+            services.AddTransient<FormShop>();
+            services.AddTransient<FormShops>();
+            services.AddTransient<FormShopSupply>();
+            services.AddTransient<FormShopSell>();
+            services.AddTransient<FormReportCarComponents>();
+            services.AddTransient<FormReportOrder>();
+            services.AddTransient<FormReportShopCars>();
+            services.AddTransient<FormReportDateOrders>();
+        }
+    }
 }

AutomobilePlant/AutomobilePlant/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "AutomobilePlant": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:53383;http://localhost:53391"
-    }
-  }
-}

AutomobilePlant/AutomobilePlant/ReportOrdersByDate.rdlc

@@ -0,0 +1,424 @@
+<?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="AutomobilePlantContractsViewModels">
+      <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="DataSetOrders">
+      <Query>
+        <DataSourceName>AutomobilePlantContractsViewModels</DataSourceName>
+        <CommandText>/* Local Query */</CommandText>
+      </Query>
+      <Fields>
+        <Field Name="DateCreate">
+          <DataField>DateCreate</DataField>
+          <rd:TypeName>System.DateTime</rd:TypeName>
+        </Field>
+        <Field Name="CountOrders">
+          <DataField>CountOrders</DataField>
+          <rd:TypeName>System.Decimal</rd:TypeName>
+        </Field>
+        <Field Name="SumOrders">
+          <DataField>SumOrders</DataField>
+          <rd:TypeName>System.Double</rd:TypeName>
+        </Field>
+      </Fields>
+      <rd:DataSetInfo>
+        <rd:DataSetName>AutomobilePlantContracts.ViewModels</rd:DataSetName>
+        <rd:TableName>ReportDateOrdersViewModel</rd:TableName>
+        <rd:ObjectDataSourceType>AutomobilePlantContracts.ViewModels.ReportDateOrdersViewModel, AutomobilePlantContracts, 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>21cm</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>3cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>3cm</Width>
+                </TablixColumn>
+                <TablixColumn>
+                  <Width>7cm</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="CountOrders">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!CountOrders.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>CountOrders</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="SumOrders">
+                          <CanGrow>true</CanGrow>
+                          <KeepTogether>true</KeepTogether>
+                          <Paragraphs>
+                            <Paragraph>
+                              <TextRuns>
+                                <TextRun>
+                                  <Value>=Fields!SumOrders.Value</Value>
+                                  <Style />
+                                </TextRun>
+                              </TextRuns>
+                              <Style />
+                            </Paragraph>
+                          </Paragraphs>
+                          <rd:DefaultName>SumOrders</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>DataSetOrders</DataSetName>
+            <Top>2.48391cm</Top>
+            <Left>0.55245cm</Left>
+            <Height>1.2cm</Height>
+            <Width>13cm</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>8.55245cm</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!SumOrders.Value, "DataSetOrders")</Value>
+                    <Style>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                </TextRuns>
+                <Style>
+                  <TextAlign>Right</TextAlign>
+                </Style>
+              </Paragraph>
+            </Paragraphs>
+            <Top>4cm</Top>
+            <Left>11.05245cm</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.72875cm</Height>
+        <Style />
+      </Body>
+      <Width>21cm</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>
+  <ReportParameters>
+    <ReportParameter Name="ReportParameterPeriod">
+      <DataType>String</DataType>
+      <Nullable>true</Nullable>
+      <Prompt>ReportParameter1</Prompt>
+    </ReportParameter>
+  </ReportParameters>
+  <ReportParametersLayout>
+    <GridLayoutDefinition>
+      <NumberOfColumns>4</NumberOfColumns>
+      <NumberOfRows>2</NumberOfRows>
+      <CellDefinitions>
+        <CellDefinition>
+          <ColumnIndex>0</ColumnIndex>
+          <RowIndex>0</RowIndex>
+          <ParameterName>ReportParameterPeriod</ParameterName>
+        </CellDefinition>
+      </CellDefinitions>
+    </GridLayoutDefinition>
+  </ReportParametersLayout>
+  <rd:ReportUnitType>Cm</rd:ReportUnitType>
+  <rd:ReportID>2de0031a-4d17-449d-922d-d9fc54572312</rd:ReportID>
+</Report>

AutomobilePlant/AutomobilePlantBusinessLogic/AutomobilePlantBusinessLogic.csproj

@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <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="PDFsharp-MigraDoc-GDI" Version="1.50.5147" />
   </ItemGroup>

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/BackUpLogic.cs

@@ -1,100 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.StorageContracts;
-using AutomobilePlantDataModels;
-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 AutomobilePlantBusinessLogic.BusinessLogics
-{
-	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)
-				{
-					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;
-			}
-			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);
-		}
-	}
-}

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ClientLogic.cs

@@ -1,126 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.StorageContracts;
-using AutomobilePlantContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantBusinessLogic.BusinessLogics
-{
-    public class ClientLogic : IClientLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IClientStorage _clientStorage;
-        public ClientLogic(ILogger<ClientLogic> logger, IClientStorage clientStorage)
-        {
-            _logger = logger;
-            _clientStorage = clientStorage;
-        }
-
-        public bool Create(ClientBindingModel model)
-        {
-            CheckModel(model);
-            if (_clientStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-        public bool Update(ClientBindingModel model)
-        {
-            CheckModel(model);
-            if (_clientStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ClientBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_clientStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public ClientViewModel? ReadElement(ClientSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. Email:{Email}.Id:{ Id}", model.Email, model.Id);
-            var element = _clientStorage.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<ClientViewModel>? ReadList(ClientSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. Email:{Email}.Id:{ Id} ", model?.Email, model?.Id);
-            var list = (model == null) ? _clientStorage.GetFullList() : _clientStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        private void CheckModel(ClientBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (string.IsNullOrEmpty(model.ClientFIO))
-            {
-                throw new ArgumentNullException("Нет ФИО клиента", nameof(model.ClientFIO));
-            }
-            if (string.IsNullOrEmpty(model.Email))
-            {
-                throw new ArgumentNullException("Нет логина(почты) клиента", nameof(model.Email));
-            }
-			if (!Regex.IsMatch(model.Email, @"^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$"))
-			{
-				throw new ArgumentException("Некорретно введен email клиента", nameof(model.Email));
-			}
-			if (!Regex.IsMatch(model.Password, @"^(?=.*\d)(?=.*\W)(?=.*[^\d\s]).+$"))
-			{
-				throw new ArgumentException("Некорректно введен пароль клиента", nameof(model.Password));
-			}
-			_logger.LogInformation("Client. Id: {Id}, FIO: {fio}, email: {email}", model.Id, model.ClientFIO, model.Email);
-			var element = _clientStorage.GetElement(new ClientSearchModel
-            {
-                Email = model.Email,
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Клиент с таким логином(почтой) уже есть");
-            }
-        }
-    }
-}

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ImplementerLogic.cs

@@ -1,126 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.StorageContracts;
-using AutomobilePlantContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantBusinessLogic.BusinessLogics
-{
-    public class ImplementerLogic : IImplementerLogic
-    {
-        private readonly ILogger _logger;
-        private readonly IImplementerStorage _implementerStorage;
-        public ImplementerLogic(ILogger<ImplementerLogic> logger, IImplementerStorage implementerStorage)
-        {
-            _logger = logger;
-            _implementerStorage = implementerStorage;
-        }
-
-        public bool Create(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Insert(model) == null)
-            {
-                _logger.LogWarning("Insert operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Update(ImplementerBindingModel model)
-        {
-            CheckModel(model);
-            if (_implementerStorage.Update(model) == null)
-            {
-                _logger.LogWarning("Update operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public bool Delete(ImplementerBindingModel model)
-        {
-            CheckModel(model, false);
-            _logger.LogInformation("Delete. Id:{Id}", model.Id);
-            if (_implementerStorage.Delete(model) == null)
-            {
-                _logger.LogWarning("Delete operation failed");
-                return false;
-            }
-            return true;
-        }
-
-        public ImplementerViewModel? ReadElement(ImplementerSearchModel model)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            _logger.LogInformation("ReadElement. FIO:{FIO}.Id:{ Id}", model.ImplementerFIO, model.Id);
-            var element = _implementerStorage.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<ImplementerViewModel>? ReadList(ImplementerSearchModel? model)
-        {
-            _logger.LogInformation("ReadList. FIO:{FIO}.Id:{ Id} ", model?.ImplementerFIO, model?.Id);
-            var list = (model == null) ? _implementerStorage.GetFullList() : _implementerStorage.GetFilteredList(model);
-            if (list == null)
-            {
-                _logger.LogWarning("ReadList return null list");
-                return null;
-            }
-            _logger.LogInformation("ReadList. Count:{Count}", list.Count);
-            return list;
-        }
-
-        private void CheckModel(ImplementerBindingModel model, bool withParams = true)
-        {
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
-            if (!withParams)
-            {
-                return;
-            }
-            if (model.WorkExperience < 0)
-            {
-                throw new ArgumentException("Стаж работы не может быть меньше нуля", nameof(model.WorkExperience));
-            }
-            if (model.Qualification < 0)
-            {
-                throw new ArgumentException("Квалификация не должна быть меньше нуля", nameof(model.Qualification));
-            }
-            if (string.IsNullOrEmpty(model.Password))
-            {
-                throw new ArgumentNullException("Нет пароля исполнителя", nameof(model.ImplementerFIO));
-            }
-            if (string.IsNullOrEmpty(model.ImplementerFIO))
-            {
-                throw new ArgumentNullException("Нет ФИО исполнителя", nameof(model.ImplementerFIO));
-            }
-            _logger.LogInformation("Implementer. Id: {Id}, FIO: {FIO}", model.Id, model.ImplementerFIO);
-            var element = _implementerStorage.GetElement(new ImplementerSearchModel
-            {
-                ImplementerFIO = model.ImplementerFIO,
-            });
-            if (element != null && element.Id != model.Id)
-            {
-                throw new InvalidOperationException("Исполнитель с таким ФИО уже есть");
-            }
-        }
-    }
-}

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/MessageInfoLogic.cs

@@ -1,48 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.StorageContracts;
-using AutomobilePlantContracts.ViewModels;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantBusinessLogic.BusinessLogics
-{
-	public class MessageInfoLogic : IMessageInfoLogic
-	{
-		private readonly ILogger _logger;
-		private readonly IMessageInfoStorage _messageInfoStorage;
-		public MessageInfoLogic(ILogger<MessageInfoLogic> logger, IMessageInfoStorage MessageInfoStorage)
-		{
-			_logger = logger;
-			_messageInfoStorage = MessageInfoStorage;
-		}
-
-		public bool Create(MessageInfoBindingModel model)
-		{
-			if (_messageInfoStorage.Insert(model) == null)
-			{
-				_logger.LogWarning("Insert operation failed");
-				return false;
-			}
-			return true;
-		}
-
-		public List<MessageInfoViewModel>? ReadList(MessageInfoSearchModel? model)
-		{
-			_logger.LogInformation("ReadList. MessageId:{MessageId}.ClientId:{ClientId} ", model?.MessageId, model?.ClientId);
-			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;
-		}
-	}
-}

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/OrderLogic.cs

@@ -1,10 +1,10 @@
-using AutomobilePlantBusinessLogic.MailWorker;
-using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BindingModels;
 using AutomobilePlantContracts.BusinessLogicContracts;
 using AutomobilePlantContracts.SearchModels;
 using AutomobilePlantContracts.StorageContracts;
 using AutomobilePlantContracts.ViewModels;
 using AutomobilePlantDataModels.Enums;
+using AutomobilePlantDataModels.Models;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
@@ -18,16 +18,18 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
     {
         private readonly ILogger _logger;
         private readonly IOrderStorage _orderStorage;
-		private readonly AbstractMailWorker _mailWorker;
-		private readonly IClientLogic _clientLogic;
+        private readonly IShopStorage _shopStorage;
+        private readonly IShopLogic _shopLogic;
+        private readonly ICarStorage _carStorage;
 
-		public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, AbstractMailWorker mailWorker, IClientLogic clientLogic)
-		{
+        public OrderLogic(ILogger<OrderLogic> logger, IOrderStorage orderStorage, IShopLogic shopLogic, ICarStorage carStorage, IShopStorage shopStorage)
+        {
             _logger = logger;
             _orderStorage = orderStorage;
-			_mailWorker = mailWorker;
-			_clientLogic = clientLogic;
-		}
+            _shopLogic = shopLogic;
+            _carStorage = carStorage;
+            _shopStorage = shopStorage;
+        }
 
         public bool CreateOrder(OrderBindingModel model)
         {
@@ -38,16 +40,14 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
                 return false;
             }
             model.Status = OrderStatus.Принят;
-			var result = _orderStorage.Insert(model);
-			if (result == null)
-			{
+            if (_orderStorage.Insert(model) == null)
+            {
                 model.Status = OrderStatus.Неизвестен;
                 _logger.LogWarning("Insert operation failed");
                 return false;
             }
-			SendOrderStatusMail(result.ClientId, $"Новый заказ создан. Номер заказа #{result.Id}", $"Заказ #{result.Id} от {result.DateCreate} на сумму {result.Sum:0.00} принят");
-			return true;
-		}
+            return true;
+        }
 
         public bool StatusUpdate(OrderBindingModel rawModel, OrderStatus newStatus)
         {
@@ -70,14 +70,8 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
                 DateCreate = viewModel.DateCreate,
                 DateImplement = viewModel.DateImplement,
                 Count = viewModel.Count,
-                Sum = viewModel.Sum,
-				ImplementerId = viewModel.ImplementerId
-			};
-
-            if (rawModel.ImplementerId.HasValue)
-            {
-                model.ImplementerId = rawModel.ImplementerId;
-            }
+                Sum = viewModel.Sum
+            };
 
             CheckModel(model, false);
             if (model.Status + 1 != newStatus)
@@ -85,18 +79,91 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
                 _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Order status incorrect.");
                 return false;
             }
+            if (newStatus == OrderStatus.Готов)
+            {
+                var car = _carStorage.GetElement(new CarSearchModel() { Id = model.CarId });
+                if (car == null)
+                {
+                    _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Car not found.");
+                    return false;
+                }
+                if (CheckThenSupplyMany(car, model.Count) == false)
+                {
+                    _logger.LogWarning("Status update to " + newStatus.ToString() + " operation failed. Shop supply error.");
+                    return false;
+                }
+            }
             model.Status = newStatus;
             if (model.Status == OrderStatus.Выдан) model.DateImplement = DateTime.Now;
-			var result = _orderStorage.Update(model);
-			if (result == null)
-			{
+            if (_orderStorage.Update(model) == null)
+            {
                 model.Status--;
                 _logger.LogWarning("Update operation failed");
                 return false;
             }
-			SendOrderStatusMail(result.ClientId, $"Изменен статус заказа #{result.Id}", $"Заказ #{result.Id} изменен статус на {result.Status}");
-			return true;
-		}
+            return true;
+        }
+
+        public bool CheckThenSupplyMany(ICarModel car, int count)
+        {
+            if (count <= 0)
+            {
+                _logger.LogWarning("Check then supply operation error. Car count < 0.");
+                return false;
+            }
+
+            int freeSpace = 0;
+            foreach (var shop in _shopStorage.GetFullList())
+            {
+                freeSpace += shop.MaxCountCars;
+                foreach (var c in shop.ShopCars)
+                {
+                    freeSpace -= c.Value.Item2;
+                }
+            }
+
+            if (freeSpace - count < 0)
+            {
+                _logger.LogWarning("Check then supply operation error. There's no place for new cars in shops.");
+                return false;
+            }
+
+            foreach (var shop in _shopStorage.GetFullList())
+            {
+                freeSpace = shop.MaxCountCars;
+                foreach (var c in shop.ShopCars)
+                {
+                    freeSpace -= c.Value.Item2;
+                }
+                if (freeSpace == 0)
+                {
+                    continue;
+                }
+                if (freeSpace - count >= 0)
+                {
+                    if (_shopLogic.SupplyCars(new() { Id = shop.Id }, car, count)) count = 0;
+                    else
+                    {
+                        _logger.LogWarning("Supply error");
+                        return false;
+                    }
+                }
+                if (freeSpace - count < 0)
+                {
+                    if (_shopLogic.SupplyCars(new() { Id = shop.Id }, car, freeSpace)) count -= freeSpace;
+                    else
+                    {
+                        _logger.LogWarning("Supply error");
+                        return false;
+                    }
+                }
+                if (count <= 0)
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
 
         public bool TakeOrderInWork(OrderBindingModel model)
         {
@@ -126,45 +193,12 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
             return list;
         }
 
-        public OrderViewModel? ReadElement(OrderSearchModel model)
+        private void CheckModel(OrderBindingModel model, bool withParams = true)
         {
             if (model == null)
             {
                 throw new ArgumentNullException(nameof(model));
             }
-            _logger.LogInformation("ReadElement. Id:{ Id}", model.Id);
-            var element = _orderStorage.GetElement(model);
-            if (element == null)
-            {
-                _logger.LogWarning("ReadElement element not found");
-                return null;
-            }
-            _logger.LogInformation("ReadElement find. Id:{Id}", element.Id);
-            return element;
-        }
-
-		private bool SendOrderStatusMail(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;
-		}
-
-		private void CheckModel(OrderBindingModel model, bool withParams = true)
-		{
-            if (model == null)
-            {
-                throw new ArgumentNullException(nameof(model));
-            }
             if (!withParams)
             {
                 return;

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ReportLogic.cs

@@ -18,14 +18,16 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
         private readonly IComponentStorage _componentStorage;
         private readonly ICarStorage _carStorage;
         private readonly IOrderStorage _orderStorage;
+        private readonly IShopStorage _shopStorage;
         private readonly AbstractSaveToExcel _saveToExcel;
         private readonly AbstractSaveToWord _saveToWord;
         private readonly AbstractSaveToPdf _saveToPdf;
-        public ReportLogic(ICarStorage carStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
+        public ReportLogic(ICarStorage carStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, IShopStorage shopStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf)
         {
             _carStorage = carStorage;
             _componentStorage = componentStorage;
             _orderStorage = orderStorage;
+            _shopStorage = shopStorage;
             _saveToExcel = saveToExcel;
             _saveToWord = saveToWord;
             _saveToPdf = saveToPdf;
@@ -103,5 +105,64 @@ namespace AutomobilePlantBusinessLogic.BusinessLogics
             });
         }
 
+        public void SaveShopsToWordFile(ReportBindingModel model)
+        {
+            _saveToWord.CreateTableDoc(new WordInfo
+            {
+                FileName = model.FileName,
+                Title = "Список магазинов",
+                Shops = _shopStorage.GetFullList()
+            });
+        }
+        public void SaveShopCarsToExcelFile(ReportBindingModel model)
+        {
+            _saveToExcel.CreateShopReport(new ExcelInfo
+            {
+                FileName = model.FileName,
+                Title = "Загруженность магазинов",
+                ShopCars = GetShopCars()
+            });
+        }
+
+        public List<ReportShopCarsViewModel> GetShopCars()
+        {
+            var shops = _shopStorage.GetFullList();
+            var list = new List<ReportShopCarsViewModel>();
+            foreach (var shop in shops)
+            {
+                var record = new ReportShopCarsViewModel
+                {
+                    ShopName = shop.Name,
+                    Cars = new List<Tuple<string, int>>(),
+                    Count = 0
+                };
+                foreach (var carCount in shop.ShopCars.Values)
+                {
+                    record.Cars.Add(new Tuple<string, int>(carCount.Item1.CarName, carCount.Item2));
+                    record.Count += carCount.Item2;
+                }
+                list.Add(record);
+            }
+            return list;
+        }
+
+        public List<ReportDateOrdersViewModel> GetDateOrders()
+        {
+            return _orderStorage.GetFullList().GroupBy(x => x.DateCreate.Date).Select(x => new ReportDateOrdersViewModel
+            {
+                DateCreate = x.Key,
+                CountOrders = x.Count(),
+                SumOrders = x.Sum(y => y.Sum)
+            }).ToList();
+        }
+        public void SaveDateOrdersToPdfFile(ReportBindingModel model)
+        {
+            _saveToPdf.CreateReportDateDoc(new PdfInfo
+            {
+                FileName = model.FileName,
+                Title = "Заказы по датам",
+                DateOrders = GetDateOrders()
+            });
+        }
     }
 }

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/ShopLogic.cs

@@ -0,0 +1,207 @@
+using AutomobilePlantContracts.BindingModels;
+using AutomobilePlantContracts.BusinessLogicContracts;
+using AutomobilePlantContracts.SearchModels;
+using AutomobilePlantContracts.StorageContracts;
+using AutomobilePlantContracts.ViewModels;
+using AutomobilePlantDataModels.Models;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantBusinessLogic.BusinessLogics
+{
+    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. Shop Name:{0}, ID:{1}", model.Name, 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. Shop Name:{0}, ID:{1} ", model?.Name, 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 SupplyCars(ShopSearchModel model, ICarModel car, int count)
+        {
+            if (model == null)
+            {
+                throw new ArgumentNullException(nameof(model));
+            }
+
+            if (car == null)
+            {
+                throw new ArgumentNullException(nameof(car));
+            }
+
+            if (count <= 0)
+            {
+                throw new ArgumentNullException("Count of cars in supply must be more than 0", nameof(count));
+            }
+
+            var shopElement = _shopStorage.GetElement(model);
+            if (shopElement == null)
+            {
+                _logger.LogWarning("Required shop element not found in storage");
+                return false;
+            }
+
+            _logger.LogInformation("Shop element found. ID: {0}, Name: {1}", shopElement.Id, shopElement.Name);
+
+            var countCars = 0;
+            foreach (var c in shopElement.ShopCars)
+            {
+                countCars += c.Value.Item2;
+            }
+            if (shopElement.MaxCountCars - countCars >= count)
+            {
+                if (shopElement.ShopCars.TryGetValue(car.Id, out var sameCar))
+                {
+                    shopElement.ShopCars[car.Id] = (car, sameCar.Item2 + count);
+                    _logger.LogInformation("Same car found by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name);
+                }
+                else
+                {
+                    shopElement.ShopCars[car.Id] = (car, count);
+                    _logger.LogInformation("New car added by supply. Added {0} of {1} in {2} shop", count, car.CarName, shopElement.Name);
+                }
+                _shopStorage.Update(new()
+                {
+                    Id = shopElement.Id,
+                    Name = shopElement.Name,
+                    Address = shopElement.Address,
+                    OpeningDate = shopElement.OpeningDate,
+                    ShopCars = shopElement.ShopCars,
+                    MaxCountCars = shopElement.MaxCountCars
+                });
+            }
+            else
+            {
+                _logger.LogWarning("Required shop is overflowed");
+                return false;
+            }
+
+            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 SellCar(ICarModel car, int count)
+        {
+            return _shopStorage.SellCar(car, count);
+        }
+
+        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);
+
+            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.Name))
+            {
+                throw new ArgumentNullException("Нет названия магазина!", nameof(model.Name));
+            }
+
+            if (model.MaxCountCars < 0)
+            {
+                throw new InvalidOperationException("Магазин с отрицательным количеством максимального количества авто!");
+            }
+
+            _logger.LogInformation("Shop. Name: {0}, Address: {1}, ID: {2}", model.Name, model.Address, model.Id);
+
+            var element = _shopStorage.GetElement(new ShopSearchModel
+            {
+                Name = model.Name
+            });
+
+            if (element != null && element.Id != model.Id)
+            {
+                throw new InvalidOperationException("Магазин с таким названием уже есть");
+            }
+        }
+    }
+}

AutomobilePlant/AutomobilePlantBusinessLogic/BusinessLogics/WorkModeling.cs

@@ -1,142 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using AutomobilePlantContracts.SearchModels;
-using AutomobilePlantContracts.ViewModels;
-using AutomobilePlantDataModels.Enums;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantBusinessLogic.BusinessLogics
-{
-    public class WorkModeling : IWorkProcess
-    {
-        private readonly ILogger _logger;
-
-        private readonly Random _rnd;
-
-        private IOrderLogic? _orderLogic;
-
-        public WorkModeling(ILogger<WorkModeling> logger)
-        {
-            _logger = logger;
-            _rnd = new Random(1000);
-        }
-
-        public void DoWork(IImplementerLogic implementerLogic, IOrderLogic orderLogic)
-        {
-            _orderLogic = orderLogic;
-            var implementers = implementerLogic.ReadList(null);
-            if (implementers == null)
-            {
-                _logger.LogWarning("DoWork. Implementers is null");
-                return;
-            }
-			var orders = _orderLogic.ReadList(new OrderSearchModel { Status = OrderStatus.Принят });
-			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)
-            {
-                Task.Run(() => WorkerWorkAsync(implementer, orders));
-            }
-        }
-
-        private async Task WorkerWorkAsync(ImplementerViewModel implementer, List<OrderViewModel> orders)
-        {
-            if (_orderLogic == null || implementer == null)
-            {
-                return;
-            }
-            await RunOrderInWork(implementer);
-
-			await Task.Run(() =>
-			{
-				foreach (var order in orders)
-				{
-					try
-					{
-						_logger.LogDebug("DoWork. Worker {Id} try get order {Order}", implementer.Id, order.Id);
-						// пытаемся назначить заказ на исполнителя
-						if (_orderLogic.TakeOrderInWork(new OrderBindingModel
-						{
-							Id = order.Id,
-							ImplementerId = implementer.Id
-						}))
-						{
-							// делаем работу
-							Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 1000) * order.Count);
-							_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, order.Id);
-							_orderLogic.DeliveryOrder(new OrderBindingModel
-							{
-								Id = order.Id,
-								ImplementerId = implementer.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;
-					}
-				}
-			});
-		}
-
-        private async Task RunOrderInWork(ImplementerViewModel implementer)
-        {
-			if (_orderLogic == null || implementer == null)
-			{
-				return;
-			}
-			try
-			{
-				var runOrder = await Task.Run(() => _orderLogic.ReadElement(new OrderSearchModel
-				{
-					ImplementerId = implementer.Id,
-					Status = OrderStatus.Выполняется
-				}));
-				if (runOrder == null)
-				{
-					return;
-				}
-				_logger.LogDebug("DoWork. Worker {Id} back to order {Order}", implementer.Id, runOrder.Id);
-				// доделываем работу
-				Thread.Sleep(implementer.WorkExperience * _rnd.Next(100, 300) * runOrder.Count);
-				_logger.LogDebug("DoWork. Worker {Id} finish order {Order}", implementer.Id, runOrder.Id);
-				_orderLogic.DeliveryOrder(new OrderBindingModel
-				{
-					Id = runOrder.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;
-			}
-		}
-    }
-}

AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/AbstractMailWorker.cs

@@ -1,82 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AutomobilePlantBusinessLogic.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();
-	}
-}

AutomobilePlant/AutomobilePlantBusinessLogic/MailWorker/MailKitWorker.cs

@@ -1,79 +0,0 @@
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.BusinessLogicContracts;
-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 AutomobilePlantBusinessLogic.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 (MailKit.Security.AuthenticationException)
-				{ }
-				finally
-				{
-					client.Disconnect(true);
-				}
-			});
-			return list;
-		}
-	}
-}

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs

@@ -73,6 +73,70 @@ namespace AutomobilePlantBusinessLogic.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 pc in info.ShopCars)
+            {
+                InsertCellInWorksheet(new ExcelCellParameters
+                {
+                    ColumnName = "A",
+                    RowIndex = rowIndex,
+                    Text = pc.ShopName,
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+                foreach (var (CarName, Count) in pc.Cars)
+                {
+                    InsertCellInWorksheet(new ExcelCellParameters
+                    {
+                        ColumnName = "B",
+                        RowIndex = rowIndex,
+                        Text = CarName,
+                        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 = pc.Count.ToString(),
+                    StyleInfo = ExcelStyleInfoType.Text
+                });
+                rowIndex++;
+            }
+            SaveExcel(info);
+        }
+
         /// Создание excel-файла
         protected abstract void CreateExcel(ExcelInfo info);
         /// Добавляем новую ячейку в лист

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs

@@ -49,6 +49,41 @@ namespace AutomobilePlantBusinessLogic.OfficePackage
             });
             SavePdf(info);
         }
+
+        public void CreateReportDateDoc(PdfInfo info)
+        {
+            CreatePdf(info);
+            CreateParagraph(new PdfParagraph
+            {
+                Text = info.Title,
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            CreateTable(new List<string> { "3cm", "3cm", "7cm" });
+            CreateRow(new PdfRowParameters
+            {
+                Texts = new List<string> { "Дата", "Количество", "Сумма" },
+                Style = "NormalTitle",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            foreach (var order in info.DateOrders)
+            {
+                CreateRow(new PdfRowParameters
+                {
+                    Texts = new List<string> { order.DateCreate.ToShortDateString(), order.CountOrders.ToString(), order.SumOrders.ToString() },
+                    Style = "Normal",
+                    ParagraphAlignment = PdfParagraphAlignmentType.Left
+                });
+            }
+            CreateParagraph(new PdfParagraph
+            {
+                Text = $"Итого: {info.DateOrders.Sum(x => x.SumOrders)}\t",
+                Style = "Normal",
+                ParagraphAlignment = PdfParagraphAlignmentType.Center
+            });
+            SavePdf(info);
+        }
+
         /// Создание pdf-файла
         protected abstract void CreatePdf(PdfInfo info);
         /// Создание параграфа с текстом

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs

@@ -38,11 +38,35 @@ namespace AutomobilePlantBusinessLogic.OfficePackage
             }
             SaveWord(info);
         }
+
+        public void CreateTableDoc(WordInfo wordInfo)
+        {
+            CreateWord(wordInfo);
+            var list = new List<string>();
+            foreach (var shop in wordInfo.Shops)
+            {
+                list.Add(shop.Name);
+                list.Add(shop.Address);
+                list.Add(shop.OpeningDate.ToString());
+            }
+            var wordTable = new WordTable
+            {
+                Headers = new List<string> {
+                    "Название",
+                    "Адрес",
+                    "Дата открытия"},
+                Texts = list
+            };
+            CreateTable(wordTable);
+            SaveWord(wordInfo);
+        }
+
         /// Создание doc-файла
         protected abstract void CreateWord(WordInfo info);
         /// Создание абзаца с текстом
         protected abstract void CreateParagraph(WordParagraph paragraph);
         /// Сохранение файла
         protected abstract void SaveWord(WordInfo info);
+        protected abstract void CreateTable(WordTable info);
     }
 }

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs

@@ -12,5 +12,6 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.HelperModels
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
         public List<ReportCarComponentViewModel> CarComponents { get; set; } = new();
+        public List<ReportShopCarsViewModel> ShopCars { get; set; } = new();
     }
 }

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs

@@ -14,5 +14,6 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.HelperModels
         public DateTime DateFrom { get; set; }
         public DateTime DateTo { get; set; }
         public List<ReportOrdersViewModel> Orders { get; set; } = new();
+        public List<ReportDateOrdersViewModel> DateOrders { get; set; } = new();
     }
 }

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs

@@ -12,5 +12,6 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.HelperModels
         public string FileName { get; set; } = string.Empty;
         public string Title { get; set; } = string.Empty;
         public List<CarViewModel> Cars { get; set; } = new();
+        public List<ShopViewModel> Shops { get; set; } = new();
     }
 }

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/HelperModels/WordTable.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AutomobilePlantBusinessLogic.OfficePackage.HelperModels
+{
+    public class WordTable
+    {
+        public List<string> Headers { get; set; } = new();
+        public List<string> Texts { get; set; } = new();
+    }
+}

AutomobilePlant/AutomobilePlantBusinessLogic/OfficePackage/Implements/SaveToWord.cs

@@ -41,8 +41,7 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.Implements
         }
 
         /// Задание форматирования для абзаца
-        private static ParagraphProperties?
-       CreateParagraphProperties(WordTextProperties? paragraphProperties)
+        private static ParagraphProperties? CreateParagraphProperties(WordTextProperties? paragraphProperties)
         {
             if (paragraphProperties == null)
             {
@@ -78,6 +77,7 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.Implements
             mainPart.Document = new Document();
             _docBody = mainPart.Document.AppendChild(new Body());
         }
+
         protected override void CreateParagraph(WordParagraph paragraph)
         {
             if (_docBody == null || paragraph == null)
@@ -106,6 +106,7 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.Implements
             }
             _docBody.AppendChild(docParagraph);
         }
+
         protected override void SaveWord(WordInfo info)
         {
             if (_docBody == null || _wordDocument == null)
@@ -116,5 +117,87 @@ namespace AutomobilePlantBusinessLogic.OfficePackage.Implements
             _wordDocument.MainDocumentPart!.Document.Save();
             _wordDocument.Close();
         }
+
+        protected override void CreateTable(WordTable table)
+        {
+            if (_docBody == null || table == null)
+            {
+                return;
+            }
+            Table tab = new Table();
+            TableProperties props = new TableProperties(
+               new TableBorders(
+                   new TopBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new BottomBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new LeftBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new RightBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new InsideHorizontalBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   },
+                   new InsideVerticalBorder
+                   {
+                       Val = new EnumValue<BorderValues>(BorderValues.Single),
+                       Size = 12
+                   }
+                   )
+            );
+            tab.AppendChild<TableProperties>(props);
+            TableGrid tableGrid = new TableGrid();
+            for (int i = 0; i < table.Headers.Count; i++)
+            {
+                tableGrid.AppendChild(new GridColumn());
+            }
+            tab.AppendChild(tableGrid);
+            TableRow tableRow = new TableRow();
+            foreach (var text in table.Headers)
+            {
+                tableRow.AppendChild(CreateTableCell(text));
+            }
+            tab.AppendChild(tableRow);
+            int height = table.Texts.Count / table.Headers.Count;
+            int width = table.Headers.Count;
+            for (int i = 0; i < height; i++)
+            {
+                tableRow = new TableRow();
+                for (int j = 0; j < width; j++)
+                {
+                    var element = table.Texts[i * table.Headers.Count + j];
+                    tableRow.AppendChild(CreateTableCell(element));
+                }
+                tab.AppendChild(tableRow);
+            }
+
+            _docBody.AppendChild(tab);
+
+        }
+
+        private TableCell CreateTableCell(string element)
+        {
+            var tableParagraph = new Paragraph();
+            var run = new Run();
+            run.AppendChild(new Text { Text = element });
+            tableParagraph.AppendChild(run);
+            var tableCell = new TableCell();
+            tableCell.AppendChild(tableParagraph);
+            return tableCell;
+        }
     }
 }

AutomobilePlant/AutomobilePlantBusinessLogic/Properties/launchSettings.json

@@ -1,12 +0,0 @@
-{
-  "profiles": {
-    "AutomobilePlantBusinessLogic": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:53386;http://localhost:53392"
-    }
-  }
-}

AutomobilePlant/AutomobilePlantClientApp/APIClient.cs

@@ -1,45 +0,0 @@
-using AutomobilePlantContracts.ViewModels;
-using Newtonsoft.Json;
-using System.Net.Http.Headers;
-using System.Text;
-
-
-namespace AutomobilePlantClientApp
-{
-    public static class APIClient
-    {
-        private static readonly HttpClient _client = new();
-        public static ClientViewModel? Client { get; set; } = null;
-        public static void Connect(IConfiguration configuration)
-        {
-            _client.BaseAddress = new Uri(configuration["IPAddress"]);
-            _client.DefaultRequestHeaders.Accept.Clear();
-            _client.DefaultRequestHeaders.Accept.Add(new
-           MediaTypeWithQualityHeaderValue("application/json"));
-        }
-        public static T? GetRequest<T>(string requestUrl)
-        {
-            var response = _client.GetAsync(requestUrl);
-            var result = response.Result.Content.ReadAsStringAsync().Result;
-            if (response.Result.IsSuccessStatusCode)
-            {
-                return JsonConvert.DeserializeObject<T>(result);
-            }
-            else
-            {
-                throw new Exception(result);
-            }
-        }
-        public static void PostRequest<T>(string requestUrl, T model)
-        {
-            var json = JsonConvert.SerializeObject(model);
-            var data = new StringContent(json, Encoding.UTF8, "application/json");
-            var response = _client.PostAsync(requestUrl, data);
-            var result = response.Result.Content.ReadAsStringAsync().Result;
-            if (!response.Result.IsSuccessStatusCode)
-            {
-                throw new Exception(result);
-            }
-        }
-    }
-}

AutomobilePlant/AutomobilePlantClientApp/AutomobilePlantClientApp.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AutomobilePlantContracts\AutomobilePlantContracts.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Content Update="Views\Home\Mails.cshtml">
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-    </Content>
-  </ItemGroup>
-
-</Project>

AutomobilePlant/AutomobilePlantClientApp/Controllers/HomeController.cs

@@ -1,148 +0,0 @@
-using AutomobilePlantClientApp.Models;
-using AutomobilePlantContracts.BindingModels;
-using AutomobilePlantContracts.ViewModels;
-using Microsoft.AspNetCore.Mvc;
-using System.Diagnostics;
-
-namespace AutomobilePlantClientApp.Controllers
-{
-    public class HomeController : Controller
-    {
-        private readonly ILogger<HomeController> _logger;
-        public HomeController(ILogger<HomeController> logger)
-        {
-            _logger = logger;
-        }
-        public IActionResult Index()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.GetRequest<List<OrderViewModel>>($"api/main/getorders?clientId={APIClient.Client.Id}"));
-        }
-        [HttpGet]
-        public IActionResult Privacy()
-        {
-            if (APIClient.Client == null)
-            {
-                return Redirect("~/Home/Enter");
-            }
-            return View(APIClient.Client);
-        }
-        [HttpPost]
-        public void Privacy(string login, string password, string fio)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Вход только авторизованным");
-            }
-            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-            {
-                throw new Exception("Введите логин, пароль и ФИО");
-            }
-            APIClient.PostRequest("api/client/updatedata", new
-            ClientBindingModel
-            {
-                Id = APIClient.Client.Id,
-                ClientFIO = fio,
-                Email = login,
-                Password = password
-            });
-            APIClient.Client.ClientFIO = fio;
-            APIClient.Client.Email = login;
-            APIClient.Client.Password = password;
-            Response.Redirect("Index");
-        }
-        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
-        public IActionResult Error()
-        {
-            return View(new ErrorViewModel
-            {
-                RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier
-            });
-        }
-        [HttpGet]
-        public IActionResult Enter()
-        {
-            return View();
-        }
-        [HttpPost]
-        public void Enter(string login, string password)
-        {
-            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password))
-            {
-                throw new Exception("Введите логин и пароль");
-            }
-            APIClient.Client = APIClient.GetRequest<ClientViewModel>($"api/client/login?login={login}&password={password}");
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Неверный логин/пароль");
-            }
-            Response.Redirect("Index");
-        }
-        [HttpGet]
-        public IActionResult Register()
-        {
-            return View();
-        }
-        [HttpPost]
-        public void Register(string login, string password, string fio)
-        {
-            if (string.IsNullOrEmpty(login) || string.IsNullOrEmpty(password) || string.IsNullOrEmpty(fio))
-            {
-                throw new Exception("Введите логин, пароль и ФИО");
-            }
-            APIClient.PostRequest("api/client/register", new ClientBindingModel
-            {
-                ClientFIO = fio,
-                Email = login,
-                Password = password
-            });
-            Response.Redirect("Enter");
-            return;
-        }
-        [HttpGet]
-        public IActionResult Create()
-        {
-            ViewBag.Cars = APIClient.GetRequest<List<CarViewModel>>("api/main/getcarlist");
-            return View();
-        }
-        [HttpPost]
-        public void Create(int car, int count)
-        {
-            if (APIClient.Client == null)
-            {
-                throw new Exception("Вход только авторизованным");
-            }
-            if (count <= 0)
-            {
-                throw new Exception("Количество и сумма должны быть больше 0");
-            }
-            APIClient.PostRequest("api/main/createorder", new OrderBindingModel
-            {
-                ClientId = APIClient.Client.Id,
-                CarId = car,
-                Count = count,
-                Sum = Calc(count, car)
-            });
-            Response.Redirect("Index");
-        }
-        [HttpPost]
-        public double Calc(int count, int car)
-        {
-            var c = APIClient.GetRequest<CarViewModel>($"api/main/getcar?carId={car}");
-            return count * (c?.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}"));
-		}
-	}
-}

AutomobilePlant/AutomobilePlantClientApp/Models/ErrorViewModel.cs

@@ -1,9 +0,0 @@
-namespace AutomobilePlantClientApp.Models
-{
-    public class ErrorViewModel
-    {
-        public string? RequestId { get; set; }
-
-        public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
-    }
-}

AutomobilePlant/AutomobilePlantClientApp/Program.cs

@@ -1,30 +0,0 @@
-using AutomobilePlantClientApp;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add services to the container.
-builder.Services.AddControllersWithViews();
-
-var app = builder.Build();
-APIClient.Connect(builder.Configuration);
-
-// Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Home/Error");
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-app.UseStaticFiles();
-
-app.UseRouting();
-
-app.UseAuthorization();
-
-app.MapControllerRoute(
-    name: "default",
-    pattern: "{controller=Home}/{action=Index}/{id?}");
-
-app.Run();

AutomobilePlant/AutomobilePlantClientApp/Properties/launchSettings.json

@@ -1,28 +0,0 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:44270",
-      "sslPort": 44370
-    }
-  },
-  "profiles": {
-    "AutomobilePlantClientApp": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7042;http://localhost:5188",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}

AutomobilePlant/AutomobilePlantClientApp/Views/Home/Create.cshtml

@@ -1,55 +0,0 @@
-@{
-    ViewData["Title"] = "Create";
-}
-<div class="text-center">
-    <h2 class="display-4">Создание заказа</h2>
-</div>
-<form method="post">
-    <div class="row">
-        <div class="col-4">Автомобиль:</div>
-        <div class="col-8">
-            <select id="car" name="car" class="form-control" asp-items="@(new SelectList(@ViewBag.Cars,"Id", "CarName"))"></select>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-4">Количество:</div>
-        <div class="col-8">
-            <input type="text" name="count" id="count" />
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-4">Сумма:</div>
-        <div class="col-8">
-            <input type="text" id="sum" name="sum" readonly />
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-8"></div>
-        <div class="col-4">
-            <input type="submit" value="Создать" class="btn
-btn-primary" />
-        </div>
-    </div>
-</form>
-<script>
-    $('#car').on('change', function () {
-        check();
-    });
-    $('#count').on('change', function () {
-        check();
-    });
-    function check() {
-        var count = $('#count').val();
-        var car = $('#car').val();
-        if (count && car) {
-            $.ajax({
-                method: "POST",
-                url: "/Home/Calc",
-                data: { count: count, car: car },
-                success: function (result) {
-                $("#sum").val(result);
-                }
-            });
-        };
-    }
-</script>

AutomobilePlant/AutomobilePlantClientApp/Views/Home/Enter.cshtml

@@ -1,20 +0,0 @@
-@{
-    ViewData["Title"] = "Enter";
-}
-<div class="text-center">
-<h2 class="display-4">Вход в приложение</h2>
-</div>
-<form method="post">
-<div class="row">
-<div class="col-4">Логин:</div>
-<div class="col-8"><input type="text" name="login" /></div>
-</div>
-<div class="row">
-<div class="col-4">Пароль:</div>
-<div class="col-8"><input type="password" name="password" /></div>
-</div>
-<div class="row">
-<div class="col-8"></div>
-<div class="col-4"><input type="submit" value="Вход" class="btn btnprimary" /></div>
-</div>
-</form>

AutomobilePlant/AutomobilePlantClientApp/Views/Home/Index.cshtml

@@ -1,75 +0,0 @@
-@using AutomobilePlantContracts.ViewModels
-@model List<OrderViewModel>
-@{
-    ViewData["Title"] = "Home Page";
-}
-<div class="text-center">
-<h1 class="display-4">Заказы</h1>
-</div>
-<div class="text-center">
-    @{
-        if (Model == null)
-        {
-        <h3 class="display-4">Авторизируйтесь</h3>
-            return;
-        }
-    <p>
-    <a asp-action="Create">Создать заказ</a>
-    </p>
-    <table class="table">
-    <thead>
-    <tr>
-    <th>
-    Номер
-    </th>
-    <th>
-    Автомобиль
-    </th>
-    <th>
-    Дата создания
-    </th>
-    <th>
-    Количество
-                        </th>
-                        <th>
-                            Сумма
-                        </th>
-                        <th>
-                            Статус
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                @foreach (var item in Model)
-                {
-                            <tr>
-                                <td>
-                            @Html.DisplayFor(modelItem =>
-                    item.Id)
-                                </td>
-                                <td>
-                            @Html.DisplayFor(modelItem =>
-                    item.CarName)
-                                </td>
-                                <td>
-                            @Html.DisplayFor(modelItem =>
-                    item.DateCreate)
-                                </td>
-                                <td>
-                            @Html.DisplayFor(modelItem =>
-                    item.Count)
-                                </td>
-                                <td>
-                            @Html.DisplayFor(modelItem =>
-                    item.Sum)
-                                </td>
-                                <td>
-                            @Html.DisplayFor(modelItem =>
-                    item.Status)
-                                </td>
-                            </tr>
-                }
-                </tbody>
-            </table>
-    }
-</div>

AutomobilePlant/AutomobilePlantClientApp/Views/Home/Mails.cshtml

@@ -1,54 +0,0 @@
-@using AutomobilePlantContracts.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>

AutomobilePlant/AutomobilePlantClientApp/Views/Home/Privacy.cshtml

@@ -1,30 +0,0 @@
-@using AutomobilePlantContracts.ViewModels
-@model ClientViewModel
-@{
-    ViewData["Title"] = "Privacy Policy";
-}
-<div class="text-center">
-<h2 class="display-4">Личные данные</h2>
-</div>
-<form method="post">
-<div class="row">
-<div class="col-4">Логин:</div>
-<div class="col-8"><input type="text" name="login"
-value="@Model.Email"/></div>
-</div>
-<div class="row">
-<div class="col-4">Пароль:</div>
-<div class="col-8"><input type="password" name="password"
-value="@Model.Password"/></div>
-    </div>
-<div class="row">
-<div class="col-4">ФИО:</div>
-<div class="col-8"><input type="text" name="fio"
-value="@Model.ClientFIO"/></div>
-</div>
-<div class="row">
-<div class="col-8"></div>
-<div class="col-4"><input type="submit" value="Сохранить" class="btn
-btn-primary" /></div>
-</div>
-</form>

AutomobilePlant/AutomobilePlantClientApp/Views/Home/Register.cshtml

@@ -1,26 +0,0 @@
-@{
-ViewData["Title"] = "Register";
-}
-<div class="text-center">
-<h2 class="display-4">Регистрация</h2>
-</div>
-<form method="post">
-<div class="row">
-<div class="col-4">Логин:</div>
-<div class="col-8"><input type="text" name="login" /></div>
-</div>
-<div class="row">
-<div class="col-4">Пароль:</div>
-<div class="col-8"><input type="password" name="password" /></div>
-</div>
-<div class="row">
-        <div class="col-4">ФИО:</div><div class="col-8"><input type="text" name="fio" /></div>
-    </div>
-    <div class="row">
-        <div class="col-8"></div>
-        <div class="col-4">
-            <input type="submit" value="Регистрация"
-                   class="btn btn-primary" />
-        </div>
-    </div>
-</form>

AutomobilePlant/AutomobilePlantClientApp/Views/Shared/Error.cshtml

@@ -1,25 +0,0 @@
-@model ErrorViewModel
-@{
-    ViewData["Title"] = "Error";
-}
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (Model.ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@Model.RequestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>

AutomobilePlant/AutomobilePlantClientApp/Views/Shared/_Layout.cshtml

@@ -1,57 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>@ViewData["Title"] - AutomobilePlantClientApp</title>
-    <link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
-    <link rel="stylesheet" href="~/css/site.css" />
-    <script src="~/lib/jquery/dist/jquery.min.js"></script>
-    <script src="~/lib/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
-    <script src="~/js/site.js" asp-append-version="true"></script>
-</head>
-<body>
-    <header>
-        <nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bgwhite border-bottom box-shadow mb-3">
-            <div class="container">
-                <a class="navbar-brand" asp-area="" asp-controller="Home" aspaction="Index">Автомобильный Завод</a>
-                <button class="navbar-toggler" type="button" datatoggle="collapse" data-target=".navbar-collapse" ariacontrols="navbarSupportedContent"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon"></span>
-                </button>
-                <div class="navbar-collapse collapse d-sm-inline-flex flex-smrow-reverse">
-                    <ul class="navbar-nav flex-grow-1">
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Index">Заказы</a>
-                        </li>
-                        <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>
-                        <li class="nav-item">
-                            <a class="nav-link text-dark" asparea="" asp-controller="Home" asp-action="Register">Регистрация</a>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </nav>
-    </header>
-    <div class="container">
-        <main role="main" class="pb-3">
-            @RenderBody()
-        </main>
-    </div>
-    <footer class="border-top footer text-muted">
-        <div class="container">
-            &copy; 2023 - Автомобильный завод - <a asp-area="" aspcontroller="Home" asp-action="Privacy">Личные данные</a>
-        </div>
-    </footer>
-    <script src="~/js/site.js" asp-append-version="true"></script>
-    @RenderSection("Scripts", required: false)
-</body>
-</html>

AutomobilePlant/AutomobilePlantClientApp/Views/Shared/_Layout.cshtml.css

@@ -1,48 +0,0 @@
-/* Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-for details on configuring this project to bundle and minify static web assets. */
-
-a.navbar-brand {
-  white-space: normal;
-  text-align: center;
-  word-break: break-all;
-}
-
-a {
-  color: #0077cc;
-}
-
-.btn-primary {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
-  color: #fff;
-  background-color: #1b6ec2;
-  border-color: #1861ac;
-}
-
-.border-top {
-  border-top: 1px solid #e5e5e5;
-}
-.border-bottom {
-  border-bottom: 1px solid #e5e5e5;
-}
-
-.box-shadow {
-  box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
-}
-
-button.accept-policy {
-  font-size: 1rem;
-  line-height: inherit;
-}
-
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  white-space: nowrap;
-  line-height: 60px;
-}

AutomobilePlant/AutomobilePlantClientApp/Views/Shared/_ValidationScriptsPartial.cshtml

@@ -1,2 +0,0 @@
-<script src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
-<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>

AutomobilePlant/AutomobilePlantClientApp/Views/_ViewImports.cshtml

@@ -1,3 +0,0 @@
-@using AutomobilePlantClientApp
-@using AutomobilePlantClientApp.Models
-@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers

AutomobilePlant/AutomobilePlantClientApp/Views/_ViewStart.cshtml

@@ -1,3 +0,0 @@
-@{
-    Layout = "_Layout";
-}

AutomobilePlant/AutomobilePlantClientApp/appsettings.Development.json

@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}

AutomobilePlant/AutomobilePlantClientApp/appsettings.json

@@ -1,10 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*",
-  "IPAddress": "http://localhost:5137/"
-}

AutomobilePlant/AutomobilePlantClientApp/wwwroot/css/site.css

@@ -1,18 +0,0 @@
-html {
-  font-size: 14px;
-}
-
-@media (min-width: 768px) {
-  html {
-    font-size: 16px;
-  }
-}
-
-html {
-  position: relative;
-  min-height: 100%;
-}
-
-body {
-  margin-bottom: 60px;
-}

AutomobilePlant/AutomobilePlantClientApp/wwwroot/js/site.js

@@ -1,4 +0,0 @@
-// Please see documentation at https://docs.microsoft.com/aspnet/core/client-side/bundling-and-minification
-// for details on configuring this project to bundle and minify static web assets.
-
-// Write your JavaScript code.

AutomobilePlant/AutomobilePlantClientApp/wwwroot/lib/bootstrap/LICENSE

@@ -1,22 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2011-2021 Twitter, Inc.
-Copyright (c) 2011-2021 The Bootstrap Authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

AutomobilePlant/AutomobilePlantClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.css

@@ -1,427 +0,0 @@
-/*!
- * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
- * Copyright 2011-2021 The Bootstrap Authors
- * Copyright 2011-2021 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
- */
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  :root {
-    scroll-behavior: smooth;
-  }
-}
-
-body {
-  margin: 0;
-  font-family: var(--bs-body-font-family);
-  font-size: var(--bs-body-font-size);
-  font-weight: var(--bs-body-font-weight);
-  line-height: var(--bs-body-line-height);
-  color: var(--bs-body-color);
-  text-align: var(--bs-body-text-align);
-  background-color: var(--bs-body-bg);
-  -webkit-text-size-adjust: 100%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-hr {
-  margin: 1rem 0;
-  color: inherit;
-  background-color: currentColor;
-  border: 0;
-  opacity: 0.25;
-}
-
-hr:not([size]) {
-  height: 1px;
-}
-
-h6, h5, h4, h3, h2, h1 {
-  margin-top: 0;
-  margin-bottom: 0.5rem;
-  font-weight: 500;
-  line-height: 1.2;
-}
-
-h1 {
-  font-size: calc(1.375rem + 1.5vw);
-}
-@media (min-width: 1200px) {
-  h1 {
-    font-size: 2.5rem;
-  }
-}
-
-h2 {
-  font-size: calc(1.325rem + 0.9vw);
-}
-@media (min-width: 1200px) {
-  h2 {
-    font-size: 2rem;
-  }
-}
-
-h3 {
-  font-size: calc(1.3rem + 0.6vw);
-}
-@media (min-width: 1200px) {
-  h3 {
-    font-size: 1.75rem;
-  }
-}
-
-h4 {
-  font-size: calc(1.275rem + 0.3vw);
-}
-@media (min-width: 1200px) {
-  h4 {
-    font-size: 1.5rem;
-  }
-}
-
-h5 {
-  font-size: 1.25rem;
-}
-
-h6 {
-  font-size: 1rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title],
-abbr[data-bs-original-title] {
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
-  cursor: help;
-  -webkit-text-decoration-skip-ink: none;
-  text-decoration-skip-ink: none;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul {
-  padding-left: 2rem;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: 700;
-}
-
-dd {
-  margin-bottom: 0.5rem;
-  margin-left: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-small {
-  font-size: 0.875em;
-}
-
-mark {
-  padding: 0.2em;
-  background-color: #fcf8e3;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 0.75em;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-a {
-  color: #0d6efd;
-  text-decoration: underline;
-}
-a:hover {
-  color: #0a58ca;
-}
-
-a:not([href]):not([class]), a:not([href]):not([class]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-pre,
-code,
-kbd,
-samp {
-  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  font-size: 1em;
-  direction: ltr /* rtl:ignore */;
-  unicode-bidi: bidi-override;
-}
-
-pre {
-  display: block;
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-  font-size: 0.875em;
-}
-pre code {
-  font-size: inherit;
-  color: inherit;
-  word-break: normal;
-}
-
-code {
-  font-size: 0.875em;
-  color: #d63384;
-  word-wrap: break-word;
-}
-a > code {
-  color: inherit;
-}
-
-kbd {
-  padding: 0.2rem 0.4rem;
-  font-size: 0.875em;
-  color: #fff;
-  background-color: #212529;
-  border-radius: 0.2rem;
-}
-kbd kbd {
-  padding: 0;
-  font-size: 1em;
-  font-weight: 700;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img,
-svg {
-  vertical-align: middle;
-}
-
-table {
-  caption-side: bottom;
-  border-collapse: collapse;
-}
-
-caption {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  color: #6c757d;
-  text-align: left;
-}
-
-th {
-  text-align: inherit;
-  text-align: -webkit-match-parent;
-}
-
-thead,
-tbody,
-tfoot,
-tr,
-td,
-th {
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-}
-
-label {
-  display: inline-block;
-}
-
-button {
-  border-radius: 0;
-}
-
-button:focus:not(:focus-visible) {
-  outline: 0;
-}
-
-input,
-button,
-select,
-optgroup,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-[role=button] {
-  cursor: pointer;
-}
-
-select {
-  word-wrap: normal;
-}
-select:disabled {
-  opacity: 1;
-}
-
-[list]::-webkit-calendar-picker-indicator {
-  display: none;
-}
-
-button,
-[type=button],
-[type=reset],
-[type=submit] {
-  -webkit-appearance: button;
-}
-button:not(:disabled),
-[type=button]:not(:disabled),
-[type=reset]:not(:disabled),
-[type=submit]:not(:disabled) {
-  cursor: pointer;
-}
-
-::-moz-focus-inner {
-  padding: 0;
-  border-style: none;
-}
-
-textarea {
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  float: left;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 0.5rem;
-  font-size: calc(1.275rem + 0.3vw);
-  line-height: inherit;
-}
-@media (min-width: 1200px) {
-  legend {
-    font-size: 1.5rem;
-  }
-}
-legend + * {
-  clear: left;
-}
-
-::-webkit-datetime-edit-fields-wrapper,
-::-webkit-datetime-edit-text,
-::-webkit-datetime-edit-minute,
-::-webkit-datetime-edit-hour-field,
-::-webkit-datetime-edit-day-field,
-::-webkit-datetime-edit-month-field,
-::-webkit-datetime-edit-year-field {
-  padding: 0;
-}
-
-::-webkit-inner-spin-button {
-  height: auto;
-}
-
-[type=search] {
-  outline-offset: -2px;
-  -webkit-appearance: textfield;
-}
-
-/* rtl:raw:
-[type="tel"],
-[type="url"],
-[type="email"],
-[type="number"] {
-  direction: ltr;
-}
-*/
-::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-color-swatch-wrapper {
-  padding: 0;
-}
-
-::file-selector-button {
-  font: inherit;
-}
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-output {
-  display: inline-block;
-}
-
-iframe {
-  border: 0;
-}
-
-summary {
-  display: list-item;
-  cursor: pointer;
-}
-
-progress {
-  vertical-align: baseline;
-}
-
-[hidden] {
-  display: none !important;
-}
-
-/*# sourceMappingURL=bootstrap-reboot.css.map */

AutomobilePlant/AutomobilePlantClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.min.css

@@ -1,8 +0,0 @@
-/*!
- * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
- * Copyright 2011-2021 The Bootstrap Authors
- * Copyright 2011-2021 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
- */*,::after,::before{box-sizing:border-box}@media (prefers-reduced-motion:no-preference){:root{scroll-behavior:smooth}}body{margin:0;font-family:var(--bs-body-font-family);font-size:var(--bs-body-font-size);font-weight:var(--bs-body-font-weight);line-height:var(--bs-body-line-height);color:var(--bs-body-color);text-align:var(--bs-body-text-align);background-color:var(--bs-body-bg);-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}hr{margin:1rem 0;color:inherit;background-color:currentColor;border:0;opacity:.25}hr:not([size]){height:1px}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2}h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){h1{font-size:2.5rem}}h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){h2{font-size:2rem}}h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){h3{font-size:1.75rem}}h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){h4{font-size:1.5rem}}h5{font-size:1.25rem}h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[data-bs-original-title],abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-left:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:.875em}mark{padding:.2em;background-color:#fcf8e3}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0d6efd;text-decoration:underline}a:hover{color:#0a58ca}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em;direction:ltr;unicode-bidi:bidi-override}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:#d63384;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:.875em;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:1em;font-weight:700}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:#6c757d;text-align:left}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}select:disabled{opacity:1}[list]::-webkit-calendar-picker-indicator{display:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:left;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:left}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::file-selector-button{font:inherit}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}
-/*# sourceMappingURL=bootstrap-reboot.min.css.map */

AutomobilePlant/AutomobilePlantClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.css

@@ -1,424 +0,0 @@
-/*!
- * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
- * Copyright 2011-2021 The Bootstrap Authors
- * Copyright 2011-2021 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
- */
-*,
-*::before,
-*::after {
-  box-sizing: border-box;
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  :root {
-    scroll-behavior: smooth;
-  }
-}
-
-body {
-  margin: 0;
-  font-family: var(--bs-body-font-family);
-  font-size: var(--bs-body-font-size);
-  font-weight: var(--bs-body-font-weight);
-  line-height: var(--bs-body-line-height);
-  color: var(--bs-body-color);
-  text-align: var(--bs-body-text-align);
-  background-color: var(--bs-body-bg);
-  -webkit-text-size-adjust: 100%;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-}
-
-hr {
-  margin: 1rem 0;
-  color: inherit;
-  background-color: currentColor;
-  border: 0;
-  opacity: 0.25;
-}
-
-hr:not([size]) {
-  height: 1px;
-}
-
-h6, h5, h4, h3, h2, h1 {
-  margin-top: 0;
-  margin-bottom: 0.5rem;
-  font-weight: 500;
-  line-height: 1.2;
-}
-
-h1 {
-  font-size: calc(1.375rem + 1.5vw);
-}
-@media (min-width: 1200px) {
-  h1 {
-    font-size: 2.5rem;
-  }
-}
-
-h2 {
-  font-size: calc(1.325rem + 0.9vw);
-}
-@media (min-width: 1200px) {
-  h2 {
-    font-size: 2rem;
-  }
-}
-
-h3 {
-  font-size: calc(1.3rem + 0.6vw);
-}
-@media (min-width: 1200px) {
-  h3 {
-    font-size: 1.75rem;
-  }
-}
-
-h4 {
-  font-size: calc(1.275rem + 0.3vw);
-}
-@media (min-width: 1200px) {
-  h4 {
-    font-size: 1.5rem;
-  }
-}
-
-h5 {
-  font-size: 1.25rem;
-}
-
-h6 {
-  font-size: 1rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title],
-abbr[data-bs-original-title] {
-  -webkit-text-decoration: underline dotted;
-  text-decoration: underline dotted;
-  cursor: help;
-  -webkit-text-decoration-skip-ink: none;
-  text-decoration-skip-ink: none;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul {
-  padding-right: 2rem;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: 700;
-}
-
-dd {
-  margin-bottom: 0.5rem;
-  margin-right: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-small {
-  font-size: 0.875em;
-}
-
-mark {
-  padding: 0.2em;
-  background-color: #fcf8e3;
-}
-
-sub,
-sup {
-  position: relative;
-  font-size: 0.75em;
-  line-height: 0;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-a {
-  color: #0d6efd;
-  text-decoration: underline;
-}
-a:hover {
-  color: #0a58ca;
-}
-
-a:not([href]):not([class]), a:not([href]):not([class]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-pre,
-code,
-kbd,
-samp {
-  font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
-  font-size: 1em;
-  direction: ltr ;
-  unicode-bidi: bidi-override;
-}
-
-pre {
-  display: block;
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-  font-size: 0.875em;
-}
-pre code {
-  font-size: inherit;
-  color: inherit;
-  word-break: normal;
-}
-
-code {
-  font-size: 0.875em;
-  color: #d63384;
-  word-wrap: break-word;
-}
-a > code {
-  color: inherit;
-}
-
-kbd {
-  padding: 0.2rem 0.4rem;
-  font-size: 0.875em;
-  color: #fff;
-  background-color: #212529;
-  border-radius: 0.2rem;
-}
-kbd kbd {
-  padding: 0;
-  font-size: 1em;
-  font-weight: 700;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img,
-svg {
-  vertical-align: middle;
-}
-
-table {
-  caption-side: bottom;
-  border-collapse: collapse;
-}
-
-caption {
-  padding-top: 0.5rem;
-  padding-bottom: 0.5rem;
-  color: #6c757d;
-  text-align: right;
-}
-
-th {
-  text-align: inherit;
-  text-align: -webkit-match-parent;
-}
-
-thead,
-tbody,
-tfoot,
-tr,
-td,
-th {
-  border-color: inherit;
-  border-style: solid;
-  border-width: 0;
-}
-
-label {
-  display: inline-block;
-}
-
-button {
-  border-radius: 0;
-}
-
-button:focus:not(:focus-visible) {
-  outline: 0;
-}
-
-input,
-button,
-select,
-optgroup,
-textarea {
-  margin: 0;
-  font-family: inherit;
-  font-size: inherit;
-  line-height: inherit;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-[role=button] {
-  cursor: pointer;
-}
-
-select {
-  word-wrap: normal;
-}
-select:disabled {
-  opacity: 1;
-}
-
-[list]::-webkit-calendar-picker-indicator {
-  display: none;
-}
-
-button,
-[type=button],
-[type=reset],
-[type=submit] {
-  -webkit-appearance: button;
-}
-button:not(:disabled),
-[type=button]:not(:disabled),
-[type=reset]:not(:disabled),
-[type=submit]:not(:disabled) {
-  cursor: pointer;
-}
-
-::-moz-focus-inner {
-  padding: 0;
-  border-style: none;
-}
-
-textarea {
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  float: right;
-  width: 100%;
-  padding: 0;
-  margin-bottom: 0.5rem;
-  font-size: calc(1.275rem + 0.3vw);
-  line-height: inherit;
-}
-@media (min-width: 1200px) {
-  legend {
-    font-size: 1.5rem;
-  }
-}
-legend + * {
-  clear: right;
-}
-
-::-webkit-datetime-edit-fields-wrapper,
-::-webkit-datetime-edit-text,
-::-webkit-datetime-edit-minute,
-::-webkit-datetime-edit-hour-field,
-::-webkit-datetime-edit-day-field,
-::-webkit-datetime-edit-month-field,
-::-webkit-datetime-edit-year-field {
-  padding: 0;
-}
-
-::-webkit-inner-spin-button {
-  height: auto;
-}
-
-[type=search] {
-  outline-offset: -2px;
-  -webkit-appearance: textfield;
-}
-
-[type="tel"],
-[type="url"],
-[type="email"],
-[type="number"] {
-  direction: ltr;
-}
-::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-color-swatch-wrapper {
-  padding: 0;
-}
-
-::file-selector-button {
-  font: inherit;
-}
-
-::-webkit-file-upload-button {
-  font: inherit;
-  -webkit-appearance: button;
-}
-
-output {
-  display: inline-block;
-}
-
-iframe {
-  border: 0;
-}
-
-summary {
-  display: list-item;
-  cursor: pointer;
-}
-
-progress {
-  vertical-align: baseline;
-}
-
-[hidden] {
-  display: none !important;
-}
-/*# sourceMappingURL=bootstrap-reboot.rtl.css.map */

AutomobilePlant/AutomobilePlantClientApp/wwwroot/lib/bootstrap/dist/css/bootstrap-reboot.rtl.min.css

@@ -1,8 +0,0 @@
-/*!
- * Bootstrap Reboot v5.1.0 (https://getbootstrap.com/)
- * Copyright 2011-2021 The Bootstrap Authors
- * Copyright 2011-2021 Twitter, Inc.
- * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
- * Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
- */*,::after,::before{box-sizing:border-box}@media (prefers-reduced-motion:no-preference){:root{scroll-behavior:smooth}}body{margin:0;font-family:var(--bs-body-font-family);font-size:var(--bs-body-font-size);font-weight:var(--bs-body-font-weight);line-height:var(--bs-body-line-height);color:var(--bs-body-color);text-align:var(--bs-body-text-align);background-color:var(--bs-body-bg);-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}hr{margin:1rem 0;color:inherit;background-color:currentColor;border:0;opacity:.25}hr:not([size]){height:1px}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem;font-weight:500;line-height:1.2}h1{font-size:calc(1.375rem + 1.5vw)}@media (min-width:1200px){h1{font-size:2.5rem}}h2{font-size:calc(1.325rem + .9vw)}@media (min-width:1200px){h2{font-size:2rem}}h3{font-size:calc(1.3rem + .6vw)}@media (min-width:1200px){h3{font-size:1.75rem}}h4{font-size:calc(1.275rem + .3vw)}@media (min-width:1200px){h4{font-size:1.5rem}}h5{font-size:1.25rem}h6{font-size:1rem}p{margin-top:0;margin-bottom:1rem}abbr[data-bs-original-title],abbr[title]{-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul{padding-right:2rem}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-right:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:.875em}mark{padding:.2em;background-color:#fcf8e3}sub,sup{position:relative;font-size:.75em;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#0d6efd;text-decoration:underline}a:hover{color:#0a58ca}a:not([href]):not([class]),a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em;direction:ltr;unicode-bidi:bidi-override}pre{display:block;margin-top:0;margin-bottom:1rem;overflow:auto;font-size:.875em}pre code{font-size:inherit;color:inherit;word-break:normal}code{font-size:.875em;color:#d63384;word-wrap:break-word}a>code{color:inherit}kbd{padding:.2rem .4rem;font-size:.875em;color:#fff;background-color:#212529;border-radius:.2rem}kbd kbd{padding:0;font-size:1em;font-weight:700}figure{margin:0 0 1rem}img,svg{vertical-align:middle}table{caption-side:bottom;border-collapse:collapse}caption{padding-top:.5rem;padding-bottom:.5rem;color:#6c757d;text-align:right}th{text-align:inherit;text-align:-webkit-match-parent}tbody,td,tfoot,th,thead,tr{border-color:inherit;border-style:solid;border-width:0}label{display:inline-block}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}select:disabled{opacity:1}[list]::-webkit-calendar-picker-indicator{display:none}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}::-moz-focus-inner{padding:0;border-style:none}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{float:right;width:100%;padding:0;margin-bottom:.5rem;font-size:calc(1.275rem + .3vw);line-height:inherit}@media (min-width:1200px){legend{font-size:1.5rem}}legend+*{clear:right}::-webkit-datetime-edit-day-field,::-webkit-datetime-edit-fields-wrapper,::-webkit-datetime-edit-hour-field,::-webkit-datetime-edit-minute,::-webkit-datetime-edit-month-field,::-webkit-datetime-edit-text,::-webkit-datetime-edit-year-field{padding:0}::-webkit-inner-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:textfield}[type=email],[type=number],[type=tel],[type=url]{direction:ltr}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-color-swatch-wrapper{padding:0}::file-selector-button{font:inherit}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}iframe{border:0}summary{display:list-item;cursor:pointer}progress{vertical-align:baseline}[hidden]{display:none!important}
-/*# sourceMappingURL=bootstrap-reboot.rtl.min.css.map */