From a26e6c30e82fd065706e6a4273beb4242f52cf00 Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Wed, 26 Jun 2024 15:28:04 +0330
Subject: [PATCH] #444 UI fixed

---
 GanjooRazor/Pages/Index.cshtml.cs                    |  2 +-
 GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml  |  2 +-
 .../Pages/_CategoryWordsCountPartial.cshtml.cs       |  3 ++-
 .../Pages/_CategoryWordsCountTablePartial.cshtml     |  5 +++--
 GanjooRazor/wwwroot/js/bk.js                         |  2 +-
 RMuseum/RMuseum.xml                                  | 12 ++++++++++++
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/GanjooRazor/Pages/Index.cshtml.cs b/GanjooRazor/Pages/Index.cshtml.cs
index 077153d7..056d2932 100644
--- a/GanjooRazor/Pages/Index.cshtml.cs
+++ b/GanjooRazor/Pages/Index.cshtml.cs
@@ -1285,7 +1285,7 @@ namespace GanjooRazor.Pages
 
         public async Task<ActionResult> OnGetCategoryWordCountsAsync(int catId, int poetId)
         {
-            var wordSumsResponse = await _httpClient.GetAsync($"{APIRoot.Url}/api/audio/wordsums/{catId}");
+            var wordSumsResponse = await _httpClient.GetAsync($"{APIRoot.Url}/api/ganjoor/wordsums/{catId}");
 
             if (!wordSumsResponse.IsSuccessStatusCode)
             {
diff --git a/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml b/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml
index 571e4a63..72e5e5a7 100644
--- a/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml
+++ b/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml
@@ -10,7 +10,7 @@
             بسامد واژگان <a role="button" class="w3tooltip cursor-pointer" onclick="switch_section('wordcounts-section', 'wordcounts-section-collapse-button')"><i class="info-buttons expand_circle_down" id="wordcounts-section-collapse-button"></i><span class="w3tooltiptext">جمع شود / باز شود</span></a>
         </div>
         <p>
-            @RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.TotalWordCount) واژهٔ این بخش از @RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.UniqueWordCount) تشکیل شده است.
+            در متن این بخش کلاً @RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.TotalWordCount) واژه شمارش شده است. تعداد کلمات آن به شکل غیرتکراری برابر @RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.UniqueWordCount) واژه است.
         </p>
         <div class="clear-both">
             <input type="text" id="wordcountterm" placeholder="جستجوی واژه" value="" onkeyup="onSearchWordCounts(@Model.CatId, @Model.PoetId, @Model.TotalWordCount)">
diff --git a/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml.cs b/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml.cs
index 290e1a91..55c20dd1 100644
--- a/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml.cs
+++ b/GanjooRazor/Pages/_CategoryWordsCountPartial.cshtml.cs
@@ -38,7 +38,8 @@ namespace GanjooRazor.Pages
                 {
                     CatId = CatId,
                     PoetId = PoetId,
-                    WordCounts = WordCounts
+                    WordCounts = WordCounts,
+                    TotalWordCount = TotalWordCount,
                 };
             }
         }
diff --git a/GanjooRazor/Pages/_CategoryWordsCountTablePartial.cshtml b/GanjooRazor/Pages/_CategoryWordsCountTablePartial.cshtml
index 61c4b87e..47dbf7b2 100644
--- a/GanjooRazor/Pages/_CategoryWordsCountTablePartial.cshtml
+++ b/GanjooRazor/Pages/_CategoryWordsCountTablePartial.cshtml
@@ -1,5 +1,6 @@
 @model GanjooRazor.Pages._CategoryWordsCountTablePartialModel
 @using DNTPersianUtils.Core
+@using System.Globalization
 @{
 }
 
@@ -20,7 +21,7 @@
                 <td class="c1">@Model.WordCounts[i].RowNmbrInCat.ToPersianNumbers()</td>
                 <td class="c2"><a href="/search?s=@Model.WordCounts[i].Word&author=@Model.PoetId&cat=@Model.CatId">@Model.WordCounts[i].Word</a></td>
                 <td class="c3">@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.WordCounts[i].Count)</td>
-                <td class="c4">@(Model.WordCounts[i].Count * 100.0 / Model.TotalWordCount).ToString("N4", new CultureInfo("fa-IR")).ToPersianNumbers())</td>
+                <td class="c4">@((Model.WordCounts[i].Count * 100.0 / Model.TotalWordCount).ToString("N4", new CultureInfo("fa-IR")).ToPersianNumbers())</td>
             </tr>
 
         }
@@ -30,7 +31,7 @@
                 <td class="c1">@Model.WordCounts[i].RowNmbrInCat.ToPersianNumbers()</td>
                 <td class="c2"><a href="/search?s=@Model.WordCounts[i].Word&author=@Model.PoetId&cat=@Model.CatId">@Model.WordCounts[i].Word</a></td>
                 <td class="c3">@RMuseum.Services.Implementation.LanguageUtils.FormatMoney(Model.WordCounts[i].Count)</td>
-                <td class="c4">@(Model.WordCounts[i].Count * 100.0 / Model.TotalWordCount).ToString("N4", new CultureInfo("fa-IR")).ToPersianNumbers())</td>
+                <td class="c4">@((Model.WordCounts[i].Count * 100.0 / Model.TotalWordCount).ToString("N4", new CultureInfo("fa-IR")).ToPersianNumbers())</td>
             </tr>
         }
     }
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index 834b24e1..f0586875 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -1542,7 +1542,7 @@ function onSearchWordCounts(catId, poetId, totalWordCount) {
         divParent.innerHTML = '<div class="bnumdiv" id="remove-this-wordcounts"><img id="' + imgElementId + '" src="/image/loading.gif" alt="بارگذاری"/></div>';
         $.ajax({
             type: "GET",
-            url: '?Handler=SearchCategoryWordCounts&catId=' + String(catId) + '&poetId=' + String(poetId) + '&totalWordCount' + String(totalWordCount) + '&term=' + value,
+            url: '?Handler=SearchCategoryWordCounts&catId=' + String(catId) + '&poetId=' + String(poetId) + '&totalWordCount=' + String(totalWordCount) + '&term=' + value,
             error: function () {
                 document.getElementById("remove-this-wordcounts").remove();
             },
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index d4c856bc..1aade4a6 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -4052,6 +4052,18 @@
         <member name="M:RMuseum.Migrations.CatWordCountsRowNumber.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
             <inheritdoc />
         </member>
+        <member name="T:RMuseum.Migrations.WCSums">
+            <inheritdoc />
+        </member>
+        <member name="M:RMuseum.Migrations.WCSums.Up(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+            <inheritdoc />
+        </member>
+        <member name="M:RMuseum.Migrations.WCSums.Down(Microsoft.EntityFrameworkCore.Migrations.MigrationBuilder)">
+            <inheritdoc />
+        </member>
+        <member name="M:RMuseum.Migrations.WCSums.BuildTargetModel(Microsoft.EntityFrameworkCore.ModelBuilder)">
+            <inheritdoc />
+        </member>
         <member name="T:RMuseum.Models.Accounting.DonationExpenditure">
             <summary>
             donation expenditures