From a519f3a5e4871912fdaf8bfdd777e533786fee97 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, 10 Apr 2023 21:59:50 +0400
Subject: [PATCH] fix and complete

---
 .../PrecastConcretePlant/FormMain.Designer.cs             | 8 ++++----
 .../PrecastConcretePlantDatabaseImplement/Order.cs        | 1 +
 .../PrecastConcretePlantFileImplement/OrderStorage.cs     | 2 +-
 .../PrecastConcretePlantListImplement/OrderStorage.cs     | 8 ++++++++
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs b/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs
index ec5c71a..da5eaff 100644
--- a/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs
+++ b/PrecastConcretePlant/PrecastConcretePlant/FormMain.Designer.cs
@@ -118,28 +118,28 @@
             // reinforcedToolStripMenuItem
             // 
             this.reinforcedToolStripMenuItem.Name = "reinforcedToolStripMenuItem";
-            this.reinforcedToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.reinforcedToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.reinforcedToolStripMenuItem.Text = "Изделия";
             this.reinforcedToolStripMenuItem.Click += new System.EventHandler(this.ReinforcedToolStripMenuItem_Click);
             // 
             // componentToolStripMenuItem
             // 
             this.componentToolStripMenuItem.Name = "componentToolStripMenuItem";
-            this.componentToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.componentToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.componentToolStripMenuItem.Text = "Компоненты";
             this.componentToolStripMenuItem.Click += new System.EventHandler(this.ComponentsToolStripMenuItem_Click);
             // 
             // clientsToolStripMenuItem
             // 
             this.clientsToolStripMenuItem.Name = "clientsToolStripMenuItem";
-            this.clientsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.clientsToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.clientsToolStripMenuItem.Text = "Клиенты";
             this.clientsToolStripMenuItem.Click += new System.EventHandler(this.ClientsToolStripMenuItem_Click);
             // 
             // исполнителиToolStripMenuItem
             // 
             this.исполнителиToolStripMenuItem.Name = "исполнителиToolStripMenuItem";
-            this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.исполнителиToolStripMenuItem.Size = new System.Drawing.Size(149, 22);
             this.исполнителиToolStripMenuItem.Text = "Исполнители";
             this.исполнителиToolStripMenuItem.Click += new System.EventHandler(this.ImplementersToolStripMenuItem_Click);
             // 
diff --git a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Order.cs b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Order.cs
index 6f7d406..c75447b 100644
--- a/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Order.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantDatabaseImplement/Order.cs
@@ -93,6 +93,7 @@ namespace PrecastConcretePlantDatabaseImplement.Models
                     DateCreate = DateCreate,
                     DateImplement = DateImplement,
                     ImplementerId = ImplementerId,
+                    ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
                     Id = Id,
                 };
             }
diff --git a/PrecastConcretePlant/PrecastConcretePlantFileImplement/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantFileImplement/OrderStorage.cs
index c588520..f0d35ab 100644
--- a/PrecastConcretePlant/PrecastConcretePlantFileImplement/OrderStorage.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantFileImplement/OrderStorage.cs
@@ -37,7 +37,7 @@ namespace PrecastConcretePlantFileImplement
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue) // если не ищем по айдишнику, значит ищем по диапазону дат
+            if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
                 return _source.Orders
                     .Where(x => model.DateFrom <= x.DateCreate.Date && x.DateCreate <= model.DateTo)
diff --git a/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs b/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs
index 281e926..960cc92 100644
--- a/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs
+++ b/PrecastConcretePlant/PrecastConcretePlantListImplement/OrderStorage.cs
@@ -142,6 +142,14 @@ namespace PrecastConcretePlantListImplement
                     break;
                 }
             }
+            foreach (var implement in _source.Implementers)
+            {
+                if (implement.Id == res.ImplementerId)
+                {
+                    res.ClientFIO = implement.ImplementerFIO;
+                    break;
+                }
+            }
             return res;
         }
     }