lab-1 done

ProjectPublishing/ProjectPublishing/Entities/Order.cs

@@ -24,9 +24,9 @@ namespace ProjectPublishing.Entities
 
         public int PrintingId { get; private set; }
 
-        public List<Material> Materials { get; private set; }
+        public List<OrderMaterials> Materials { get; private set; }
 
-        public static Order CreateOrder(int id, string description, ProductType productType, int amount, OrderStatus status, int customerId, int printingId, List<Material> materials)
+        public static Order CreateOrder(int id, string description, ProductType productType, int amount, OrderStatus status, int customerId, int printingId, List<OrderMaterials> materials)
         {
             return new Order { ProductType = productType, Id = id, Amount = amount, Status = status, CustomerId = customerId, PrintingId = printingId, Materials = materials, OrderDate = DateTime.Now, Description = description ?? string.Empty };
         }

ProjectPublishing/ProjectPublishing/Entities/OrderMaterials.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectPublishing.Entities
+{
+    public class OrderMaterials
+    {
+        public int OrderId { get; private set; }
+
+        public int MaterialsId { get; private set; }
+
+        public int Amount { get; private set; }
+
+        public static OrderMaterials Create(int orderId, int materials, int amount)
+        {
+            return new OrderMaterials
+            {
+                MaterialsId = materials,
+                OrderId = orderId,
+                Amount = amount
+            };
+        }
+    }
+}

ProjectPublishing/ProjectPublishing/Forms/FormOrder.Designer.cs

@@ -44,8 +44,8 @@
             comboBoxPrintingUD = new ComboBox();
             groupBox1 = new GroupBox();
             dataGridViewMaterials = new DataGridView();
-            columnMaterial = new DataGridViewTextBoxColumn();
             columnMaterialType = new DataGridViewComboBoxColumn();
+            columnMaterial = new DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)numericUpDownAmount).BeginInit();
             groupBox1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dataGridViewMaterials).BeginInit();
@@ -192,7 +192,7 @@
             // dataGridViewMaterials
             // 
             dataGridViewMaterials.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            dataGridViewMaterials.Columns.AddRange(new DataGridViewColumn[] { columnMaterial, columnMaterialType });
+            dataGridViewMaterials.Columns.AddRange(new DataGridViewColumn[] { columnMaterialType, columnMaterial });
             dataGridViewMaterials.Dock = DockStyle.Fill;
             dataGridViewMaterials.Location = new Point(3, 23);
             dataGridViewMaterials.Name = "dataGridViewMaterials";
@@ -200,20 +200,20 @@
             dataGridViewMaterials.Size = new Size(352, 166);
             dataGridViewMaterials.TabIndex = 0;
             // 
-            // columnMaterial
-            // 
-            columnMaterial.HeaderText = "Материал";
-            columnMaterial.MinimumWidth = 6;
-            columnMaterial.Name = "columnMaterial";
-            columnMaterial.Width = 125;
-            // 
             // columnMaterialType
             // 
-            columnMaterialType.HeaderText = "Тип";
+            columnMaterialType.HeaderText = "Материал";
             columnMaterialType.MinimumWidth = 6;
             columnMaterialType.Name = "columnMaterialType";
             columnMaterialType.Width = 125;
             // 
+            // columnMaterial
+            // 
+            columnMaterial.HeaderText = "Количество";
+            columnMaterial.MinimumWidth = 6;
+            columnMaterial.Name = "columnMaterial";
+            columnMaterial.Width = 125;
+            // 
             // FormOrder
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -262,7 +262,7 @@
         private ComboBox comboBoxPrintingUD;
         private GroupBox groupBox1;
         private DataGridView dataGridViewMaterials;
-        private DataGridViewTextBoxColumn columnMaterial;
         private DataGridViewComboBoxColumn columnMaterialType;
+        private DataGridViewTextBoxColumn columnMaterial;
     }
 }

ProjectPublishing/ProjectPublishing/Forms/FormOrder.cs

@@ -104,16 +104,16 @@ namespace ProjectPublishing.Forms
         //        (int)comboBoxMaterialsID.SelectedValue!
         //    );
 
-        private List<Material> CreateListFromDataGrid()
+        private List<OrderMaterials> CreateListFromDataGrid()
         {
-            var list = new List<Material>();
+            var list = new List<OrderMaterials>();
             foreach (DataGridViewRow row in dataGridViewMaterials.Rows)
             {
                 if (row.Cells["columnMaterial"].Value == null || row.Cells["columnMaterialType"].Value == null)
                 {
                     continue;
                 }
-                list.Add(Material.CreateMaterial(0, (string)row.Cells["columnMaterial"].Value, (MaterialType)row.Cells["columnMaterialType"].Value));
+                list.Add(OrderMaterials.Create(0, Convert.ToInt32(row.Cells["columnMaterial"].Value), Convert.ToInt32(row.Cells["columnMaterialType"].Value)));
             }
             return list;
         }

ProjectPublishing/ProjectPublishing/Forms/FormOrder.resx

@@ -117,16 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="columnMaterial.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="columnMaterialType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="columnMaterial.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="columnMaterialType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>