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

редактирование

Browse Source
This commit is contained in:
AnnZhimol 2023-05-18 15:37:40 +04:00
parent 5813335afd
commit eb294b1146
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs
View File

@ -532,8 +532,8 @@ namespace HostrelHeadwaiterApp.Controllers
{
return Redirect("~/Home/Enter");
}
ViewBag.Conferences = APIClient.GetRequest<List<ConferenceViewModel>>($"api/main/getconferencelist?organiserId={APIClient.Headwaiter.Id}");
ViewBag.ConferenceBookings = APIClient.GetRequest<List<ConferenceBookingViewModel>>($"api/main/getconferenceBookings");
ViewBag.Conferences = APIClient.GetRequest<List<ConferenceViewModel>>($"api/main/getconferences");
ViewBag.ConferenceBookings = APIClient.GetRequest<List<ConferenceBookingViewModel>>($"api/main/getconferenceBookinglist?headwaiterId={APIClient.Headwaiter.Id}");
return View();
}

6
Hotel/HotelRestApi/Controllers/MainController.cs
View File

@ -583,15 +583,15 @@ namespace HotelRestApi.Controllers
}
[HttpGet]
public List<ConferenceBookingViewModel>? GetConferenceBookings()
public List<ConferenceViewModel>? GetConferences()
{
try
{
return _conferenceBooking.ReadList(null);
return _conference.ReadList(null);
}
catch (Exception ex)
{
_logger.LogError(ex, "Ошибка получения списка номеров");
_logger.LogError(ex, "Ошибка получения списка конференций");
throw;
}
}