diff --git a/SushiBar/FormClients.Designer.cs b/SushiBar/FormClients.Designer.cs
index edf9a48..b111bf5 100644
--- a/SushiBar/FormClients.Designer.cs
+++ b/SushiBar/FormClients.Designer.cs
@@ -43,6 +43,7 @@
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
+ dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
dataGridView.Size = new Size(615, 450);
dataGridView.TabIndex = 0;
//
diff --git a/SushiBar/FormMain.Designer.cs b/SushiBar/FormMain.Designer.cs
index 3c5c0e7..1d71b0e 100644
--- a/SushiBar/FormMain.Designer.cs
+++ b/SushiBar/FormMain.Designer.cs
@@ -117,7 +117,8 @@
//
dataGridView.BackgroundColor = Color.White;
dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
- dataGridView.Location = new Point(0, 27);
+ dataGridView.Dock = DockStyle.Left;
+ dataGridView.Location = new Point(0, 28);
dataGridView.Name = "dataGridView";
dataGridView.RowHeadersVisible = false;
dataGridView.RowHeadersWidth = 51;
@@ -173,6 +174,7 @@
buttonRefreshOrders.TabIndex = 6;
buttonRefreshOrders.Text = "Обновить заказы";
buttonRefreshOrders.UseVisualStyleBackColor = true;
+ buttonRefreshOrders.Click += ButtonRef_Click;
//
// FormMain
//
diff --git a/SushiBar/FormReportOrders.Designer.cs b/SushiBar/FormReportOrders.Designer.cs
index 5de5bb9..7c430f4 100644
--- a/SushiBar/FormReportOrders.Designer.cs
+++ b/SushiBar/FormReportOrders.Designer.cs
@@ -111,7 +111,7 @@
ClientSize = new Size(1321, 450);
Controls.Add(panel);
Name = "FormReportOrders";
- Text = "FormReportOrders";
+ Text = "Отчет по заказам";
panel.ResumeLayout(false);
panel.PerformLayout();
ResumeLayout(false);
diff --git a/SushiBarBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/SushiBarBusinessLogic/OfficePackage/Implements/SaveToWord.cs
index 6c1fc93..69c3ddc 100644
--- a/SushiBarBusinessLogic/OfficePackage/Implements/SaveToWord.cs
+++ b/SushiBarBusinessLogic/OfficePackage/Implements/SaveToWord.cs
@@ -16,8 +16,7 @@ namespace SushiBarBusinessLogic.OfficePackage.Implements
///
///
///
- private static JustificationValues
- GetJustificationValues(WordJustificationType type)
+ private static JustificationValues GetJustificationValues(WordJustificationType type)
{
return type switch
{
diff --git a/SushiBarDatabaseImplement/Implements/ClientStorage.cs b/SushiBarDatabaseImplement/Implements/ClientStorage.cs
index 07359b3..810380f 100644
--- a/SushiBarDatabaseImplement/Implements/ClientStorage.cs
+++ b/SushiBarDatabaseImplement/Implements/ClientStorage.cs
@@ -37,11 +37,14 @@ namespace SushiBarDatabaseImplement.Implements
public ClientViewModel? Delete(ClientBindingModel model)
{
using var context = new SushiBarDatabase();
- var client = context.Clients.FirstOrDefault(x => x.Id == model.Id);
- if (client == null) { return null; }
- context.Clients.Remove(client);
- context.SaveChanges();
- return client.GetViewModel;
+ var element = context.Clients.FirstOrDefault(rec => rec.Id == model.Id);
+ if (element != null)
+ {
+ context.Clients.Remove(element);
+ context.SaveChanges();
+ return element.GetViewModel;
+ }
+ return null;
}
public ClientViewModel? GetElement(ClientSearchModel model)