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 @@
+
+
+ +
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 { "3cm", "3cm", "3cm", "4cm", "4cm" }); CreateRow(new PdfRowParameters { - Texts = new List { "Обед", "Комната", "Цена комнаты", "Бронирование" }, + Texts = new List { "Обед", "Комната", "Цена комнаты", "Бронирование", "Дата брони" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -36,7 +36,7 @@ namespace HotelBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { dinner.DinnerName.ToString(), dinner.RoomName, dinner.RoomPrice.ToString(), dinner.NameHall }, + Texts = new List { 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? 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 2de3dc3..9bcffd2 100644 --- a/Hotel/HotelRestApi/Controllers/ReportController.cs +++ b/Hotel/HotelRestApi/Controllers/ReportController.cs @@ -122,7 +122,8 @@ namespace HotelRestApi.Controllers _reportHeadwaiterLogic.SaveDinnersToPdfFile(new ReportHeadwaiterBindingModel { FileName = "Отчет PDF.pdf", - RoomName = model.RoomName, + DateFrom = model.DateFrom, + DateTo = model.DateTo, HeadwaiterId = model.HeadwaiterId, }); }