diff --git a/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs b/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs index f0c0b29..e1a4ff8 100644 --- a/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs +++ b/Hotel/HostrelHeadwaiterApp/Controllers/HomeController.cs @@ -532,8 +532,8 @@ namespace HostrelHeadwaiterApp.Controllers { return Redirect("~/Home/Enter"); } - ViewBag.Conferences = APIClient.GetRequest>($"api/main/getconferencelist?organiserId={APIClient.Headwaiter.Id}"); - ViewBag.ConferenceBookings = APIClient.GetRequest>($"api/main/getconferenceBookings"); + ViewBag.Conferences = APIClient.GetRequest>($"api/main/getconferences"); + ViewBag.ConferenceBookings = APIClient.GetRequest>($"api/main/getconferenceBookinglist?headwaiterId={APIClient.Headwaiter.Id}"); return View(); } diff --git a/Hotel/HotelRestApi/Controllers/MainController.cs b/Hotel/HotelRestApi/Controllers/MainController.cs index e64c2ff..cb22973 100644 --- a/Hotel/HotelRestApi/Controllers/MainController.cs +++ b/Hotel/HotelRestApi/Controllers/MainController.cs @@ -583,15 +583,15 @@ namespace HotelRestApi.Controllers } [HttpGet] - public List? GetConferenceBookings() + public List? GetConferences() { try { - return _conferenceBooking.ReadList(null); + return _conference.ReadList(null); } catch (Exception ex) { - _logger.LogError(ex, "Ошибка получения списка номеров"); + _logger.LogError(ex, "Ошибка получения списка конференций"); throw; } }