From 920535af97fe47f37cf5de3d30398afecc48edc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D0=B0=D1=88=D0=B8=D0=BD=20=D0=9C=D0=B0=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D0=BC?= <kashin20031984@mail.ru>
Date: Fri, 19 May 2023 01:52:16 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BB=D1=8F=20=D1=82=D0=BE=20?=
 =?UTF-8?q?=D1=8F=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB,=20=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D1=81=20=D0=B4?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D0=B9=20=D0=BF=D0=BE=D1=8F=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B0=D1=81=D1=8C,=20=D0=BF=D0=BB=D0=B0=D0=BA=20:<?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/HomeController.cs                  |  5 +++--
 .../Views/Home/ListDinnersToPdfFile.cshtml         | 14 +++++++++++---
 .../BusinessLogics/ReportLogicHeadwaiter.cs        |  8 ++++++--
 .../OfficePackage/AbstractSaveToPdfHeadwaiter.cs   |  4 ++--
 .../ReportHeadwaiterBindingModel.cs.cs             |  2 ++
 .../HotelContracts/SearchModels/RoomSearchModel.cs |  2 ++
 .../ViewModels/ReportDinnersViewModel.cs           |  1 +
 Hotel/HotelRestApi/Controllers/ReportController.cs |  3 ++-
 8 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs b/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs
index eabdeb6..906fb57 100644
--- a/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs
+++ b/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs
@@ -636,7 +636,7 @@ namespace HostrelHeadwaiterApp.Controllers
         }
 
         [HttpPost]
-        public void ListDinnersToPdfFile(string roomName)
+        public void ListDinnersToPdfFile(DateTime dateFrom, DateTime dateTo)
         {
             if (APIClient.Headwaiter == null)
             {
@@ -645,7 +645,8 @@ namespace HostrelHeadwaiterApp.Controllers
 
             APIClient.PostRequest("api/Report/CreateHeadwaiterReportToPdfFile", new ReportHeadwaiterBindingModel()
             {
-                RoomName = roomName,
+                DateFrom = dateFrom,
+                DateTo = dateTo,
                 HeadwaiterId = APIClient.Headwaiter.Id
             });
 
diff --git a/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml b/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml
index f163046..a1862a6 100644
--- a/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml
+++ b/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml
@@ -15,9 +15,17 @@
 	<div class="u-form-group u-form-name u-label-top">
 							<label class="u-label u-text-custom-color-1 u-label-1">Дата начала периода:</label>
 							<input
-                              type="text"
-                              placeholder="Выберите название комнаты"
-                              id="roomName" name="roomName"
+                              type="datetime-local"
+                              placeholder="Выберите дату начала периода"
+                              id="dateFrom" name="dateFrom"
+                              class="u-input u-input-rectangle"/>
+						  </div>
+						  <div class="u-form-email u-form-group u-label-top">
+							<label class="u-label u-text-custom-color-1 u-label-2">Дата конца периода:</label>
+							<input
+                              type="datetime-local"
+                              placeholder="Выберите дату конца периода"
+                              id="dateTo" name="dateTo"
                               class="u-input u-input-rectangle"/>
 						  </div>
 	<div class="u-align-right u-form-group u-form-submit u-label-top">
diff --git a/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicHeadwaiter.cs b/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicHeadwaiter.cs
index 75ed295..67ce229 100644
--- a/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicHeadwaiter.cs
+++ b/Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicHeadwaiter.cs
@@ -76,6 +76,9 @@ namespace HotelBusinessLogic.BusinessLogics
             {
                 HeadwaiterId = model.HeadwaiterId,
                 RoomName = model.RoomName,
+                DateFrom = model.DateFrom,
+                DateTo = model.DateTo
+
             });
 
             foreach (var room in listСonferences)
@@ -104,8 +107,9 @@ namespace HotelBusinessLogic.BusinessLogics
                     {
                         DinnerName = mp.DinnerName,
                         DinnerPrice = mp.DinnerPrice,
-                        NameHall = conferenceBooking.NameHall
-                        
+                        NameHall = conferenceBooking.NameHall,
+                        StartDate = conferenceBooking.StartDate
+
                     });
                 }
             }
diff --git a/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs b/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs
index 1149240..0597480 100644
--- a/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs
+++ b/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs
@@ -28,7 +28,7 @@ namespace HotelBusinessLogic.OfficePackage
             CreateTable(new List<string> { "3cm", "3cm", "3cm", "4cm", "4cm" });
             CreateRow(new PdfRowParameters
             {
-                Texts = new List<string> { "Обед", "Комната", "Цена комнаты", "Бронирование" },
+                Texts = new List<string> { "Обед", "Комната", "Цена комнаты", "Бронирование", "Дата брони" },
                 Style = "NormalTitle",
                 ParagraphAlignment = PdfParagraphAlignmentType.Center
             });
@@ -36,7 +36,7 @@ namespace HotelBusinessLogic.OfficePackage
             {
                 CreateRow(new PdfRowParameters
                 {
-                    Texts = new List<string> { dinner.DinnerName.ToString(), dinner.RoomName, dinner.RoomPrice.ToString(), dinner.NameHall },
+                    Texts = new List<string> { dinner.DinnerName.ToString(), dinner.RoomName, dinner.RoomPrice.ToString(), dinner.NameHall, dinner.StartDate?.ToShortDateString() },
                     Style = "Normal",
                     ParagraphAlignment = PdfParagraphAlignmentType.Left
                 });
diff --git a/Hotel/HotelContracts/BindingModels/ReportHeadwaiterBindingModel.cs.cs b/Hotel/HotelContracts/BindingModels/ReportHeadwaiterBindingModel.cs.cs
index 9dbd4fd..4a1191f 100644
--- a/Hotel/HotelContracts/BindingModels/ReportHeadwaiterBindingModel.cs.cs
+++ b/Hotel/HotelContracts/BindingModels/ReportHeadwaiterBindingModel.cs.cs
@@ -10,6 +10,8 @@ namespace HotelContracts.BindingModels
     {
         public string FileName { get; set; } = string.Empty;
         public string RoomName { get; set; } = string.Empty;
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
         public List<int>? Ids { get; set; }
         public int HeadwaiterId { get; set; }
     }
diff --git a/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs b/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs
index bc11b0b..522ceab 100644
--- a/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs
+++ b/Hotel/HotelContracts/SearchModels/RoomSearchModel.cs
@@ -5,6 +5,8 @@ namespace HotelContracts.SearchModels
     {
         public string? RoomName { get; set; }
         public int? HeadwaiterId { get; set; }
+        public DateTime? DateFrom { get; set; }
+        public DateTime? DateTo { get; set; }
         public int? MealPlanId { get; set; }
         public int? Id { get; set; }
     }
diff --git a/Hotel/HotelContracts/ViewModels/ReportDinnersViewModel.cs b/Hotel/HotelContracts/ViewModels/ReportDinnersViewModel.cs
index 81cddb2..38d0b51 100644
--- a/Hotel/HotelContracts/ViewModels/ReportDinnersViewModel.cs
+++ b/Hotel/HotelContracts/ViewModels/ReportDinnersViewModel.cs
@@ -11,6 +11,7 @@ namespace HotelContracts.ViewModels
         public int Id { get; set; }
         public string RoomName { get; set; } = string.Empty;
         public string NameHall { get; set; } = string.Empty;
+        public DateTime? StartDate { get; set; }
         public string DinnerName { get; set; } = string.Empty;
         public double DinnerPrice { get; set; }
         public double RoomPrice { get; set; }
diff --git a/Hotel/HotelRestApi/Controllers/ReportController.cs b/Hotel/HotelRestApi/Controllers/ReportController.cs
index 0213bfa..bac43ea 100644
--- a/Hotel/HotelRestApi/Controllers/ReportController.cs
+++ b/Hotel/HotelRestApi/Controllers/ReportController.cs
@@ -103,7 +103,8 @@ namespace HotelRestApi.Controllers
                 _reportHeadwaiterLogic.SaveDinnersToPdfFile(new ReportHeadwaiterBindingModel
                 {
                     FileName = "Отчет PDF.pdf",
-                    RoomName = model.RoomName,
+                    DateFrom = model.DateFrom,
+                    DateTo = model.DateTo,
                     HeadwaiterId = model.HeadwaiterId,
                 });
             }