Лабораторная 1

ProjectPublishing/ProjectPublishing/Forms/FormOrder.Designer.cs

@@ -30,14 +30,14 @@
         {
             groupBoxProduct = new GroupBox();
             dataGridViewProducts = new DataGridView();
-            ColumnProduct = new DataGridViewComboBoxColumn();
-            Column2 = new DataGridViewTextBoxColumn();
             labelClient = new Label();
             comboBoxClient = new ComboBox();
             buttonSave = new Button();
             buttonCancel = new Button();
             textBoxDescription = new TextBox();
             labelDescription = new Label();
+            ColumnProduct = new DataGridViewComboBoxColumn();
+            ColumnCount = new DataGridViewTextBoxColumn();
             groupBoxProduct.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridViewProducts).BeginInit();
             SuspendLayout();
@@ -60,7 +60,7 @@
             dataGridViewProducts.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right;
             dataGridViewProducts.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
             dataGridViewProducts.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewProducts.Columns.AddRange(new DataGridViewColumn[] { ColumnProduct, Column2 });
+            dataGridViewProducts.Columns.AddRange(new DataGridViewColumn[] { ColumnProduct, ColumnCount });
             dataGridViewProducts.Location = new Point(6, 22);
             dataGridViewProducts.MultiSelect = false;
             dataGridViewProducts.Name = "dataGridViewProducts";
@@ -69,16 +69,6 @@
             dataGridViewProducts.Size = new Size(265, 225);
             dataGridViewProducts.TabIndex = 0;
             // 
-            // ColumnProduct
-            // 
-            ColumnProduct.HeaderText = "Продукт";
-            ColumnProduct.Name = "ColumnProduct";
-            // 
-            // Column2
-            // 
-            Column2.HeaderText = "Количество";
-            Column2.Name = "Column2";
-            // 
             // labelClient
             // 
             labelClient.AutoSize = true;
@@ -134,6 +124,16 @@
             labelDescription.TabIndex = 6;
             labelDescription.Text = "Описание";
             // 
+            // ColumnProduct
+            // 
+            ColumnProduct.HeaderText = "Продукт";
+            ColumnProduct.Name = "ColumnProduct";
+            // 
+            // ColumnCount
+            // 
+            ColumnCount.HeaderText = "Количество";
+            ColumnCount.Name = "ColumnCount";
+            // 
             // FormOrder
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -163,9 +163,9 @@
         private ComboBox comboBoxClient;
         private DataGridView dataGridViewProducts;
         private Button buttonCancel;
-        private DataGridViewComboBoxColumn ColumnProduct;
-        private DataGridViewTextBoxColumn Column2;
         private TextBox textBoxDescription;
         private Label labelDescription;
+        private DataGridViewComboBoxColumn ColumnProduct;
+        private DataGridViewTextBoxColumn ColumnCount;
     }
 }

ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs

@@ -40,7 +40,7 @@ namespace ProjectPublishing.Forms
                     throw new Exception("Имеются незаполненные поля");
                 }
                 _orderRepository.CreateOrder(Order.CreateOperation(0,(int)comboBoxClient.SelectedValue!,
-                CreateListFeedFeedReplenishmentsFromDataGrid(), textBoxDescription.Text));
+                CreateListOrderProdutsFromDataGrid(), textBoxDescription.Text));
                 Close();
             }
             catch (Exception ex)
@@ -51,12 +51,12 @@ namespace ProjectPublishing.Forms
         }
         private void ButtonCancel_Click(object sender, EventArgs e) => Close();
         private List<OrderProduct>
-        CreateListFeedFeedReplenishmentsFromDataGrid()
+        CreateListOrderProdutsFromDataGrid()
         {
             var list = new List<OrderProduct>();
             foreach (DataGridViewRow row in dataGridViewProducts.Rows)
             {
-                if (row.Cells["ColumnFeed"].Value == null ||
+                if (row.Cells["ColumnProduct"].Value == null ||
                 row.Cells["ColumnCount"].Value == null)
                 {
                     continue;

ProjectPublishing/ProjectPublishing/Forms/FormOrder.resx

@@ -120,7 +120,7 @@
   <metadata name="ColumnProduct.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="Column2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="ColumnCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
 </root>