From ef03486ce2bb013174d6b72f7877010f601b3234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB=20=D0=9F=D1=83=D1=82=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B8=D0=BD?= <iputilin201@gmail.com>
Date: Mon, 6 Feb 2023 22:08:55 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PrecastConcretePlant/FormMain.cs             | 12 +++---------
 .../OrderLogic.cs                                | 11 ++++++++++-
 .../OrderStorage.cs                              | 16 +++++++++++++++-
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
index f2fae29..4f024b5 100644
--- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.cs
@@ -3,15 +3,7 @@ using PrecastConcretePlant;
 using PrecastConcretePlantContracts.BindingModels;
 using PrecastConcretePlantContracts.BusinessLogicsContracts;
 using PrecastConcretePlantDataModels.Enums;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
+
 
 namespace PrecastConcretePlantView
 {
@@ -38,6 +30,8 @@ namespace PrecastConcretePlantView
                 {
                     dataGridView.DataSource = list;
                     dataGridView.Columns["Id"].Visible = false;
+                    dataGridView.Columns["ReinforcedName"].AutoSizeMode =
+                    DataGridViewAutoSizeColumnMode.Fill;
                 }
                 _logger.LogInformation("Загрузка заказов");
             }
diff --git a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs
index ba445b6..edba0bf 100644
--- a/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantBusinessLogic/OrderLogic.cs
@@ -37,8 +37,12 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
         }
 
         public bool TakeOrderInWork(OrderBindingModel model) => SetOrderStatus(model, OrderStatus.Выполняется);
-        public bool DeliveryOrder(OrderBindingModel model) => SetOrderStatus(model, OrderStatus.Выдан);
         public bool FinishOrder(OrderBindingModel model) => SetOrderStatus(model, OrderStatus.Готов);
+        public bool DeliveryOrder(OrderBindingModel model)
+        {
+            model.DateImplement = DateTime.Now;
+            return SetOrderStatus(model, OrderStatus.Выдан);
+        }
 
         public List<OrderViewModel>? ReadList(OrderSearchModel? model)
         {
@@ -92,6 +96,11 @@ namespace PrecastConcretePlantBusinessLogic.BusinessLogic
                     nameof(vmodel));
             }
             model.Status = orderStatus;
+            model.Status = orderStatus;
+            model.DateCreate = vmodel.DateCreate;
+            model.ReinforcedId = vmodel.ReinforcedId;
+            model.Sum = vmodel.Sum;
+            model.Count = vmodel.Count;
             if (_orderStorage.Update(model) == null)
             {
                 _logger.LogWarning("Update operation failed");
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs
index 9edba7e..653873e 100644
--- a/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs
@@ -66,7 +66,7 @@ namespace PrecastConcretePlantListImplement
             var result = new List<OrderViewModel>();
             foreach (var order in _source.Orders)
             {
-                result.Add(order.GetViewModel);
+                result.Add(GetViewModel(order));
             }
             return result;
         }
@@ -102,5 +102,19 @@ namespace PrecastConcretePlantListImplement
             }
             return null;
         }
+
+        private OrderViewModel GetViewModel(Order model)
+        {
+            var res = model.GetViewModel;
+            foreach (var pastry in _source.Reinforced)
+            {
+                if (pastry.Id == model.ReinforcedId)
+                {
+                    res.ReinforcedName = pastry.ReinforcedName;
+                    break;
+                }
+            }
+            return res;
+        }
     }
 }