diff --git a/Hotel/HostrelHeadwaiterApp/Views/Home/ListConferenceBookings.cshtml b/Hotel/HostrelHeadwaiterApp/Views/Home/ListConferenceBookings.cshtml
index 0dc7363..4fd9ae7 100644
--- a/Hotel/HostrelHeadwaiterApp/Views/Home/ListConferenceBookings.cshtml
+++ b/Hotel/HostrelHeadwaiterApp/Views/Home/ListConferenceBookings.cshtml
@@ -43,11 +43,17 @@
>
@Html.DisplayFor(modelItem => item.NameHall)
-
- @Html.DisplayFor(modelItem => item.ConferenceId)
+ @if (item.ConferenceId == null)
+ {
+ |
+ Зал свободен
+ |
+
+ } else{
+
+ @Html.DisplayFor(modelItem => item.ConfName)
|
+ }
}
diff --git a/Hotel/HotelContracts/ViewModels/ConferenceBookingViewModel.cs b/Hotel/HotelContracts/ViewModels/ConferenceBookingViewModel.cs
index 513d109..740125c 100644
--- a/Hotel/HotelContracts/ViewModels/ConferenceBookingViewModel.cs
+++ b/Hotel/HotelContracts/ViewModels/ConferenceBookingViewModel.cs
@@ -14,7 +14,7 @@ namespace HotelContracts.ViewModels
public int? ConferenceId { get; set; }
- //конференс наме
+ public string ConfName { get; set; } = string.Empty;
public int Id { get; set; }
public string NameHall { get; set; } = string.Empty;
diff --git a/Hotel/HotelDataBaseImplement/HotelDataBase.cs b/Hotel/HotelDataBaseImplement/HotelDataBase.cs
index 5f56ccf..6d7ccea 100644
--- a/Hotel/HotelDataBaseImplement/HotelDataBase.cs
+++ b/Hotel/HotelDataBaseImplement/HotelDataBase.cs
@@ -9,7 +9,7 @@ namespace HotelDataBaseImplement
{
if (optionsBuilder.IsConfigured == false)
{
- optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-V0ON61E\SQLEXPRESS;Initial Catalog=HotelDataBaseFu;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
+ optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-VG5USAH\SQLEXPRESS;Initial Catalog=HotelDataBaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
}
base.OnConfiguring(optionsBuilder);
}
diff --git a/Hotel/HotelDataBaseImplement/Models/ConferenceBooking.cs b/Hotel/HotelDataBaseImplement/Models/ConferenceBooking.cs
index ac28542..d247e8c 100644
--- a/Hotel/HotelDataBaseImplement/Models/ConferenceBooking.cs
+++ b/Hotel/HotelDataBaseImplement/Models/ConferenceBooking.cs
@@ -68,8 +68,8 @@ namespace HotelDataBaseImplement.Models
ConferenceId = ConferenceId,
HeadwaiterId = HeadwaiterId,
NameHall = NameHall,
- ConferenceBookingDinners = ConferenceBookingDinners
- //новое название = conference?.ConferenceName
+ ConferenceBookingDinners = ConferenceBookingDinners,
+ ConfName = Conference?.ConferenceName
};
public void UpdateDinners(HotelDataBase context, ConferenceBookingBindingModel model)