From 456f0e83c417ac1d285a706ecd98b6979be1341b Mon Sep 17 00:00:00 2001
From: Kate <Kate@DESKTOP-0IOO2C0>
Date: Wed, 21 Jun 2023 16:18:23 +0300
Subject: [PATCH] fix

---
 .../Controllers/ExcursionController.cs            |  2 ++
 .../Views/Excursion/CreateTravelExcursion.cshtml  | 10 +++++++---
 .../Views/Shared/_Layout.cshtml                   |  2 +-
 .../Views/Travel/UpdateTravel.cshtml              | 12 ++++++++++++
 .../Implements/TravelStorage.cs                   | 15 +++++++++++++--
 5 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/TravelCompany/TravelCompanyClientApp/Controllers/ExcursionController.cs b/TravelCompany/TravelCompanyClientApp/Controllers/ExcursionController.cs
index f508d6c..7e247f6 100644
--- a/TravelCompany/TravelCompanyClientApp/Controllers/ExcursionController.cs
+++ b/TravelCompany/TravelCompanyClientApp/Controllers/ExcursionController.cs
@@ -137,9 +137,11 @@ namespace TravelCompanyClientApp.Controllers
             var travel=_travelLogic.ReadElement(new TravelSearchModel { Id=travelselect });
             _travelLogic.Update(new TravelBindingModel
             {
+                Id = travel.Id,
                 TravelName = travel.TravelName,
                 DateStart = travel.DateStart,
                 TravelDescription = travel.TravelDescription,
+                TourTravels=travel.TourTravels,
                 ExcursionTravels = te
             });
             Response.Redirect("/Excursion/Excursion");
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Excursion/CreateTravelExcursion.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Excursion/CreateTravelExcursion.cshtml
index faac384..049bdf6 100644
--- a/TravelCompany/TravelCompanyClientApp/Views/Excursion/CreateTravelExcursion.cshtml
+++ b/TravelCompany/TravelCompanyClientApp/Views/Excursion/CreateTravelExcursion.cshtml
@@ -1,9 +1,11 @@
 @{
     ViewData["Title"] = "CreateTravelExcursion";
 }
+
 <div class="text-center">
-    <h2 class="display-4">Привяка экскурсий к путешествиям</h2>
+    <h2 class="display-4">Привязка экскурсий к путешествиям</h2>
 </div>
+
 <form method="post" style="margin-top:50px">
     <div class="row">
         <div class="col-4"></div>
@@ -17,6 +19,7 @@
             </select>
         </div>
     </div>
+
     <div class="row">
         <div class="col-4"></div>
         <div class="col-2">Экскурсии:</div>
@@ -24,7 +27,8 @@
             <select name="excursionselect" class="form-control" multiple size="4" id="excursionselect">
                 @foreach (var excursion in ViewBag.Excursions)
                 {
-                    <option value="@excursion.Id">@excursion.ExcursionName</option>
+                    var isSelected = ((List<int>)ViewBag.SelectedExcursions)?.Contains(excursion.Id) ?? false;
+                    <option value="@excursion.Id" selected="@isSelected">@excursion.ExcursionName</option>
                 }
             </select>
         </div>
@@ -35,4 +39,4 @@
         <div class="col-8"></div>
         <div class="col-4"><input type="submit" value="Создать" class="btn btn-primary" /></div>
     </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Shared/_Layout.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Shared/_Layout.cshtml
index c0faa39..6456df1 100644
--- a/TravelCompany/TravelCompanyClientApp/Views/Shared/_Layout.cshtml
+++ b/TravelCompany/TravelCompanyClientApp/Views/Shared/_Layout.cshtml
@@ -29,7 +29,7 @@
                             <a class="nav-link text-dark" asp-area="" asp-controller="Place" asp-action="Place">Места</a>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link text-dark" asp-area="" asp-controller="Excursion" asp-action="ExcursionTravels">Привяка экскурсий к путешествиям</a>
+                            <a class="nav-link text-dark" asp-area="" asp-controller="Excursion" asp-action="CreateTravelExcursion">Привяка экскурсий к путешествиям</a>
                         </li>
                         <li class="nav-item">
                             <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Report">Отчеты</a>
diff --git a/TravelCompany/TravelCompanyClientApp/Views/Travel/UpdateTravel.cshtml b/TravelCompany/TravelCompanyClientApp/Views/Travel/UpdateTravel.cshtml
index 500565b..3280426 100644
--- a/TravelCompany/TravelCompanyClientApp/Views/Travel/UpdateTravel.cshtml
+++ b/TravelCompany/TravelCompanyClientApp/Views/Travel/UpdateTravel.cshtml
@@ -39,6 +39,18 @@
             </select>
         </div>
     </div>
+    <div class="row">
+        <div class="col-4"></div>
+        <div class="col-2">Экскурсии:</div>
+        <div class="col-4">
+            <ul>
+                @foreach (var exc in Model.ExcursionTravels)
+                {
+                    <li> @exc.Value.ExcursionName</li>
+                }
+            </ul>
+        </div>
+    </div>
     <div class="row">
         <div class="col-8"></div>
         <div class="col-4"><input type="submit" value="Сохранить" class="btn btn-primary" style="margin-top:20px"/></div>
diff --git a/TravelCompany/TravelCompanyDatabaseImplement/Implements/TravelStorage.cs b/TravelCompany/TravelCompanyDatabaseImplement/Implements/TravelStorage.cs
index 33785d3..7d9a0f8 100644
--- a/TravelCompany/TravelCompanyDatabaseImplement/Implements/TravelStorage.cs
+++ b/TravelCompany/TravelCompanyDatabaseImplement/Implements/TravelStorage.cs
@@ -17,7 +17,12 @@ namespace TravelCompanyDatabaseImplement.Implements
         public List<TravelViewModel> GetFullList()
         {
             using var context = new TravelCompanyDatabase();
-            return context.Travels.Select(x => x.GetViewModel).ToList();
+            return context.Travels
+                 .Include(x => x.Tours)
+                 .ThenInclude(x => x.Tour)
+                 .Include(x => x.Excursions)
+                 .ThenInclude(x => x.Excursion)
+                .Select(x => x.GetViewModel).ToList();
         }
         public List<TravelViewModel> GetFilteredList(TravelSearchModel model)
         {
@@ -27,6 +32,10 @@ namespace TravelCompanyDatabaseImplement.Implements
                 return context.Travels
                 .Where(x => x.TouristId == model.TouristId)
                 .Include(x => x.Tourist)
+                .Include(x => x.Tours)
+                .ThenInclude(x => x.Tour)
+                .Include(x => x.Excursions)
+                .ThenInclude(x => x.Excursion)
                 .Select(x => x.GetViewModel)
                 .ToList();
             }
@@ -40,8 +49,10 @@ namespace TravelCompanyDatabaseImplement.Implements
             }
             using var context = new TravelCompanyDatabase();
             return context.Travels
-                             .Include(x => x.Tours)
+             .Include(x => x.Tours)
              .ThenInclude(x => x.Tour)
+             .Include(x => x.Excursions)
+             .ThenInclude(x => x.Excursion)
             .FirstOrDefault(x =>
             !string.IsNullOrEmpty(model.TravelName) && x.TravelName == model.TravelName ||
             model.Id.HasValue && x.Id == model.Id)