From 62af0c7ec5666bbe44c78dfb334fc0a112b6e67a Mon Sep 17 00:00:00 2001
From: Danila_Mochalov <volzhankaonelove@yandex.ru>
Date: Mon, 13 Feb 2023 08:57:11 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0=D1=82=D1=83=D1=81=D0=B0=20=D0=B7=D0=B0=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=B7=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LawFirm/LawFirm/FormMain.cs                   | 24 +++---------------
 .../BusinessLogics/OrderLogic.cs              | 25 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/LawFirm/LawFirm/FormMain.cs b/LawFirm/LawFirm/FormMain.cs
index ace0bd0..7c21f6a 100644
--- a/LawFirm/LawFirm/FormMain.cs
+++ b/LawFirm/LawFirm/FormMain.cs
@@ -89,13 +89,7 @@ namespace LawFirmView
                 {
                     var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
                     {
-                        Id = id,
-                        DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value),
-                        DocumentName = dataGridView.SelectedRows[0].Cells["DocumentName"].Value.ToString(),
-                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
-                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
-                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
-                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
+                        Id = id
                     });
                     if (!operationResult)
                     {
@@ -122,13 +116,7 @@ namespace LawFirmView
                 {
                     var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
                     {
-                        Id = id,
-                        DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value),
-                        DocumentName = dataGridView.SelectedRows[0].Cells["DocumentName"].Value.ToString(),
-                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
-                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
-                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
-                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
+                        Id = id
                     });
                     if (!operationResult)
                     {
@@ -154,13 +142,7 @@ namespace LawFirmView
                 {
                     var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
                     {
-                        Id = id,
-                        DocumentId = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["DocumentId"].Value),
-                        DocumentName = dataGridView.SelectedRows[0].Cells["DocumentName"].Value.ToString(),
-                        Status = Enum.Parse<OrderStatus>(dataGridView.SelectedRows[0].Cells["Status"].Value.ToString()),
-                        Count = Convert.ToInt32(dataGridView.SelectedRows[0].Cells["Count"].Value),
-                        Sum = double.Parse(dataGridView.SelectedRows[0].Cells["Sum"].Value.ToString()),
-                        DateCreate = DateTime.Parse(dataGridView.SelectedRows[0].Cells["DateCreate"].Value.ToString()),
+                        Id = id
                     });
                     if (!operationResult)
                     {
diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
index 3da475f..75cacbd 100644
--- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
+++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
@@ -42,8 +42,31 @@ namespace LawFirmBusinessLogic.BusinessLogics
             return true;
         }
 
-        public bool StatusUpdate(OrderBindingModel model, OrderStatus newStatus) 
+        public bool StatusUpdate(OrderBindingModel rawModel, OrderStatus newStatus) 
         {
+            var viewModel = _orderStorage.GetElement(new OrderSearchModel
+            {
+                Id = rawModel.Id
+            });
+
+            if (viewModel == null)
+            {
+                _logger.LogWarning("Order model not found");
+                return false;
+            }
+
+            OrderBindingModel model = new OrderBindingModel
+            {
+                Id = viewModel.Id,
+                DocumentId = viewModel.DocumentId,
+                DocumentName = viewModel.DocumentName,
+                Status = viewModel.Status,
+                DateCreate = viewModel.DateCreate,
+                DateImplement = viewModel.DateImplement,
+                Count = viewModel.Count,
+                Sum = viewModel.Sum
+            };
+
             CheckModel(model);
             if (model.Status + 1 != newStatus)
             {