Vyacheslav/CourseWork_Hotel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

final fix

Browse Source
This commit is contained in:
Вячеслав Иванов 2024-05-29 19:53:56 +04:00
parent aaa156086f
commit 40a8ac6f6d
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicHeadwaiter.cs
View File

@ -6,6 +6,7 @@ using HotelContracts.SearchModels;
using HotelContracts.StoragesContracts; using HotelContracts.StoragesContracts;
using HotelContracts.ViewModels; using HotelContracts.ViewModels;
using HotelDataBaseImplement.Models; using HotelDataBaseImplement.Models;
using DocumentFormat.OpenXml.Wordprocessing;
namespace HotelBusinessLogic.BusinessLogics namespace HotelBusinessLogic.BusinessLogics
{ {
@ -116,13 +117,16 @@ namespace HotelBusinessLogic.BusinessLogics
foreach (var mp in conferenceBooking.ConferenceBookingLunches.Values) foreach (var mp in conferenceBooking.ConferenceBookingLunches.Values)
{ {
var conference = conferenced.FirstOrDefault(dp => dp.Id == conferenceBooking.ConferenceId); var conference = conferenced.FirstOrDefault(dp => dp.Id == conferenceBooking.ConferenceId);
listAll.Add(new ReportLunchesViewModel if (conference != null)
{ {
LunchName = mp.LunchName, listAll.Add(new ReportLunchesViewModel
LunchPrice = mp.LunchPrice, {
ConferenceName = conference.ConferenceName, LunchName = mp.LunchName,
StartDate = conference.StartDate LunchPrice = mp.LunchPrice,
}); ConferenceName = conference.ConferenceName,
StartDate = conference.StartDate
});
}
} }
} }

17
Hotel/HotelBusinessLogic/BusinessLogics/ReportLogicOrganiser.cs
View File

@ -116,14 +116,17 @@ namespace HotelBusinessLogic.BusinessLogics
foreach (var mp in mealPlan.MealPlanMembers.Values) foreach (var mp in mealPlan.MealPlanMembers.Values)
{ {
var room = rooms.FirstOrDefault(r => r.MealPlanId == mealPlan.Id); var room = rooms.FirstOrDefault(r => r.MealPlanId == mealPlan.Id);
listAll.Add(new ReportMembersViewModel if (room != null)
{ {
MemberSurname = mp.MemberSurname, listAll.Add(new ReportMembersViewModel
MemberName = mp.MemberName, {
MemberPatronymic = mp.MemberPatronymic, MemberSurname = mp.MemberSurname,
RoomName = room.RoomName, MemberName = mp.MemberName,
RoomPrice = room.RoomPrice MemberPatronymic = mp.MemberPatronymic,
}); RoomName = room.RoomName,
RoomPrice = room.RoomPrice
});
}
} }
} }

2
Hotel/HotelHeadwaiterApp/Properties/launchSettings.json
View File

@ -12,7 +12,7 @@
"commandName": "Project", "commandName": "Project",
"dotnetRunMessages": true, "dotnetRunMessages": true,
"launchBrowser": true, "launchBrowser": true,
"applicationUrl": "https://localhost:7020;http://localhost:5029", "applicationUrl": "https://localhost:7040;http://localhost:5049",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }