From 4f78c49b1b3c4141ef427e25e391b8fd5cd1eba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=BE=D0=BB=D0=B0=D0=B9?=
 <raspaev.niko@mail.ru>
Date: Sat, 25 Mar 2023 16:04:48 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=D1=8F=204,?=
 =?UTF-8?q?=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5=20=D0=BB=D0=B0=D1=81=D1=82=20?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FoodOrders/FoodOrders/FormMain.cs                     |  2 +-
 .../BusinessLogics/ReportLogic.cs                     |  3 +++
 .../OfficePackage/AbstractSaveToWord.cs               |  2 +-
 .../Implements/OrderStorage.cs                        |  3 ++-
 .../Implements/OrderStorage.cs                        | 11 ++++++++---
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/FoodOrders/FoodOrders/FormMain.cs b/FoodOrders/FoodOrders/FormMain.cs
index 4be8b38..3b9cc74 100644
--- a/FoodOrders/FoodOrders/FormMain.cs
+++ b/FoodOrders/FoodOrders/FormMain.cs
@@ -152,7 +152,7 @@ namespace FoodOrdersView
             using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
             if (dialog.ShowDialog() == DialogResult.OK)
             {
-                _reportLogic.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
+                _logicR.SaveComponentsToWordFile(new ReportBindingModel { FileName = dialog.FileName });
                 MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
             }
         }
diff --git a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ReportLogic.cs b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ReportLogic.cs
index 3a07572..8417e2c 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ReportLogic.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -1,5 +1,8 @@
 using FoodOrdersBusinessLogic.OfficePackage;
 using FoodOrdersBusinessLogic.OfficePackage.HelperModels;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Excel;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Pdf;
+using FoodOrdersBusinessLogic.OfficePackage.HelperModels.Word;
 using FoodOrdersContracts.BindingModels;
 using FoodOrdersContracts.BusinessLogicsContracts;
 using FoodOrdersContracts.SearchModels;
diff --git a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs
index 50d1c05..ff00204 100644
--- a/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs
+++ b/FoodOrders/FoodOrdersBusinessLogic/OfficePackage/AbstractSaveToWord.cs
@@ -23,7 +23,7 @@ namespace FoodOrdersBusinessLogic.OfficePackage
             {
                 CreateParagraph(new WordParagraph
                 {
-                    Texts = new List<(string, WordTextProperties)> { (dish.DishName, new WordTextProperties { Size = "24" }) },
+                    Texts = new List<(string, WordTextProperties)> { (dish.DishName + " ", new WordTextProperties { Bold = true, Size = "24" }), (dish.Price.ToString(), new WordTextProperties { Size = "24" }) },
                     TextProperties = new WordTextProperties
                     {
                         Size = "24",
diff --git a/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs b/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs
index 2b2d218..edb9b87 100644
--- a/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs
+++ b/FoodOrders/FoodOrdersFileImplement/Implements/OrderStorage.cs
@@ -23,7 +23,8 @@ namespace FoodOrdersFileImplement.Implements
         {
             if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
-                return _source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
+                return _source.Orders
+                    .Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
                     .Select(x => GetViewModel(x))
                     .ToList();
             }
diff --git a/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs b/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
index 4566b8b..736be23 100644
--- a/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
+++ b/FoodOrders/FoodOrdersListImplement/Implements/OrderStorage.cs
@@ -32,9 +32,14 @@ namespace FoodOrdersListImplement.Implements
             var result = new List<OrderViewModel>();
             if (!model.Id.HasValue && model.DateFrom.HasValue && model.DateTo.HasValue)
             {
-                return _source.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo)
-                    .Select(x => GetViewModel(x))
-                    .ToList();
+                foreach (var order in _source.Orders)
+                {
+                    if (order.DateCreate >= model.DateFrom && order.DateCreate <= model.DateTo)
+                    {
+                        result.Add(GetViewModel(order));
+                    }
+                }
+                return result;
             }
             foreach (var order in _source.Orders)
             {