diff --git a/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs b/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs index 9c8eb70..40ef3d2 100644 --- a/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs +++ b/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs @@ -720,11 +720,17 @@ namespace HostrelHeadwaiterApp.Controllers table += ""; foreach (var report in result) { + + bool IsCost = true; + if (report.RoomPrice.ToString() == "0") + { + IsCost = false; + } table += ""; table += ""; table += $"{report.DinnerName}"; table += $"{report.RoomName}"; - table += $"{report.RoomPrice}"; + table += $"{(IsCost is true ? report.RoomPrice.ToString() : string.Empty)}"; table += $"{report.NameHall}"; table += $"{report.BookingDate}"; table += ""; diff --git a/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToConferenceBooking.cshtml b/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToConferenceBooking.cshtml index 0b3f61c..1627f2d 100644 --- a/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToConferenceBooking.cshtml +++ b/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToConferenceBooking.cshtml @@ -6,71 +6,47 @@ } @model Tuple, List> -
-
- -
- @foreach (var conferenceBooking in Model.Item1) { - + } -
-
- -
-
-
- - - - - - - - - - - - - - - @foreach (var item in Model.Item2) - { - - - - - - } - -
- - - ФИО участника - - Гражданство -
- - - @Html.DisplayFor(modelItem => item.DinnerName) - - @Html.DisplayFor(modelItem => item.DinnerPrice) -
-
-
-
-
-
-
-
-
\ No newline at end of file + +
+ +
+ + + + + + + @foreach (var item in Model.Item2) + { + + + + + + } + +
ОбедЦена
+
+ +
+ 		@Html.DisplayFor(modelItem => item.DinnerName)@Html.DisplayFor(modelItem => item.DinnerPrice)
+
+
+
+
+ +
+ + \ No newline at end of file diff --git a/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToRoom.cshtml b/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToRoom.cshtml index 9fe42aa..16fca67 100644 --- a/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToRoom.cshtml +++ b/Hotel/HostrelHeadwaiterApp/Views/Home/AddDinnerToRoom.cshtml @@ -1,77 +1,59 @@ -@using HotelContracts.ViewModels; +@using HotelContracts.ViewModels; @using HotelDataModels.Models; @{ - ViewData["Title"] = "AddDinnerToRoom"; + ViewData["Title"] = "AddDinnerToRoom"; } @model Tuple, List> -
-
- -
- -
-
- -
-
-
- - - - - - - - - - - - - - - @foreach (var item in Model.Item2) - { - - - - +
+

Добавление обедов в номер

+ +
+ + +
+
+ +
+
+
+
- - - ФИО участника - - Гражданство -
- - - @Html.DisplayFor(modelItem => item.DinnerName) - - @Html.DisplayFor(modelItem => item.DinnerPrice) -
+ + + + + - } - -
НаименованиеЦена
-
+ + + @foreach (var item in Model.Item2) + { + + +
+ +
+ + @Html.DisplayFor(modelItem => item.DinnerName) + @Html.DisplayFor(modelItem => item.DinnerPrice) + + } + + +
- -
-
-
-
-
\ No newline at end of file + + +
+
+ +
+ + \ No newline at end of file diff --git a/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml b/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml index e542b5b..e759d00 100644 --- a/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml +++ b/Hotel/HostrelHeadwaiterApp/Views/Home/ListDinnersToPdfFile.cshtml @@ -4,49 +4,48 @@ ViewData["Title"] = "ListDinnersToPdfFile"; } -
-

Отчет по участникам за период

-
+
+
+

Отчет по обедам за период

+
-
- @{ -
- - -
- - -
-
-
-
-
-
+ +
+
+
+ +
- -
-
-
- } +
+
+ + +
+
+
+ +
+ + +
+ +
+
+
+ +
+
+ +
+
+
+ +
+
+ +
+
@section Scripts { diff --git a/Hotel/HostrelHeadwaiterApp/Views/Home/UpdateConferenceBooking.cshtml b/Hotel/HostrelHeadwaiterApp/Views/Home/UpdateConferenceBooking.cshtml index 70fbace..f7cab50 100644 --- a/Hotel/HostrelHeadwaiterApp/Views/Home/UpdateConferenceBooking.cshtml +++ b/Hotel/HostrelHeadwaiterApp/Views/Home/UpdateConferenceBooking.cshtml @@ -7,58 +7,46 @@
-
-
-
- - -
-
- -
- -
-
-
- - - - -
-
- - - - - - - - - - - -
- Обед - - Цена -
-
-
-
- +
+
+
+ +
-
-
+
+ + +
+
+ + +
+
+ + +
+
+ +
+ + + + + + + + + + +
ОбедЦена
+
+
+
+
+ +
+
+
@section Scripts diff --git a/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs b/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs index de48720..f2393ed 100644 --- a/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs +++ b/Hotel/HotelBusinessLogic/OfficePackage/AbstractSaveToPdfHeadwaiter.cs @@ -34,9 +34,15 @@ namespace HotelBusinessLogic.OfficePackage }); foreach (var dinner in info.Dinners) { + + bool IsCost = true; + if (dinner.RoomPrice.ToString() == "0") + { + IsCost = false; + } CreateRow(new PdfRowParameters { - Texts = new List { dinner.DinnerName.ToString(), dinner.RoomName, dinner.RoomPrice.ToString(), dinner.NameHall, dinner.BookingDate?.ToShortDateString() ?? string.Empty }, + Texts = new List { dinner.DinnerName.ToString(), dinner.RoomName, IsCost is true ? dinner.RoomPrice.ToString() : string.Empty, dinner.NameHall, dinner.BookingDate?.ToShortDateString() ?? string.Empty }, Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Left });