Поля то я добавил, но ошибка с датой появилась, плак :<

This commit is contained in:
Кашин Максим 2023-05-19 01:52:16 +04:00
parent 01ec2a2324
commit 920535af97
8 changed files with 29 additions and 10 deletions

View File

@ -636,7 +636,7 @@ namespace HostrelHeadwaiterApp.Controllers
} }
[HttpPost] [HttpPost]
public void ListDinnersToPdfFile(string roomName) public void ListDinnersToPdfFile(DateTime dateFrom, DateTime dateTo)
{ {
if (APIClient.Headwaiter == null) if (APIClient.Headwaiter == null)
{ {
@ -645,7 +645,8 @@ namespace HostrelHeadwaiterApp.Controllers
APIClient.PostRequest("api/Report/CreateHeadwaiterReportToPdfFile", new ReportHeadwaiterBindingModel() APIClient.PostRequest("api/Report/CreateHeadwaiterReportToPdfFile", new ReportHeadwaiterBindingModel()
{ {
RoomName = roomName, DateFrom = dateFrom,
DateTo = dateTo,
HeadwaiterId = APIClient.Headwaiter.Id HeadwaiterId = APIClient.Headwaiter.Id
}); });

View File

@ -15,9 +15,17 @@
<div class="u-form-group u-form-name u-label-top"> <div class="u-form-group u-form-name u-label-top">
<label class="u-label u-text-custom-color-1 u-label-1">Дата начала периода:</label> <label class="u-label u-text-custom-color-1 u-label-1">Дата начала периода:</label>
<input <input
type="text" type="datetime-local"
placeholder="Выберите название комнаты" placeholder="Выберите дату начала периода"
id="roomName" name="roomName" 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"/> class="u-input u-input-rectangle"/>
</div> </div>
<div class="u-align-right u-form-group u-form-submit u-label-top"> <div class="u-align-right u-form-group u-form-submit u-label-top">

View File

@ -76,6 +76,9 @@ namespace HotelBusinessLogic.BusinessLogics
{ {
HeadwaiterId = model.HeadwaiterId, HeadwaiterId = model.HeadwaiterId,
RoomName = model.RoomName, RoomName = model.RoomName,
DateFrom = model.DateFrom,
DateTo = model.DateTo
}); });
foreach (var room in listСonferences) foreach (var room in listСonferences)
@ -104,7 +107,8 @@ namespace HotelBusinessLogic.BusinessLogics
{ {
DinnerName = mp.DinnerName, DinnerName = mp.DinnerName,
DinnerPrice = mp.DinnerPrice, DinnerPrice = mp.DinnerPrice,
NameHall = conferenceBooking.NameHall NameHall = conferenceBooking.NameHall,
StartDate = conferenceBooking.StartDate
}); });
} }

View File

@ -28,7 +28,7 @@ namespace HotelBusinessLogic.OfficePackage
CreateTable(new List<string> { "3cm", "3cm", "3cm", "4cm", "4cm" }); CreateTable(new List<string> { "3cm", "3cm", "3cm", "4cm", "4cm" });
CreateRow(new PdfRowParameters CreateRow(new PdfRowParameters
{ {
Texts = new List<string> { "Обед", "Комната", "Цена комнаты", "Бронирование" }, Texts = new List<string> { "Обед", "Комната", "Цена комнаты", "Бронирование", "Дата брони" },
Style = "NormalTitle", Style = "NormalTitle",
ParagraphAlignment = PdfParagraphAlignmentType.Center ParagraphAlignment = PdfParagraphAlignmentType.Center
}); });
@ -36,7 +36,7 @@ namespace HotelBusinessLogic.OfficePackage
{ {
CreateRow(new PdfRowParameters 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", Style = "Normal",
ParagraphAlignment = PdfParagraphAlignmentType.Left ParagraphAlignment = PdfParagraphAlignmentType.Left
}); });

View File

@ -10,6 +10,8 @@ namespace HotelContracts.BindingModels
{ {
public string FileName { get; set; } = string.Empty; public string FileName { get; set; } = string.Empty;
public string RoomName { 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 List<int>? Ids { get; set; }
public int HeadwaiterId { get; set; } public int HeadwaiterId { get; set; }
} }

View File

@ -5,6 +5,8 @@ namespace HotelContracts.SearchModels
{ {
public string? RoomName { get; set; } public string? RoomName { get; set; }
public int? HeadwaiterId { get; set; } public int? HeadwaiterId { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
public int? MealPlanId { get; set; } public int? MealPlanId { get; set; }
public int? Id { get; set; } public int? Id { get; set; }
} }

View File

@ -11,6 +11,7 @@ namespace HotelContracts.ViewModels
public int Id { get; set; } public int Id { get; set; }
public string RoomName { get; set; } = string.Empty; public string RoomName { get; set; } = string.Empty;
public string NameHall { get; set; } = string.Empty; public string NameHall { get; set; } = string.Empty;
public DateTime? StartDate { get; set; }
public string DinnerName { get; set; } = string.Empty; public string DinnerName { get; set; } = string.Empty;
public double DinnerPrice { get; set; } public double DinnerPrice { get; set; }
public double RoomPrice { get; set; } public double RoomPrice { get; set; }

View File

@ -103,7 +103,8 @@ namespace HotelRestApi.Controllers
_reportHeadwaiterLogic.SaveDinnersToPdfFile(new ReportHeadwaiterBindingModel _reportHeadwaiterLogic.SaveDinnersToPdfFile(new ReportHeadwaiterBindingModel
{ {
FileName = "Отчет PDF.pdf", FileName = "Отчет PDF.pdf",
RoomName = model.RoomName, DateFrom = model.DateFrom,
DateTo = model.DateTo,
HeadwaiterId = model.HeadwaiterId, HeadwaiterId = model.HeadwaiterId,
}); });
} }