Лаб_5Revert "Лаб_4"

This reverts commit b8b6909759.

RenovationWork/RenovationWork/FormMain.Designer.cs

@@ -1,216 +1,216 @@
 namespace RenovationWorkView
 {
-    partial class FormMain
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
+	partial class FormMain
+	{
+		/// <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);
-        }
+		/// <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
+		#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()
-        {
-            menuStrip = new MenuStrip();
-            refbooksToolStripMenuItem = new ToolStripMenuItem();
-            componentsToolStripMenuItem = new ToolStripMenuItem();
-            JobTypeToolStripMenuItem = new ToolStripMenuItem();
-            отчетыToolStripMenuItem = new ToolStripMenuItem();
-            listComponentsToolStripMenuItem = new ToolStripMenuItem();
-            componentRepairsПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
-            OrdersToolStripMenuItem = new ToolStripMenuItem();
-            dataGridView = new DataGridView();
-            buttonCreateOrder = new Button();
-            buttonTakeOrderInWork = new Button();
-            buttonOrderReady = new Button();
-            buttonIssuedOrder = new Button();
-            buttonRef = new Button();
-            ClientsToolStripMenuItem = new ToolStripMenuItem();
-            menuStrip.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
-            SuspendLayout();
-            // 
-            // menuStrip
-            // 
-            menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, отчетыToolStripMenuItem });
-            menuStrip.Location = new Point(0, 0);
-            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(984, 24);
-            menuStrip.TabIndex = 0;
-            menuStrip.Text = "menuStrip1";
-            // 
-            // refbooksToolStripMenuItem
-            // 
-            refbooksToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, JobTypeToolStripMenuItem, ClientsToolStripMenuItem });
-            refbooksToolStripMenuItem.Name = "refbooksToolStripMenuItem";
-            refbooksToolStripMenuItem.Size = new Size(94, 20);
-            refbooksToolStripMenuItem.Text = "Справочники";
-            // 
-            // componentsToolStripMenuItem
-            // 
-            componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
-            componentsToolStripMenuItem.Size = new Size(180, 22);
-            componentsToolStripMenuItem.Text = "Компоненты";
-            componentsToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
-            // 
-            // JobTypeToolStripMenuItem
-            // 
-            JobTypeToolStripMenuItem.Name = "JobTypeToolStripMenuItem";
-            JobTypeToolStripMenuItem.Size = new Size(180, 22);
-            JobTypeToolStripMenuItem.Text = "Вид работы";
-            JobTypeToolStripMenuItem.Click += JobTypeToolStripMenuItem_Click;
-            // 
-            // отчетыToolStripMenuItem
-            // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { listComponentsToolStripMenuItem, componentRepairsПоИзделиямToolStripMenuItem, OrdersToolStripMenuItem });
-            отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
-            отчетыToolStripMenuItem.Size = new Size(60, 20);
-            отчетыToolStripMenuItem.Text = "Отчеты";
-            // 
-            // listComponentsToolStripMenuItem
-            // 
-            listComponentsToolStripMenuItem.Name = "listComponentsToolStripMenuItem";
-            listComponentsToolStripMenuItem.Size = new Size(218, 22);
-            listComponentsToolStripMenuItem.Text = "Список изделий";
-            listComponentsToolStripMenuItem.Click += listComponentsToolStripMenuItem_Click;
-            // 
-            // componentRepairsПоИзделиямToolStripMenuItem
-            // 
-            componentRepairsПоИзделиямToolStripMenuItem.Name = "componentRepairsПоИзделиямToolStripMenuItem";
-            componentRepairsПоИзделиямToolStripMenuItem.Size = new Size(218, 22);
-            componentRepairsПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям";
-            componentRepairsПоИзделиямToolStripMenuItem.Click += componentRepairsПоИзделиямToolStripMenuItem_Click;
-            // 
-            // OrdersToolStripMenuItem
-            // 
-            OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem";
-            OrdersToolStripMenuItem.Size = new Size(218, 22);
-            OrdersToolStripMenuItem.Text = "Список заказов";
-            OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
-            // 
-            // dataGridView
-            // 
-            dataGridView.BackgroundColor = SystemColors.ControlLightLight;
-            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Location = new Point(12, 27);
-            dataGridView.Name = "dataGridView";
-            dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(797, 341);
-            dataGridView.TabIndex = 1;
-            // 
-            // buttonCreateOrder
-            // 
-            buttonCreateOrder.Location = new Point(815, 42);
-            buttonCreateOrder.Name = "buttonCreateOrder";
-            buttonCreateOrder.Size = new Size(157, 23);
-            buttonCreateOrder.TabIndex = 2;
-            buttonCreateOrder.Text = "Создать заказ";
-            buttonCreateOrder.UseVisualStyleBackColor = true;
-            buttonCreateOrder.Click += buttonCreateOrder_Click;
-            // 
-            // buttonTakeOrderInWork
-            // 
-            buttonTakeOrderInWork.Location = new Point(815, 71);
-            buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
-            buttonTakeOrderInWork.Size = new Size(157, 23);
-            buttonTakeOrderInWork.TabIndex = 3;
-            buttonTakeOrderInWork.Text = "Отладить на выполнение";
-            buttonTakeOrderInWork.UseVisualStyleBackColor = true;
-            buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click;
-            // 
-            // buttonOrderReady
-            // 
-            buttonOrderReady.Location = new Point(815, 100);
-            buttonOrderReady.Name = "buttonOrderReady";
-            buttonOrderReady.Size = new Size(157, 23);
-            buttonOrderReady.TabIndex = 4;
-            buttonOrderReady.Text = "Заказ готов";
-            buttonOrderReady.UseVisualStyleBackColor = true;
-            buttonOrderReady.Click += buttonOrderReady_Click;
-            // 
-            // buttonIssuedOrder
-            // 
-            buttonIssuedOrder.Location = new Point(815, 129);
-            buttonIssuedOrder.Name = "buttonIssuedOrder";
-            buttonIssuedOrder.Size = new Size(157, 23);
-            buttonIssuedOrder.TabIndex = 5;
-            buttonIssuedOrder.Text = "Заказ выдан";
-            buttonIssuedOrder.UseVisualStyleBackColor = true;
-            buttonIssuedOrder.Click += buttonIssuedOrder_Click;
-            // 
-            // buttonRef
-            // 
-            buttonRef.Location = new Point(815, 158);
-            buttonRef.Name = "buttonRef";
-            buttonRef.Size = new Size(157, 23);
-            buttonRef.TabIndex = 6;
-            buttonRef.Text = "Обновить список";
-            buttonRef.UseVisualStyleBackColor = true;
-            buttonRef.Click += buttonRef_Click;
-            // 
-            // ClientsToolStripMenuItem
-            // 
-            ClientsToolStripMenuItem.Name = "ClientsToolStripMenuItem";
-            ClientsToolStripMenuItem.Size = new Size(180, 22);
-            ClientsToolStripMenuItem.Text = "Клиенты";
-            ClientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
-            // 
-            // FormMain
-            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
-            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(984, 370);
-            Controls.Add(buttonRef);
-            Controls.Add(buttonIssuedOrder);
-            Controls.Add(buttonOrderReady);
-            Controls.Add(buttonTakeOrderInWork);
-            Controls.Add(buttonCreateOrder);
-            Controls.Add(dataGridView);
-            Controls.Add(menuStrip);
-            MainMenuStrip = menuStrip;
-            Name = "FormMain";
-            Text = "Ремонтные работы";
-            Load += FormMain_Load;
-            menuStrip.ResumeLayout(false);
-            menuStrip.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
-            ResumeLayout(false);
-            PerformLayout();
-        }
+		/// <summary>
+		/// Required method for Designer support - do not modify
+		/// the contents of this method with the code editor.
+		/// </summary>
+		private void InitializeComponent()
+		{
+			menuStrip = new MenuStrip();
+			refbooksToolStripMenuItem = new ToolStripMenuItem();
+			componentsToolStripMenuItem = new ToolStripMenuItem();
+			JobTypeToolStripMenuItem = new ToolStripMenuItem();
+			ClientsToolStripMenuItem = new ToolStripMenuItem();
+			отчетыToolStripMenuItem = new ToolStripMenuItem();
+			listComponentsToolStripMenuItem = new ToolStripMenuItem();
+			componentRepairsПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
+			OrdersToolStripMenuItem = new ToolStripMenuItem();
+			dataGridView = new DataGridView();
+			buttonCreateOrder = new Button();
+			buttonTakeOrderInWork = new Button();
+			buttonOrderReady = new Button();
+			buttonIssuedOrder = new Button();
+			buttonRef = new Button();
+			menuStrip.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+			SuspendLayout();
+			// 
+			// menuStrip
+			// 
+			menuStrip.Items.AddRange(new ToolStripItem[] { refbooksToolStripMenuItem, отчетыToolStripMenuItem });
+			menuStrip.Location = new Point(0, 0);
+			menuStrip.Name = "menuStrip";
+			menuStrip.Size = new Size(1028, 24);
+			menuStrip.TabIndex = 0;
+			menuStrip.Text = "menuStrip1";
+			// 
+			// refbooksToolStripMenuItem
+			// 
+			refbooksToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsToolStripMenuItem, JobTypeToolStripMenuItem, ClientsToolStripMenuItem });
+			refbooksToolStripMenuItem.Name = "refbooksToolStripMenuItem";
+			refbooksToolStripMenuItem.Size = new Size(94, 20);
+			refbooksToolStripMenuItem.Text = "Справочники";
+			// 
+			// componentsToolStripMenuItem
+			// 
+			componentsToolStripMenuItem.Name = "componentsToolStripMenuItem";
+			componentsToolStripMenuItem.Size = new Size(145, 22);
+			componentsToolStripMenuItem.Text = "Компоненты";
+			componentsToolStripMenuItem.Click += componentsToolStripMenuItem_Click;
+			// 
+			// JobTypeToolStripMenuItem
+			// 
+			JobTypeToolStripMenuItem.Name = "JobTypeToolStripMenuItem";
+			JobTypeToolStripMenuItem.Size = new Size(145, 22);
+			JobTypeToolStripMenuItem.Text = "Вид работы";
+			JobTypeToolStripMenuItem.Click += JobTypeToolStripMenuItem_Click;
+			// 
+			// ClientsToolStripMenuItem
+			// 
+			ClientsToolStripMenuItem.Name = "ClientsToolStripMenuItem";
+			ClientsToolStripMenuItem.Size = new Size(145, 22);
+			ClientsToolStripMenuItem.Text = "Клиенты";
+			ClientsToolStripMenuItem.Click += ClientsToolStripMenuItem_Click;
+			// 
+			// отчетыToolStripMenuItem
+			// 
+			отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { listComponentsToolStripMenuItem, componentRepairsПоИзделиямToolStripMenuItem, OrdersToolStripMenuItem });
+			отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+			отчетыToolStripMenuItem.Size = new Size(60, 20);
+			отчетыToolStripMenuItem.Text = "Отчеты";
+			// 
+			// listComponentsToolStripMenuItem
+			// 
+			listComponentsToolStripMenuItem.Name = "listComponentsToolStripMenuItem";
+			listComponentsToolStripMenuItem.Size = new Size(218, 22);
+			listComponentsToolStripMenuItem.Text = "Список изделий";
+			listComponentsToolStripMenuItem.Click += listComponentsToolStripMenuItem_Click;
+			// 
+			// componentRepairsПоИзделиямToolStripMenuItem
+			// 
+			componentRepairsПоИзделиямToolStripMenuItem.Name = "componentRepairsПоИзделиямToolStripMenuItem";
+			componentRepairsПоИзделиямToolStripMenuItem.Size = new Size(218, 22);
+			componentRepairsПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям";
+			componentRepairsПоИзделиямToolStripMenuItem.Click += componentRepairsПоИзделиямToolStripMenuItem_Click;
+			// 
+			// OrdersToolStripMenuItem
+			// 
+			OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem";
+			OrdersToolStripMenuItem.Size = new Size(218, 22);
+			OrdersToolStripMenuItem.Text = "Список заказов";
+			OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click;
+			// 
+			// dataGridView
+			// 
+			dataGridView.BackgroundColor = SystemColors.ControlLightLight;
+			dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+			dataGridView.Location = new Point(12, 27);
+			dataGridView.Name = "dataGridView";
+			dataGridView.RowTemplate.Height = 25;
+			dataGridView.Size = new Size(853, 341);
+			dataGridView.TabIndex = 1;
+			// 
+			// buttonCreateOrder
+			// 
+			buttonCreateOrder.Location = new Point(871, 42);
+			buttonCreateOrder.Name = "buttonCreateOrder";
+			buttonCreateOrder.Size = new Size(157, 23);
+			buttonCreateOrder.TabIndex = 2;
+			buttonCreateOrder.Text = "Создать заказ";
+			buttonCreateOrder.UseVisualStyleBackColor = true;
+			buttonCreateOrder.Click += buttonCreateOrder_Click;
+			// 
+			// buttonTakeOrderInWork
+			// 
+			buttonTakeOrderInWork.Location = new Point(871, 71);
+			buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
+			buttonTakeOrderInWork.Size = new Size(157, 23);
+			buttonTakeOrderInWork.TabIndex = 3;
+			buttonTakeOrderInWork.Text = "Отладить на выполнение";
+			buttonTakeOrderInWork.UseVisualStyleBackColor = true;
+			buttonTakeOrderInWork.Click += buttonTakeOrderInWork_Click;
+			// 
+			// buttonOrderReady
+			// 
+			buttonOrderReady.Location = new Point(871, 100);
+			buttonOrderReady.Name = "buttonOrderReady";
+			buttonOrderReady.Size = new Size(157, 23);
+			buttonOrderReady.TabIndex = 4;
+			buttonOrderReady.Text = "Заказ готов";
+			buttonOrderReady.UseVisualStyleBackColor = true;
+			buttonOrderReady.Click += buttonOrderReady_Click;
+			// 
+			// buttonIssuedOrder
+			// 
+			buttonIssuedOrder.Location = new Point(871, 129);
+			buttonIssuedOrder.Name = "buttonIssuedOrder";
+			buttonIssuedOrder.Size = new Size(157, 23);
+			buttonIssuedOrder.TabIndex = 5;
+			buttonIssuedOrder.Text = "Заказ выдан";
+			buttonIssuedOrder.UseVisualStyleBackColor = true;
+			buttonIssuedOrder.Click += buttonIssuedOrder_Click;
+			// 
+			// buttonRef
+			// 
+			buttonRef.Location = new Point(871, 158);
+			buttonRef.Name = "buttonRef";
+			buttonRef.Size = new Size(157, 23);
+			buttonRef.TabIndex = 6;
+			buttonRef.Text = "Обновить список";
+			buttonRef.UseVisualStyleBackColor = true;
+			buttonRef.Click += buttonRef_Click;
+			// 
+			// FormMain
+			// 
+			AutoScaleDimensions = new SizeF(7F, 15F);
+			AutoScaleMode = AutoScaleMode.Font;
+			ClientSize = new Size(1028, 370);
+			Controls.Add(buttonRef);
+			Controls.Add(buttonIssuedOrder);
+			Controls.Add(buttonOrderReady);
+			Controls.Add(buttonTakeOrderInWork);
+			Controls.Add(buttonCreateOrder);
+			Controls.Add(dataGridView);
+			Controls.Add(menuStrip);
+			MainMenuStrip = menuStrip;
+			Name = "FormMain";
+			Text = "Ремонтные работы";
+			Load += FormMain_Load;
+			menuStrip.ResumeLayout(false);
+			menuStrip.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+			ResumeLayout(false);
+			PerformLayout();
+		}
 
-        #endregion
+		#endregion
 
-        private MenuStrip menuStrip;
-        private ToolStripMenuItem refbooksToolStripMenuItem;
-        private ToolStripMenuItem componentsToolStripMenuItem;
-        private ToolStripMenuItem JobTypeToolStripMenuItem;
-        private DataGridView dataGridView;
-        private Button buttonCreateOrder;
-        private Button buttonTakeOrderInWork;
-        private Button buttonOrderReady;
-        private Button buttonIssuedOrder;
-        private Button buttonRef;
-        private ToolStripMenuItem отчетыToolStripMenuItem;
-        private ToolStripMenuItem listComponentsToolStripMenuItem;
-        private ToolStripMenuItem componentRepairsПоИзделиямToolStripMenuItem;
-        private ToolStripMenuItem OrdersToolStripMenuItem;
-        private ToolStripMenuItem ClientsToolStripMenuItem;
-    }
+		private MenuStrip menuStrip;
+		private ToolStripMenuItem refbooksToolStripMenuItem;
+		private ToolStripMenuItem componentsToolStripMenuItem;
+		private ToolStripMenuItem JobTypeToolStripMenuItem;
+		private DataGridView dataGridView;
+		private Button buttonCreateOrder;
+		private Button buttonTakeOrderInWork;
+		private Button buttonOrderReady;
+		private Button buttonIssuedOrder;
+		private Button buttonRef;
+		private ToolStripMenuItem отчетыToolStripMenuItem;
+		private ToolStripMenuItem listComponentsToolStripMenuItem;
+		private ToolStripMenuItem componentRepairsПоИзделиямToolStripMenuItem;
+		private ToolStripMenuItem OrdersToolStripMenuItem;
+		private ToolStripMenuItem ClientsToolStripMenuItem;
+	}
 }

RenovationWork/RenovationWork/FormMain.cs

@@ -10,195 +10,194 @@ using System.Windows.Forms;
 using RenovationWorkContracts.BindingModels;
 using RenovationWorkContracts.BusinessLogicsContracts;
 using Microsoft.Extensions.Logging;
-using RenovationWorkBusinessLogic.BusinessLogics;
 
 namespace RenovationWorkView
 {
-    public partial class FormMain : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IOrderLogic _orderLogic;
-        private readonly IReportLogic _reportLogic;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _orderLogic = orderLogic;
-            _reportLogic = reportLogic;
-        }
+	public partial class FormMain : Form
+	{
+		private readonly ILogger _logger;
+		private readonly IOrderLogic _orderLogic;
+		private readonly IReportLogic _reportLogic;
+		public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
+		{
+			InitializeComponent();
+			_logger = logger;
+			_orderLogic = orderLogic;
+			_reportLogic = reportLogic;
+		}
 
-        private void FormMain_Load(object sender, EventArgs e)
-        {
-            LoadData();
-        }
-        private void LoadData()
-        {
-            _logger.LogInformation("Загрузка заказов");
-            try
-            {
-                var list = _orderLogic.ReadList(null);
-                if (list != null)
-                {
-                    dataGridView.DataSource = list;
-                    dataGridView.Columns["RepairId"].Visible = false;
-                    dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-                    dataGridView.Columns["ClientId"].Visible = false;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки заказов");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
+		private void FormMain_Load(object sender, EventArgs e)
+		{
+			LoadData();
+		}
+		private void LoadData()
+		{
+			_logger.LogInformation("Загрузка заказов");
+			try
+			{
+				var list = _orderLogic.ReadList(null);
+				if (list != null)
+				{
+					dataGridView.DataSource = list;
+					dataGridView.Columns["RepairId"].Visible = false;
+					dataGridView.Columns["RepairName"].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+					dataGridView.Columns["ClientId"].Visible = false;
+				}
+			}
+			catch (Exception ex)
+			{
+				_logger.LogError(ex, "Ошибка загрузки заказов");
+				MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+			}
+		}
 
-        private void componentsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
-            if (service is FormComponents form)
-            {
-                form.ShowDialog();
-            }
-        }
+		private void componentsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormComponents));
+			if (service is FormComponents form)
+			{
+				form.ShowDialog();
+			}
+		}
 
-        private void JobTypeToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormRepairs));
-            if (service is FormRepairs form)
-            {
-                form.ShowDialog();
-            }
-        }
+		private void JobTypeToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormRepairs));
+			if (service is FormRepairs form)
+			{
+				form.ShowDialog();
+			}
+		}
 
-        private void buttonCreateOrder_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
-            if (service is FormCreateOrder form)
-            {
-                form.ShowDialog();
-                LoadData();
-            }
-        }
+		private void buttonCreateOrder_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormCreateOrder));
+			if (service is FormCreateOrder form)
+			{
+				form.ShowDialog();
+				LoadData();
+			}
+		}
 
-        private void buttonTakeOrderInWork_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 buttonTakeOrderInWork_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 buttonOrderReady_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.FinishOrder(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 buttonOrderReady_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.FinishOrder(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 buttonIssuedOrder_Click(object sender, EventArgs e)
-        {
-            if (dataGridView.SelectedRows.Count == 1)
-            {
-                int id =
-               Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
-                _logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id);
-                try
-                {
-                    var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id });
-                    if (!operationResult)
-                    {
-                        throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
-                    }
-                    _logger.LogInformation("Заказ №{id} выдан", id);
-                    LoadData();
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка отметки о выдачи заказа");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
+		private void buttonIssuedOrder_Click(object sender, EventArgs e)
+		{
+			if (dataGridView.SelectedRows.Count == 1)
+			{
+				int id =
+			   Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Id"].Value);
+				_logger.LogInformation("Заказ №{id}. Меняется статус на 'Выдан'", id);
+				try
+				{
+					var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel { Id = id });
+					if (!operationResult)
+					{
+						throw new Exception("Ошибка при сохранении. Дополнительная информация в логах.");
+					}
+					_logger.LogInformation("Заказ №{id} выдан", id);
+					LoadData();
+				}
+				catch (Exception ex)
+				{
+					_logger.LogError(ex, "Ошибка отметки о выдачи заказа");
+					MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+				}
+			}
+		}
 
-        private void buttonRef_Click(object sender, EventArgs e)
-        {
-            LoadData();
-        }
+		private void buttonRef_Click(object sender, EventArgs e)
+		{
+			LoadData();
+		}
 
-        private void listComponentsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                _reportLogic.SaveRepairsToWordFile(new ReportBindingModel
-                {
-                    FileName = dialog.FileName
-                });
-                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
-               MessageBoxIcon.Information);
-            }
-        }
+		private void listComponentsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+			if (dialog.ShowDialog() == DialogResult.OK)
+			{
+				_reportLogic.SaveRepairsToWordFile(new ReportBindingModel
+				{
+					FileName = dialog.FileName
+				});
+				MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK,
+			   MessageBoxIcon.Information);
+			}
+		}
 
-        private void componentRepairsПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents));
-            if (service is FormReportRepairComponents form)
-            {
-                form.ShowDialog();
-            }
-        }
+		private void componentRepairsПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportRepairComponents));
+			if (service is FormReportRepairComponents form)
+			{
+				form.ShowDialog();
+			}
+		}
 
-        private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
-            if (service is FormReportOrders form)
-            {
-                form.ShowDialog();
-            }
-        }
+		private void OrdersToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+			if (service is FormReportOrders form)
+			{
+				form.ShowDialog();
+			}
+		}
 
-        private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            var service = Program.ServiceProvider?.GetService(typeof(FormClients));
-            if (service is FormClients form)
-            {
-                form.ShowDialog();
-            }
-        }
-    }
+		private void ClientsToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			var service = Program.ServiceProvider?.GetService(typeof(FormClients));
+			if (service is FormClients form)
+			{
+				form.ShowDialog();
+			}
+		}
+	}
 }
 

RenovationWork/RenovationWorkRestApi/Controllers/MainController.cs

@@ -44,7 +44,7 @@ namespace RenovationWorkRestApi.Controllers
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка получения кузнечного изделия по id={Id}", repairId);
+                _logger.LogError(ex, "Ошибка получения ремонтного изделия по id={Id}", repairId);
                 throw;
             }
         }