diff --git a/Confectionery/ConfectioneryFileImplement/Order.cs b/Confectionery/ConfectioneryFileImplement/Order.cs
index 26a2c15..37c036e 100644
--- a/Confectionery/ConfectioneryFileImplement/Order.cs
+++ b/Confectionery/ConfectioneryFileImplement/Order.cs
@@ -9,6 +9,7 @@ namespace ConfectioneryFileImplement.Models
public class Order : IOrderModel
{
public int Id { get; private set; }
+ public int ClientId { get; private set; }
public int PastryId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
diff --git a/Confectionery/ConfectioneryListImplement/Order.cs b/Confectionery/ConfectioneryListImplement/Order.cs
index 6076de8..0fe5af5 100644
--- a/Confectionery/ConfectioneryListImplement/Order.cs
+++ b/Confectionery/ConfectioneryListImplement/Order.cs
@@ -14,6 +14,7 @@ namespace ConfectioneryListImplement.Models
{
public int Id { get; private set; }
public int PastryId { get; private set; }
+ public int ClientId { get; private set; }
public int Count { get; private set; }
public double Sum { get; private set; }
public OrderStatus Status { get; private set; } = OrderStatus.Неизвестен;
diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs
index 9d730d6..f99849b 100644
--- a/Confectionery/ConfectioneryView/FormMain.Designer.cs
+++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs
@@ -53,7 +53,7 @@
dataGridView.Location = new Point(12, 60);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersWidth = 62;
- dataGridView.Size = new Size(1068, 549);
+ dataGridView.Size = new Size(1374, 549);
dataGridView.TabIndex = 0;
//
// menuStrip
@@ -62,7 +62,7 @@
menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem });
menuStrip.Location = new Point(0, 0);
menuStrip.Name = "menuStrip";
- menuStrip.Size = new Size(1375, 33);
+ menuStrip.Size = new Size(1666, 33);
menuStrip.TabIndex = 1;
menuStrip.Text = "menuStrip1";
//
@@ -118,7 +118,7 @@
// buttonCreateOrder
//
buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- buttonCreateOrder.Location = new Point(1111, 83);
+ buttonCreateOrder.Location = new Point(1402, 83);
buttonCreateOrder.Name = "buttonCreateOrder";
buttonCreateOrder.Size = new Size(232, 34);
buttonCreateOrder.TabIndex = 2;
@@ -129,7 +129,7 @@
// buttonTakeOrderInWork
//
buttonTakeOrderInWork.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- buttonTakeOrderInWork.Location = new Point(1111, 143);
+ buttonTakeOrderInWork.Location = new Point(1402, 143);
buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
buttonTakeOrderInWork.Size = new Size(232, 34);
buttonTakeOrderInWork.TabIndex = 3;
@@ -140,7 +140,7 @@
// buttonOrderReady
//
buttonOrderReady.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- buttonOrderReady.Location = new Point(1111, 203);
+ buttonOrderReady.Location = new Point(1402, 203);
buttonOrderReady.Name = "buttonOrderReady";
buttonOrderReady.Size = new Size(232, 34);
buttonOrderReady.TabIndex = 4;
@@ -151,7 +151,7 @@
// buttonIssuedOrder
//
buttonIssuedOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- buttonIssuedOrder.Location = new Point(1111, 266);
+ buttonIssuedOrder.Location = new Point(1402, 266);
buttonIssuedOrder.Name = "buttonIssuedOrder";
buttonIssuedOrder.Size = new Size(232, 34);
buttonIssuedOrder.TabIndex = 5;
@@ -162,7 +162,7 @@
// buttonRef
//
buttonRef.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- buttonRef.Location = new Point(1111, 329);
+ buttonRef.Location = new Point(1402, 329);
buttonRef.Name = "buttonRef";
buttonRef.Size = new Size(232, 34);
buttonRef.TabIndex = 6;
@@ -174,7 +174,7 @@
//
AutoScaleDimensions = new SizeF(10F, 25F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(1375, 621);
+ ClientSize = new Size(1666, 621);
Controls.Add(buttonRef);
Controls.Add(buttonIssuedOrder);
Controls.Add(buttonOrderReady);
diff --git a/Confectionery/ConfectioneryView/FormMain.resx b/Confectionery/ConfectioneryView/FormMain.resx
index 6c82d08..e527639 100644
--- a/Confectionery/ConfectioneryView/FormMain.resx
+++ b/Confectionery/ConfectioneryView/FormMain.resx
@@ -120,4 +120,7 @@
17, 17
+
+ 25
+
\ No newline at end of file