From 25394f8b6e25ad0ff4df5de62431f623dfae39e7 Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Sun, 30 Mar 2025 21:06:51 +0330
Subject: [PATCH] #478 contribs page

---
 GanjooRazor/Pages/AudioClip.cshtml            |  2 +-
 GanjooRazor/Pages/Books.cshtml                |  2 +-
 GanjooRazor/Pages/Contribs.cshtml             |  2 +-
 GanjooRazor/Pages/Contribs.cshtml.cs          | 31 ++++++-
 GanjooRazor/Pages/FAQ.cshtml                  |  2 +-
 GanjooRazor/Pages/Hashieha.cshtml             |  2 +-
 GanjooRazor/Pages/Index.cshtml                |  2 +-
 GanjooRazor/Pages/Map.cshtml                  |  2 +-
 GanjooRazor/Pages/Photos.cshtml               |  2 +-
 GanjooRazor/Pages/Quotes.cshtml               |  2 +-
 GanjooRazor/Pages/ReportRecitation.cshtml     |  2 +-
 GanjooRazor/Pages/Search.cshtml               |  2 +-
 GanjooRazor/Pages/Shared/_AdminLayout.cshtml  |  2 +-
 .../Pages/Shared/_UserPanelLayout.cshtml      |  2 +-
 GanjooRazor/Pages/Simi.cshtml                 |  2 +-
 GanjooRazor/Pages/Tagged.cshtml               |  2 +-
 .../_GroupedByDateViewTablePartial.cshtml     | 87 ++++++++++++-------
 GanjooRazor/wwwroot/js/bk.js                  | 25 ++++++
 18 files changed, 124 insertions(+), 49 deletions(-)

diff --git a/GanjooRazor/Pages/AudioClip.cshtml b/GanjooRazor/Pages/AudioClip.cshtml
index 0d134d9d..7ece3932 100644
--- a/GanjooRazor/Pages/AudioClip.cshtml
+++ b/GanjooRazor/Pages/AudioClip.cshtml
@@ -150,7 +150,7 @@
         </p>
 
         <script src="~/lib/jquery/dist/jquery.min.js"></script>
-        <script src="~/js/bk.js?version=73"></script>
+        <script src="~/js/bk.js?version=74"></script>
         <script src="~/js/jplayersupport.js"></script>
         <script src="~/js/vaabd.js?version=10"></script>
         <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Books.cshtml b/GanjooRazor/Pages/Books.cshtml
index 64856e0c..7840eb82 100644
--- a/GanjooRazor/Pages/Books.cshtml
+++ b/GanjooRazor/Pages/Books.cshtml
@@ -16,7 +16,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Contribs.cshtml b/GanjooRazor/Pages/Contribs.cshtml
index f6c2b5f3..11fd03a1 100644
--- a/GanjooRazor/Pages/Contribs.cshtml
+++ b/GanjooRazor/Pages/Contribs.cshtml
@@ -17,7 +17,7 @@
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="/js/chart.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Contribs.cshtml.cs b/GanjooRazor/Pages/Contribs.cshtml.cs
index a058f2ee..b7cfb4b7 100644
--- a/GanjooRazor/Pages/Contribs.cshtml.cs
+++ b/GanjooRazor/Pages/Contribs.cshtml.cs
@@ -13,6 +13,7 @@ using RMuseum.Models.Generic.ViewModels;
 using RSecurityBackend.Models.Generic;
 using System.Linq;
 using static Betalgo.Ranul.OpenAI.ObjectModels.RealtimeModels.RealtimeEventTypes;
+using Org.BouncyCastle.Asn1.Ocsp;
 
 namespace GanjooRazor.Pages
 {
@@ -159,7 +160,7 @@ namespace GanjooRazor.Pages
                     return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await responseUsers.Content.ReadAsStringAsync()));
                 }
                 users = JArray.Parse(await responseUsers.Content.ReadAsStringAsync()).ToObject<List<GroupedByUserViewModel>>();
-                usersPagination = JsonConvert.DeserializeObject<PaginationMetadata>(responseDays.Headers.GetValues("paging-headers").Single());
+                usersPagination = JsonConvert.DeserializeObject<PaginationMetadata>(responseUsers.Headers.GetValues("paging-headers").Single());
             }
 
             var response = await _httpClient.GetAsync($"{APIRoot.Url}/api/contributions/{dataType}/summary");
@@ -190,6 +191,32 @@ namespace GanjooRazor.Pages
 
 
         public async Task<ActionResult> OnGetGroupedByDayAsync(string dataType, int pageNumber)
+        {
+            var responseUsers = await _httpClient.GetAsync($"{APIRoot.Url}/api/contributions/{dataType}/by/user?PageNumber=1&PageSize=30");
+
+            if (!responseUsers.IsSuccessStatusCode)
+            {
+                return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await responseUsers.Content.ReadAsStringAsync()));
+            }
+            var users = JArray.Parse(await responseUsers.Content.ReadAsStringAsync()).ToObject<List<GroupedByUserViewModel>>();
+            var usersPagination = JsonConvert.DeserializeObject<PaginationMetadata>(responseUsers.Headers.GetValues("paging-headers").Single());
+
+            return new PartialViewResult()
+            {
+                ViewName = "_GroupedByDateViewTablePartial",
+                ViewData = new ViewDataDictionary(new EmptyModelMetadataProvider(), new ModelStateDictionary())
+                {
+                    Model = new _GroupedByDateViewTablePartialModel()
+                    {
+                        DataType = dataType,
+                        Users = users.ToArray(),
+                        UsersPagination = usersPagination,
+                    }
+                }
+            };
+        }
+
+        public async Task<ActionResult> OnGetGroupedByUsersAsync(string dataType, int pageNumber)
         {
             var responseDays = await _httpClient.GetAsync($"{APIRoot.Url}/api/contributions/{dataType}/daily?PageNumber={pageNumber}&PageSize=30");
 
@@ -214,6 +241,8 @@ namespace GanjooRazor.Pages
             };
         }
 
+
+
         /// <summary>
         /// memory cache
         /// </summary>
diff --git a/GanjooRazor/Pages/FAQ.cshtml b/GanjooRazor/Pages/FAQ.cshtml
index 272c5b25..3d001e81 100644
--- a/GanjooRazor/Pages/FAQ.cshtml
+++ b/GanjooRazor/Pages/FAQ.cshtml
@@ -16,7 +16,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Hashieha.cshtml b/GanjooRazor/Pages/Hashieha.cshtml
index b295c623..2d21d7b1 100644
--- a/GanjooRazor/Pages/Hashieha.cshtml
+++ b/GanjooRazor/Pages/Hashieha.cshtml
@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Index.cshtml b/GanjooRazor/Pages/Index.cshtml
index a2b802ab..00f06b2e 100644
--- a/GanjooRazor/Pages/Index.cshtml
+++ b/GanjooRazor/Pages/Index.cshtml
@@ -17,7 +17,7 @@
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml">
     <script src="/lib/jquery/dist/jquery.min.js"></script>
     <script src="/js/chart.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script src="/js/jquery.mark.min.js"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
diff --git a/GanjooRazor/Pages/Map.cshtml b/GanjooRazor/Pages/Map.cshtml
index e67e53df..6fcd07b6 100644
--- a/GanjooRazor/Pages/Map.cshtml
+++ b/GanjooRazor/Pages/Map.cshtml
@@ -23,7 +23,7 @@
             font-family: 'Vazir'
         }
     </style>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script src="https://code.jquery.com/jquery-1.10.2.min.js"></script>
     <script src="~/js/leaflet.js"></script>
     <script src="~/js/leaflet-providers.js"></script>
diff --git a/GanjooRazor/Pages/Photos.cshtml b/GanjooRazor/Pages/Photos.cshtml
index f52201fa..19c15834 100644
--- a/GanjooRazor/Pages/Photos.cshtml
+++ b/GanjooRazor/Pages/Photos.cshtml
@@ -15,7 +15,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Quotes.cshtml b/GanjooRazor/Pages/Quotes.cshtml
index d915f5e7..1e87a74f 100644
--- a/GanjooRazor/Pages/Quotes.cshtml
+++ b/GanjooRazor/Pages/Quotes.cshtml
@@ -16,7 +16,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/ReportRecitation.cshtml b/GanjooRazor/Pages/ReportRecitation.cshtml
index cce7c76e..78d9a4ef 100644
--- a/GanjooRazor/Pages/ReportRecitation.cshtml
+++ b/GanjooRazor/Pages/ReportRecitation.cshtml
@@ -238,7 +238,7 @@
 
 
 
-                <script src="~/js/bk.js?version=73"></script>
+                <script src="~/js/bk.js?version=74"></script>
                 <script src="~/js/jplayersupport.js"></script>
                 <script src="~/js/vaabd.js?version=10"></script>
                 <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Search.cshtml b/GanjooRazor/Pages/Search.cshtml
index 33381faa..8a850dd1 100644
--- a/GanjooRazor/Pages/Search.cshtml
+++ b/GanjooRazor/Pages/Search.cshtml
@@ -22,7 +22,7 @@
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/js/chart.js"></script>
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index ed3ceb63..33d7a84a 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -35,7 +35,7 @@
         });
     </script>
 
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         function editBanner(bannerId) {
             var url = '?handler=Edit';
diff --git a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
index 0f280799..6c14e342 100644
--- a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
@@ -32,7 +32,7 @@
         });
     </script>
     <script src="/lib/diff.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         function compareCorrectionBlocks(originalElemenyId, editedElementId, resultElementId) {
             var a = document.getElementById(originalElemenyId);
diff --git a/GanjooRazor/Pages/Simi.cshtml b/GanjooRazor/Pages/Simi.cshtml
index fcb8dbcc..4caafbde 100644
--- a/GanjooRazor/Pages/Simi.cshtml
+++ b/GanjooRazor/Pages/Simi.cshtml
@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Tagged.cshtml b/GanjooRazor/Pages/Tagged.cshtml
index ae6890e8..dc7f6056 100644
--- a/GanjooRazor/Pages/Tagged.cshtml
+++ b/GanjooRazor/Pages/Tagged.cshtml
@@ -18,7 +18,7 @@
     <link rel="shortcut icon" href="/favicon.ico?version=1" type="image/x-icon" />
     <link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
     <script src="/lib/jquery/dist/jquery.min.js"></script>
-    <script src="/js/bk.js?version=73"></script>
+    <script src="/js/bk.js?version=74"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/_GroupedByDateViewTablePartial.cshtml b/GanjooRazor/Pages/_GroupedByDateViewTablePartial.cshtml
index b5b4ba2d..85c8f5bd 100644
--- a/GanjooRazor/Pages/_GroupedByDateViewTablePartial.cshtml
+++ b/GanjooRazor/Pages/_GroupedByDateViewTablePartial.cshtml
@@ -9,20 +9,20 @@
         <div class="pagination-controls">
             @if (Model.DaysPagination.hasPreviousPage)
             {
-                <button id="dailyPrevPage" class="btn btn-primary" onclick="loadContributionsDays('@Model.DataType', @(Model.DaysPagination.currentPage - 1))">صفحهٔ قبل</button>
+                <button class="btn btn-primary" onclick="loadContributionsDays('@Model.DataType', @(Model.DaysPagination.currentPage - 1))">صفحهٔ قبل</button>
             }
             else
             {
-                <button id="dailyPrevPage" class="btn btn-primary" disabled>صفحهٔ قبل</button>
+                <button class="btn btn-primary" disabled>صفحهٔ قبل</button>
             }
             <span id="dailyCurrentPage">صفحهٔ @Model.DaysPagination.currentPage.ToPersianNumbers() از @Model.DaysPagination.totalPages.ToPersianNumbers()</span>
             @if (Model.DaysPagination.hasNextPage)
             {
-                <button id="dailyNextPage" class="btn btn-primary" onclick="loadContributionsDays('@Model.DataType', @(Model.DaysPagination.currentPage + 1))">صفحهٔ بعد</button>
+                <button class="btn btn-primary" onclick="loadContributionsDays('@Model.DataType', @(Model.DaysPagination.currentPage + 1))">صفحهٔ بعد</button>
             }
             else
             {
-                <button id="dailyNextPage" class="btn btn-primary" disabled>صفحهٔ بعد</button>
+                <button class="btn btn-primary" disabled>صفحهٔ بعد</button>
             }
         </div>
     </div>
@@ -62,37 +62,58 @@
 
 @if (Model.Users != null && Model.Users.Length > 0)
 {
-    <table class="stats" id="grouped-by-user">
-        <thead>
-            <tr class="h">
-                <td class="c1">ردیف</td>
-                <td class="c2">کاربر</td>
-                <td class="c3">تعداد</td>
-            </tr>
-        </thead>
-        <tbody>
-            @for (int i = 0; i < Model.Users.Length; i++)
+    <div id="usrs">
+        <div class="pagination-controls">
+            @if (Model.UsersPagination.hasPreviousPage)
             {
-                @if (i % 2 == 0)
-                {
-                    <tr class="e">
-                        <td class="c1">@((i + 1).ToPersianNumbers())</td>
-                        <td class="c2"><a href="/hashieha/?userid=@Model.Users[i].UserId">@Model.Users[i].UserName</a></td>
-                        <td class="c3">@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Users[i].Number)</td>
-                    </tr>
-
-                }
-                else
-                {
-                    <tr>
-                        <td class="c1">@((i + 1).ToPersianNumbers())</td>
-                        <td class="c2"><a href="/hashieha/?userid=@Model.Users[i].UserId">@Model.Users[i].UserName</a></td>
-                        <td class="c3">@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Users[i].Number)</td>
-                    </tr>
-                }
+                <button class="btn btn-primary" onclick="loadContributionsUsers('@Model.DataType', @(Model.UsersPagination.currentPage - 1))">صفحهٔ قبل</button>
             }
-        </tbody>
-    </table>
+            else
+            {
+                <button class="btn btn-primary" disabled>صفحهٔ قبل</button>
+            }
+            <span id="dailyCurrentPage">صفحهٔ @Model.UsersPagination.currentPage.ToPersianNumbers() از @Model.UsersPagination.totalPages.ToPersianNumbers()</span>
+            @if (Model.UsersPagination.hasNextPage)
+            {
+                <button class="btn btn-primary" onclick="loadContributionsUsers('@Model.DataType', @(Model.UsersPagination.currentPage + 1))">صفحهٔ بعد</button>
+            }
+            else
+            {
+                <button class="btn btn-primary" disabled>صفحهٔ بعد</button>
+            }
+        </div>
+        <table class="stats" id="grouped-by-user">
+            <thead>
+                <tr class="h">
+                    <td class="c1">ردیف</td>
+                    <td class="c2">کاربر</td>
+                    <td class="c3">تعداد</td>
+                </tr>
+            </thead>
+            <tbody>
+                @for (int i = 0; i < Model.Users.Length; i++)
+                {
+                    @if (i % 2 == 0)
+                    {
+                        <tr class="e">
+                            <td class="c1">@((i + 1).ToPersianNumbers())</td>
+                            <td class="c2"><a href="/hashieha/?userid=@Model.Users[i].UserId">@Model.Users[i].UserName</a></td>
+                            <td class="c3">@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Users[i].Number)</td>
+                        </tr>
+
+                    }
+                    else
+                    {
+                        <tr>
+                            <td class="c1">@((i + 1).ToPersianNumbers())</td>
+                            <td class="c2"><a href="/hashieha/?userid=@Model.Users[i].UserId">@Model.Users[i].UserName</a></td>
+                            <td class="c3">@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.Users[i].Number)</td>
+                        </tr>
+                    }
+                }
+            </tbody>
+        </table>
+    </div>
 }
 
 
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index cb93af55..c25879de 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -1930,4 +1930,29 @@ function loadContributionsDays(dataType, pageNumber) {
             }
         },
     });
+}
+
+function loadContributionsUsers(dataType, pageNumber) {
+    var divParent = document.getElementById('usrs');
+    divParent.innerHTML = '<div class="bnumdiv" id="remove-days-placeholder"><img src="/image/loading.gif" alt="بارگذاری"/></div>';
+    $.ajax({
+        type: "GET",
+        url: '?Handler=GroupedByUsers&dataType=' + dataType + '&pageNumber=' + pageNumber.toString(),
+        error: function (e) {
+            if (document.getElementById("remove-days-placeholder") != null) {
+                document.getElementById("remove-days-placeholder").remove();
+            }
+            if (e.responseText == null)
+                alert(e);
+            else
+                alert(e.responseText);
+        },
+        success: function (data) {
+            if (document.getElementById("remove-days-placeholder") != null) {
+                document.getElementById("remove-days-placeholder").remove();
+                $(data).appendTo(divParent);
+                plotChart('grouped-by-user', 100);
+            }
+        },
+    });
 }
\ No newline at end of file