From efb32b4b7e56982f61492b5304708bc414038c3d Mon Sep 17 00:00:00 2001
From: AnnZhimol <ankavanka731@gmail.com>
Date: Fri, 19 May 2023 13:26:52 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D1=81=D0=BA=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D0=BA=D0=B8=D1=85=20=D1=83=D1=87=D0=B0=D1=81=D1=82=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B2=20=D0=BA=20=D0=BF=D0=BB=D0=B0=D0=BD=D1=83=20?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=82=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/HomeController.cs             | 15 ++--
 .../Views/Home/AddMemberToMealPlan.cshtml     | 69 ++++++++++++++++---
 .../Views/Home/ListMealPlans.cshtml           |  2 +-
 3 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/Hotel/HotelOrganiserApp/Controllers/HomeController.cs b/Hotel/HotelOrganiserApp/Controllers/HomeController.cs
index 5eb9e17..1f354af 100644
--- a/Hotel/HotelOrganiserApp/Controllers/HomeController.cs
+++ b/Hotel/HotelOrganiserApp/Controllers/HomeController.cs
@@ -359,22 +359,25 @@ namespace HotelOrganiserApp.Controllers
             {
                 return Redirect("~/Home/Enter");
             }
-            ViewBag.MealPlans = APIClient.GetRequest<List<MealPlanViewModel>>($"api/main/getmealplanlist?organiserId={APIClient.Organiser.Id}");
-            ViewBag.Members = APIClient.GetRequest<List<MemberViewModel>>($"api/main/getmemberlist?organiserId={APIClient.Organiser.Id}");
+            return View(Tuple.Create(APIClient.GetRequest<List<MealPlanViewModel>>($"api/main/getmealplanlist?organiserId={APIClient.Organiser.Id}"), 
+                APIClient.GetRequest<List<MemberViewModel>>($"api/main/getmemberlist?organiserId={APIClient.Organiser.Id}")));
             return View();
         }
 
         [HttpPost]
-        public void AddMemberToMealPlan(int mealPlan, int member)
+        public void AddMemberToMealPlan(int mealPlan, int[] member)
         {
             if (APIClient.Organiser == null)
             {
                 throw new Exception("Необходима авторизация");
             }
-            APIClient.PostRequest("api/main/AddMemberToMealPlan", Tuple.Create(
+            for (int i = 0; i < member.Length; i++)
+            {
+                APIClient.PostRequest("api/main/AddMemberToMealPlan", Tuple.Create(
                 new MealPlanSearchModel() { Id = mealPlan },
-                new MemberViewModel() { Id = member }
-            ));
+                new MemberViewModel() { Id = member[i] }
+                ));
+            }
             Response.Redirect("ListMealPlans");
         }
 
diff --git a/Hotel/HotelOrganiserApp/Views/Home/AddMemberToMealPlan.cshtml b/Hotel/HotelOrganiserApp/Views/Home/AddMemberToMealPlan.cshtml
index f3cf2fe..102eee5 100644
--- a/Hotel/HotelOrganiserApp/Views/Home/AddMemberToMealPlan.cshtml
+++ b/Hotel/HotelOrganiserApp/Views/Home/AddMemberToMealPlan.cshtml
@@ -4,24 +4,73 @@
 @{
 	ViewData["Title"] = "AddMemberToMealPlan";
 }
-
-@model Dictionary<int, IMemberModel>
+@model Tuple<List<MealPlanViewModel>, List<MemberViewModel>>
 
 <form method="post">
 	<div class="u-form-group u-form-name u-label-top">
 		<label class="u-label u-text-custom-color-1 u-label-1">План питания: </label>
 		<div class="u-input u-input-rectangle">
-			<select id="mealPlan" name="mealPlan" class="form-control" asp-items="@(new SelectList(@ViewBag.MealPlans, "Id", "MealPlanName"))"></select>
-		</div>
-	</div>
-	<div class="u-form-group u-form-name u-label-top">
-		<label class="u-label u-text-custom-color-1 u-label-1">Участник: </label>
-		<div class="u-input u-input-rectangle">
-			<select id="member" name="member" class="form-control" asp-items="@(new SelectList(@ViewBag.Members, "Id", "MemberFIO"))"></select>
+			<select id="mealPlan" name="mealPlan" class="form-control">
+                @foreach (var mealPlan in Model.Item1)
+                {
+                            <option value="@mealPlan.Id">
+                        @Html.DisplayFor(modelItem => mealPlan.MealPlanName)
+                        </option>
+                }
+            </select>
 		</div>
 	</div>
+    <label class="u-label u-text-custom-color-1 u-label-1">Участники: </label>
+	<div class="u-container-style u-layout-cell u-size-48 u-layout-cell-1">
+                <div class="u-container-layout u-container-layout-1">
+                  <div class="u-table u-table-responsive u-table-1">
+                    <table class="u-table-entity">
+                      <colgroup>
+                        <col width="9.8%" />
+                        <col width="62.9%" />
+                        <col width="27.3%" />
+                      </colgroup>
+                      <thead
+                        class="u-custom-color-1 u-table-header u-table-header-1">
+                        <tr style="height: 31px">
+                            <th class="u-border-1 u-border-grey-50 u-table-cell">
+
+                          </th>
+                          <th class="u-border-1 u-border-grey-50 u-table-cell">
+                            ФИО участника
+                          </th>
+                          <th class="u-border-1 u-border-grey-50 u-table-cell">
+                            Гражданство
+                          </th>
+                        </tr>
+                      </thead>
+                        <tbody class="u-table-body">
+                            @foreach (var item in Model.Item2)
+                            {
+                                <tr style="height: 75px">
+                                  <td
+                            class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell">
+                                        <input type="checkbox" class="form-check-input" name="member[]" value="@item.Id" id="@item.Id">
+                                  </td>
+                                  <td
+                            class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell"
+                          >
+                                        @Html.DisplayFor(modelItem => item.MemberFIO)
+                                  </td>
+                                  <td
+                            class="u-border-1 u-border-grey-40 u-border-no-left u-border-no-right u-table-cell"
+                          >
+                                        @Html.DisplayFor(modelItem => item.Citizenship)
+                                  </td>
+                                </tr>
+                            }
+                      </tbody>
+                    </table>
+                  </div>
+                </div>
+              </div>
 	<div class="u-align-right u-form-group u-form-submit u-label-top">
 		<div class="col-8"></div>
-		<div class="col-4"><input type="submit" value="Добавить участника" class="u-active-custom-color-6 u-border-none u-btn u-btn-submit u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1" /></div>
+		<div class="col-4"><input type="submit" value="Добавить участников" class="u-active-custom-color-6 u-border-none u-btn u-btn-submit u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1" /></div>
 	</div>
 </form>
\ No newline at end of file
diff --git a/Hotel/HotelOrganiserApp/Views/Home/ListMealPlans.cshtml b/Hotel/HotelOrganiserApp/Views/Home/ListMealPlans.cshtml
index 74ecd54..65ce4d1 100644
--- a/Hotel/HotelOrganiserApp/Views/Home/ListMealPlans.cshtml
+++ b/Hotel/HotelOrganiserApp/Views/Home/ListMealPlans.cshtml
@@ -82,7 +82,7 @@
                     asp-area="" asp-controller="Home" asp-action="AddMemberToMealPlan"
                     style="padding: 10 px"
                     class="u-active-custom-color-6 u-border-none u-btn u-button-style u-custom-color-1 u-hover-custom-color-2 u-btn-1"
-                    >Добавить участника</a>
+                    >Добавить участников</a>
                     <a
                     asp-area="" asp-controller="Home" asp-action="AddRoomToMealPlan"
                     style="padding: 10 px"