From d65bacd14b518983aac1d9390b325c73f2b60969 Mon Sep 17 00:00:00 2001
From: Zakharov_Rostislav <r.z.8102.80@gmail.com>
Date: Fri, 5 Apr 2024 12:31:32 +0400
Subject: [PATCH] lab-4 preparing for pr

---
 ...ormReportManufactureComponents.Designer.cs | 45 ++++++++---------
 .../FormReportManufactureComponents.cs        |  8 +--
 .../FormReportManufactureComponents.resx      | 50 +++++++++----------
 3 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs
index 57f6088..89f4ace 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs
@@ -30,8 +30,8 @@
         {
             dataGridView = new DataGridView();
             SaveButton = new Button();
-            ComponentColumn = new DataGridViewTextBoxColumn();
             ManufactureColumn = new DataGridViewTextBoxColumn();
+            ComponentColumn = new DataGridViewTextBoxColumn();
             CountColumn = new DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
             SuspendLayout();
@@ -39,39 +39,37 @@
             // dataGridView
             // 
             dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentColumn, ManufactureColumn, CountColumn });
-            dataGridView.Location = new Point(14, 61);
-            dataGridView.Margin = new Padding(3, 4, 3, 4);
+            dataGridView.Columns.AddRange(new DataGridViewColumn[] { ManufactureColumn, ComponentColumn, CountColumn });
+            dataGridView.Location = new Point(12, 46);
             dataGridView.Name = "dataGridView";
             dataGridView.RowHeadersWidth = 51;
             dataGridView.RowTemplate.Height = 25;
-            dataGridView.Size = new Size(651, 523);
+            dataGridView.Size = new Size(570, 392);
             dataGridView.TabIndex = 0;
             // 
             // SaveButton
             // 
-            SaveButton.Location = new Point(14, 23);
-            SaveButton.Margin = new Padding(3, 4, 3, 4);
+            SaveButton.Location = new Point(12, 17);
             SaveButton.Name = "SaveButton";
-            SaveButton.Size = new Size(193, 31);
+            SaveButton.Size = new Size(169, 23);
             SaveButton.TabIndex = 1;
             SaveButton.Text = "Сохранить в Excel";
             SaveButton.UseVisualStyleBackColor = true;
             SaveButton.Click += SaveButton_Click;
             // 
-            // ComponentColumn
-            // 
-            ComponentColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
-            ComponentColumn.HeaderText = "Компьютер";
-            ComponentColumn.MinimumWidth = 6;
-            ComponentColumn.Name = "ComponentColumn";
-            // 
             // ManufactureColumn
             // 
-            ManufactureColumn.HeaderText = "Компонент";
+            ManufactureColumn.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill;
+            ManufactureColumn.HeaderText = "Кузнечное изделие";
             ManufactureColumn.MinimumWidth = 6;
             ManufactureColumn.Name = "ManufactureColumn";
-            ManufactureColumn.Width = 200;
+            // 
+            // ComponentColumn
+            // 
+            ComponentColumn.HeaderText = "Компонент";
+            ComponentColumn.MinimumWidth = 6;
+            ComponentColumn.Name = "ComponentColumn";
+            ComponentColumn.Width = 200;
             // 
             // CountColumn
             // 
@@ -80,16 +78,15 @@
             CountColumn.Name = "CountColumn";
             CountColumn.Width = 130;
             // 
-            // FormReportManufactureComponents
+            // FormReportManufacturesComponents
             // 
-            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleDimensions = new SizeF(7F, 15F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(679, 600);
+            ClientSize = new Size(594, 450);
             Controls.Add(SaveButton);
             Controls.Add(dataGridView);
-            Margin = new Padding(3, 4, 3, 4);
-            Name = "FormReportManufactureComponents";
-            Text = "Компоненты по компьютерам";
+            Name = "FormReportManufacturesComponents";
+            Text = "Компоненты по кузнечным изделиям";
             Load += ReportManufactureComponentForm_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
             ResumeLayout(false);
@@ -99,8 +96,8 @@
 
         private DataGridView dataGridView;
         private Button SaveButton;
-        private DataGridViewTextBoxColumn ComponentColumn;
         private DataGridViewTextBoxColumn ManufactureColumn;
+        private DataGridViewTextBoxColumn ComponentColumn;
         private DataGridViewTextBoxColumn CountColumn;
     }
 }
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs
index 5e4b0d9..5d3b796 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs
@@ -44,11 +44,11 @@ namespace BlacksmithWorkshop
                         dataGridView.Rows.Add(Array.Empty<object>());
                     }
                 }
-                _logger.LogInformation("Загрузка списка компьютеров по компонентам");
+                _logger.LogInformation("Загрузка списка компонентов по кузнечным изделиям");
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Ошибка загрузки списка компьютеров по компонентам");
+                _logger.LogError(ex, "Ошибка загрузки списка компонентов по кузнечным изделиям");
                 MessageBox.Show(
                     ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
@@ -70,12 +70,12 @@ namespace BlacksmithWorkshop
                     {
                         FileName = dialog.FileName
                     });
-                    _logger.LogInformation("Сохранение списка компьютеров по компонентам");
+                    _logger.LogInformation("Сохранение списка компонентов по кузнечным изделиям");
                     MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
                 catch (Exception ex)
                 {
-                    _logger.LogError(ex, "Ошибка сохранения списка компьютеров по компонентам");
+                    _logger.LogError(ex, "Ошибка сохранения списка компонентов по кузнечным изделиям");
                     MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
                 }
             }
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.resx
index 1af7de1..af32865 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.resx
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.resx
@@ -1,17 +1,17 @@
 <?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 
+
+    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>
@@ -26,36 +26,36 @@
         <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 
+
+    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 
+
+    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 
+
+    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 
+
+    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 
+    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 
+    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 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->