From 5c58ac9317862005ac9bc5a033232a4064ae91ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=94=D0=B0=D0=BD=D0=B8=D1=8F=D1=80=20=D0=90=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=B8=D1=83=D0=BB=D0=BB=D0=BE=D0=B2?= <danuar228@mail.ru>
Date: Sat, 18 Mar 2023 00:02:03 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B4=D0=BE=20=D1=83=D0=BC=D0=B0=20=D0=BF=D0=B0=D0=B3?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=86=D0=B8=D1=8F=20=D0=BD=D0=B0=20=D1=81?=
 =?UTF-8?q?=D0=B0=D0=B9=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ConfectioneryClientApp/APIClient.cs           |  2 +-
 .../Controllers/HomeController.cs             | 32 ++++++++--
 .../Views/Home/Mails.cshtml                   | 60 ++++++++-----------
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/ConfectioneryClientApp/APIClient.cs b/ConfectioneryClientApp/APIClient.cs
index 2ca7837..ed25668 100644
--- a/ConfectioneryClientApp/APIClient.cs
+++ b/ConfectioneryClientApp/APIClient.cs
@@ -10,7 +10,7 @@ namespace ConfectioneryClientApp
         private static readonly HttpClient _client = new();
 
         public static ClientViewModel? Client { get; set; } = null;
-        public static int CurrentPage { get; set; } = 1;
+        public static int CurrentPage { get; set; } = 0;
 
         public static void Connect(IConfiguration configuration)
         {
diff --git a/ConfectioneryClientApp/Controllers/HomeController.cs b/ConfectioneryClientApp/Controllers/HomeController.cs
index 8e44e22..ab48d93 100644
--- a/ConfectioneryClientApp/Controllers/HomeController.cs
+++ b/ConfectioneryClientApp/Controllers/HomeController.cs
@@ -4,7 +4,9 @@ using ConfectioneryContracts.BindingModels;
 using ConfectioneryContracts.ViewModels;
 using Microsoft.AspNetCore.Mvc;
 using System.Diagnostics;
+using System.Text;
 using ConfectioneryContracts.SearchModels;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace ConfectioneryClientApp.Controllers
 {
@@ -153,12 +155,15 @@ namespace ConfectioneryClientApp.Controllers
 			{
 				return Redirect("~/Home/Enter");
 			}
-            ViewBag.CurrentPage = APIClient.CurrentPage;
-			return View(APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client.Id}&page={APIClient.CurrentPage}"));
+			return View();
 		}
 
+        /// <summary>
+        /// Switches the page.
+        /// </summary>
+        /// <returns>Возвращает кортеж с таблицой в html, текущей страницей писем, выключать ли кнопку пред. страницы, выключать ли кнопку след. страницы</returns>
         [HttpGet]
-        public void SwitchPage(bool isNext)
+        public Tuple<string?, string?, bool, bool>? SwitchPage(bool isNext)
         {
             if (isNext)
             {
@@ -168,11 +173,28 @@ namespace ConfectioneryClientApp.Controllers
             {
                 if (APIClient.CurrentPage == 1)
                 {
-                    return;
+                    return null;
                 }
                 APIClient.CurrentPage--;
             }
-            Mails();
+
+            var res = APIClient.GetRequest<List<MessageInfoViewModel>>($"api/client/getmessages?clientId={APIClient.Client!.Id}&page={APIClient.CurrentPage}");
+            if (isNext && (res == null || res.Count == 0))
+            {
+                APIClient.CurrentPage--;
+                return Tuple.Create<string?, string?, bool, bool>(null, null, APIClient.CurrentPage != 1, false);
+            }
+
+            StringBuilder htmlTable = new();
+            foreach (var mail in res)
+            {
+                htmlTable.Append("<tr>" +
+                                 $"<td>{mail.DateDelivery}</td>" +
+                                 $"<td>{mail.Subject}</td>" +
+                                 $"<td>{mail.Body}</td>" +
+                                 "</tr>");
+            }
+			return Tuple.Create<string?, string?, bool, bool>(htmlTable.ToString(), APIClient.CurrentPage.ToString(), APIClient.CurrentPage != 1, true);
         }
 	}
 }
\ No newline at end of file
diff --git a/ConfectioneryClientApp/Views/Home/Mails.cshtml b/ConfectioneryClientApp/Views/Home/Mails.cshtml
index 64df4b7..1926238 100644
--- a/ConfectioneryClientApp/Views/Home/Mails.cshtml
+++ b/ConfectioneryClientApp/Views/Home/Mails.cshtml
@@ -1,19 +1,8 @@
-@using ConfectioneryContracts.ViewModels
-
-@model List<MessageInfoViewModel>
-
-@{
+@{
 	ViewData["Title"] = "Mails";
 }
 <div class="text-center">
-    @{
-        if (Model == null)
-        {
-            <h3 class="display-4">Авторизируйтесь</h3>
-            return;
-        }
-
-        <table class="table">
+    <table class="table">
             <thead>
             <tr>
                 <th>
@@ -27,21 +16,7 @@
                 </th>
             </tr>
             </thead>
-            <tbody>
-            @foreach (var item in Model)
-            {
-                <tr>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.DateDelivery)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.Subject)
-                    </td>
-                    <td>
-                        @Html.DisplayFor(modelItem => item.Body)
-                    </td>
-                </tr>
-            }
+            <tbody id="mails-table-body">
             </tbody>
         </table>
         <ul class="pagination justify-content-center">
@@ -51,17 +26,16 @@
                     <span class="sr-only">Предыдущее</span>
                 </a>
             </li>
-            <li id="current-page" class="page-item"><a class="page-link">
-                @ViewBag.CurrentPage.ToString()
-            </a></li>
             <li class="page-item">
-                <a id="next-page" class="page-link" href="#" aria-label="Next">
+                <a id="current-page" class="page-link"></a>
+                </li>
+            <li id="next-page" class="page-item">
+                <a class="page-link" href="#" aria-label="Next">
                     <span aria-hidden="true">&raquo;</span>
                     <span class="sr-only">Следующее</span>
                 </a>
             </li>
         </ul>
-    }
 </div>
 
 <script>
@@ -70,12 +44,26 @@
             method: "GET",
             url: "/Home/SwitchPage",
             data: { isNext: isNext },
-            success: function () {
-                location.reload();
+            success: function (result) {
+                if (result != null) {
+                    if (result.item1 != null && result.item2 != null) {
+                        $("#mails-table-body").html(result.item1);
+                        $("#current-page").text(result.item2);
+                    }
+                    if (result.item3)
+                        $("#prev-page").removeClass("page-item disabled");
+                    else 
+                        $("#prev-page").addClass("page-item disabled");
+                    if (result.item4)
+                        $("#next-page").removeClass("page-item disabled");
+                    else
+                        $("#next-page").addClass("page-item disabled");
+                }
             }
         });
     }
-
+    // Чтобы в первый раз загрузить данные и попасть на первую страницу
+    onClicked(true);
     $("#prev-page").on('click', () => onClicked(false));
     $("#next-page").on('click', () => onClicked(true));