From dab418442b4facef6db410b1f6834582d1ade19f Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin>
Date: Sun, 7 Apr 2024 00:27:02 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=B0=205=20=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=20=D0=B4=D0=BB=D1=8F=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SushiBar/FormClients.Designer.cs          |  4 ++++
 SushiBar/FormMain.Designer.cs             | 16 ++++++++--------
 SushiBar/FormMain.resx                    |  2 +-
 SushiBarDatabaseImplement/Models/Order.cs |  1 +
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/SushiBar/FormClients.Designer.cs b/SushiBar/FormClients.Designer.cs
index 1aa21a4..edf9a48 100644
--- a/SushiBar/FormClients.Designer.cs
+++ b/SushiBar/FormClients.Designer.cs
@@ -41,6 +41,7 @@
             dataGridView.Dock = DockStyle.Left;
             dataGridView.Location = new Point(0, 0);
             dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersVisible = false;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.Size = new Size(615, 450);
             dataGridView.TabIndex = 0;
@@ -53,6 +54,7 @@
             buttonRefresh.TabIndex = 1;
             buttonRefresh.Text = "Обновить";
             buttonRefresh.UseVisualStyleBackColor = true;
+            buttonRefresh.Click += buttonRefresh_Click;
             // 
             // buttonDelete
             // 
@@ -62,6 +64,7 @@
             buttonDelete.TabIndex = 2;
             buttonDelete.Text = "Удалить";
             buttonDelete.UseVisualStyleBackColor = true;
+            buttonDelete.Click += buttonDelete_Click;
             // 
             // FormClients
             // 
@@ -74,6 +77,7 @@
             Controls.Add(dataGridView);
             Name = "FormClients";
             Text = "FormClients";
+            Load += FormClients_Load;
             ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
             ResumeLayout(false);
         }
diff --git a/SushiBar/FormMain.Designer.cs b/SushiBar/FormMain.Designer.cs
index 31b3a22..3c5c0e7 100644
--- a/SushiBar/FormMain.Designer.cs
+++ b/SushiBar/FormMain.Designer.cs
@@ -53,7 +53,7 @@
             menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef, отчетыToolStripMenuItem, клиентыToolStripMenuItem });
             menuStrip1.Location = new Point(0, 0);
             menuStrip1.Name = "menuStrip1";
-            menuStrip1.Size = new Size(1140, 28);
+            menuStrip1.Size = new Size(1268, 28);
             menuStrip1.TabIndex = 0;
             menuStrip1.Text = "menuStrip1";
             // 
@@ -122,12 +122,12 @@
             dataGridView.RowHeadersVisible = false;
             dataGridView.RowHeadersWidth = 51;
             dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(849, 512);
+            dataGridView.Size = new Size(1001, 512);
             dataGridView.TabIndex = 1;
             // 
             // buttonCreateOrder
             // 
-            buttonCreateOrder.Location = new Point(923, 63);
+            buttonCreateOrder.Location = new Point(1054, 62);
             buttonCreateOrder.Name = "buttonCreateOrder";
             buttonCreateOrder.Size = new Size(171, 52);
             buttonCreateOrder.TabIndex = 2;
@@ -137,7 +137,7 @@
             // 
             // buttonTakeOrderInWork
             // 
-            buttonTakeOrderInWork.Location = new Point(923, 161);
+            buttonTakeOrderInWork.Location = new Point(1054, 160);
             buttonTakeOrderInWork.Name = "buttonTakeOrderInWork";
             buttonTakeOrderInWork.Size = new Size(171, 52);
             buttonTakeOrderInWork.TabIndex = 3;
@@ -147,7 +147,7 @@
             // 
             // buttonOrderReady
             // 
-            buttonOrderReady.Location = new Point(923, 253);
+            buttonOrderReady.Location = new Point(1054, 252);
             buttonOrderReady.Name = "buttonOrderReady";
             buttonOrderReady.Size = new Size(171, 52);
             buttonOrderReady.TabIndex = 4;
@@ -157,7 +157,7 @@
             // 
             // buttonOrderIssued
             // 
-            buttonOrderIssued.Location = new Point(923, 351);
+            buttonOrderIssued.Location = new Point(1054, 350);
             buttonOrderIssued.Name = "buttonOrderIssued";
             buttonOrderIssued.Size = new Size(171, 52);
             buttonOrderIssued.TabIndex = 5;
@@ -167,7 +167,7 @@
             // 
             // buttonRefreshOrders
             // 
-            buttonRefreshOrders.Location = new Point(923, 450);
+            buttonRefreshOrders.Location = new Point(1054, 449);
             buttonRefreshOrders.Name = "buttonRefreshOrders";
             buttonRefreshOrders.Size = new Size(171, 52);
             buttonRefreshOrders.TabIndex = 6;
@@ -179,7 +179,7 @@
             AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
             BackColor = Color.FromArgb(210, 255, 210);
-            ClientSize = new Size(1140, 540);
+            ClientSize = new Size(1268, 540);
             Controls.Add(buttonRefreshOrders);
             Controls.Add(buttonOrderIssued);
             Controls.Add(buttonOrderReady);
diff --git a/SushiBar/FormMain.resx b/SushiBar/FormMain.resx
index d13a6eb..918f9fe 100644
--- a/SushiBar/FormMain.resx
+++ b/SushiBar/FormMain.resx
@@ -121,6 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>146</value>
+    <value>30</value>
   </metadata>
 </root>
\ No newline at end of file
diff --git a/SushiBarDatabaseImplement/Models/Order.cs b/SushiBarDatabaseImplement/Models/Order.cs
index ce91751..65934ee 100644
--- a/SushiBarDatabaseImplement/Models/Order.cs
+++ b/SushiBarDatabaseImplement/Models/Order.cs
@@ -65,6 +65,7 @@ namespace SushiBarDatabaseImplement.Models
         {
             Id = Id,
             SushiId = SushiId,
+            SushiName = Sushi.SushiName,
             Count = Count,
             Sum = Sum,
             Status = Status,