Merge branch 'LabWork01_Hard' of http://student.git.athene.tech/Danila_Mochalov/PIbd-23_Mochalov_D.V._LawFirm into LabWork01_Hard

LawFirm/LawFirm/FormMain.cs

@@ -105,14 +105,8 @@ namespace LawFirmView
                 try
                 {
                     var operationResult = _orderLogic.TakeOrderInWork(new OrderBindingModel
-                    {  //id,name,count,sum,status,start,end
+                    {
-                        Id = id,
+                        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()),
                     });
                     if (!operationResult)
                     {
@@ -139,13 +133,7 @@ namespace LawFirmView
                 {
                     var operationResult = _orderLogic.DeliveryOrder(new OrderBindingModel
                     {
-                        Id = id,
+                        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()),
                     });
                     if (!operationResult)
                     {
@@ -171,13 +159,7 @@ namespace LawFirmView
                 {
                     var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
                     {
-                        Id = id,
+                        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()),
                     });
                     if (!operationResult)
                     {

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)
             {