From 6323e70cb082026a7a54c7073a881fbeeb93cf68 Mon Sep 17 00:00:00 2001
From: Hamid Reza Mohammadi <mohammadi.hr@gmail.com>
Date: Tue, 12 Dec 2023 16:58:33 +0330
Subject: [PATCH] #416 delete approved mistakes

---
 GanjooRazor/Pages/AudioClip.cshtml            |  2 +-
 GanjooRazor/Pages/Books.cshtml                |  2 +-
 GanjooRazor/Pages/FAQ.cshtml                  |  2 +-
 GanjooRazor/Pages/Hashieha.cshtml             |  2 +-
 GanjooRazor/Pages/Index.cshtml                |  2 +-
 GanjooRazor/Pages/Index.cshtml.cs             | 24 ++++++++++++++++++-
 GanjooRazor/Pages/Map.cshtml                  |  2 +-
 GanjooRazor/Pages/Photos.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 +-
 GanjooRazor/Pages/_AudioPlayerPartial.cshtml  |  6 ++++-
 .../Pages/_AudioPlayerPartial.cshtml.cs       | 11 ++++++++-
 GanjooRazor/Pages/_GanjoorPagePartial.cshtml  |  4 ++--
 GanjooRazor/wwwroot/js/bk.js                  | 21 ++++++++++++++++
 18 files changed, 74 insertions(+), 18 deletions(-)

diff --git a/GanjooRazor/Pages/AudioClip.cshtml b/GanjooRazor/Pages/AudioClip.cshtml
index eb7bbbf3..eefbe6c8 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=45"></script>
+        <script src="~/js/bk.js?version=46"></script>
         <script src="~/js/jplayersupport.js"></script>
         <script src="~/js/vaabd.js?version=6"></script>
         <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Books.cshtml b/GanjooRazor/Pages/Books.cshtml
index e7c76beb..d07b84d1 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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/FAQ.cshtml b/GanjooRazor/Pages/FAQ.cshtml
index 4eb0a98f..056e593c 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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Hashieha.cshtml b/GanjooRazor/Pages/Hashieha.cshtml
index a4ef6da0..bf8afd8a 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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Index.cshtml b/GanjooRazor/Pages/Index.cshtml
index 67dd4b3e..9a7d094e 100644
--- a/GanjooRazor/Pages/Index.cshtml
+++ b/GanjooRazor/Pages/Index.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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Index.cshtml.cs b/GanjooRazor/Pages/Index.cshtml.cs
index 722dc519..3ffe6e86 100644
--- a/GanjooRazor/Pages/Index.cshtml.cs
+++ b/GanjooRazor/Pages/Index.cshtml.cs
@@ -94,7 +94,7 @@ namespace GanjooRazor.Pages
             };
         }
 
-        public _AudioPlayerPartialModel GetRecitationsModel(PublicRecitationViewModel[] recitations, bool minimumControls, RecitationType recitationType)
+        public _AudioPlayerPartialModel GetRecitationsModel(PublicRecitationViewModel[] recitations, bool minimumControls, RecitationType recitationType, bool isAdmin)
         {
             return new _AudioPlayerPartialModel()
             {
@@ -103,6 +103,7 @@ namespace GanjooRazor.Pages
                 ShowAllRecitaions = minimumControls ? true : ShowAllRecitaions,
                 CategoryMode = minimumControls,
                 RecitationType = recitationType,
+                IsAdmin = isAdmin,
             };
         }
 
@@ -1107,5 +1108,26 @@ namespace GanjooRazor.Pages
             }
             return new JsonResult(true);
         }
+
+        public async Task<IActionResult> OnDeleteMistakeAsync(int id)
+        {
+            using (HttpClient secureClient = new HttpClient())
+            {
+                if (await GanjoorSessionChecker.PrepareClient(secureClient, Request, Response))
+                {
+                    var response = await secureClient.DeleteAsync($"{APIRoot.Url}/api/audio/errors/approved/{id}");
+
+                    if (response.StatusCode != HttpStatusCode.OK)
+                    {
+                        return new BadRequestObjectResult(JsonConvert.DeserializeObject<string>(await response.Content.ReadAsStringAsync()));
+                    }
+                }
+                else
+                {
+                    return new BadRequestObjectResult("لطفاً از گنجور خارج و مجددا به آن وارد شوید.");
+                }
+            }
+            return new JsonResult(true);
+        }
     }
 }
\ No newline at end of file
diff --git a/GanjooRazor/Pages/Map.cshtml b/GanjooRazor/Pages/Map.cshtml
index d612e45a..614479f6 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=45"></script>
+    <script src="/js/bk.js?version=46"></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 f007eaf0..51895dac 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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/ReportRecitation.cshtml b/GanjooRazor/Pages/ReportRecitation.cshtml
index 76e58c7a..df7a05ad 100644
--- a/GanjooRazor/Pages/ReportRecitation.cshtml
+++ b/GanjooRazor/Pages/ReportRecitation.cshtml
@@ -238,7 +238,7 @@
 
 
 
-                <script src="~/js/bk.js?version=45"></script>
+                <script src="~/js/bk.js?version=46"></script>
                 <script src="~/js/jplayersupport.js"></script>
                 <script src="~/js/vaabd.js?version=6"></script>
                 <script src="~/dist/jplayer/jquery.jplayer.min.js"></script>
diff --git a/GanjooRazor/Pages/Search.cshtml b/GanjooRazor/Pages/Search.cshtml
index 49991241..530490cc 100644
--- a/GanjooRazor/Pages/Search.cshtml
+++ b/GanjooRazor/Pages/Search.cshtml
@@ -21,7 +21,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=45"></script>
+    <script src="/js/bk.js?version=46"></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 d6e06328..249f5566 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -35,7 +35,7 @@
         });
     </script>
 
-    <script src="/js/bk.js?version=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         function editBanner(bannerId) {
             var url = '?handler=Edit';
diff --git a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
index a16d12c0..62cec619 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=45"></script>
+    <script src="/js/bk.js?version=46"></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 3480a2f0..69373efe 100644
--- a/GanjooRazor/Pages/Simi.cshtml
+++ b/GanjooRazor/Pages/Simi.cshtml
@@ -17,7 +17,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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/Tagged.cshtml b/GanjooRazor/Pages/Tagged.cshtml
index 6ab47b27..4c108fee 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=45"></script>
+    <script src="/js/bk.js?version=46"></script>
     <script>
         var cookieValue = getCookie("playerScrollLock");
         var playerScrollLock = cookieValue === "true";
diff --git a/GanjooRazor/Pages/_AudioPlayerPartial.cshtml b/GanjooRazor/Pages/_AudioPlayerPartial.cshtml
index 635b8068..bd76961b 100644
--- a/GanjooRazor/Pages/_AudioPlayerPartial.cshtml
+++ b/GanjooRazor/Pages/_AudioPlayerPartial.cshtml
@@ -58,7 +58,7 @@
                         </div>
                         @foreach (var mistake in recitaion.Mistakes)
                         {
-                            <div class="recitaion-mistake">
+                            <div class="recitaion-mistake" id="mistake-@mistake.Id">
                                 <p>
                                     @if (mistake.CoupletIndex != -1)
                                     {
@@ -66,6 +66,10 @@
                                     }
                                     @Html.Raw(mistake.Mistake.Replace("\r\n", "<br>"))
                                 </p>
+                                @if(Model.IsAdmin)
+                                {
+                                    <a role="button" onclick="deleteMistake(@mistake.Id)" class="w3tooltip"><i class="pageicons">delete</i><span class="w3tooltiptext">حذف خطا</span></a>
+                                }
                             </div>
                         }
                     </div>
diff --git a/GanjooRazor/Pages/_AudioPlayerPartial.cshtml.cs b/GanjooRazor/Pages/_AudioPlayerPartial.cshtml.cs
index 1e54e76c..1ec32bb5 100644
--- a/GanjooRazor/Pages/_AudioPlayerPartial.cshtml.cs
+++ b/GanjooRazor/Pages/_AudioPlayerPartial.cshtml.cs
@@ -1,12 +1,19 @@
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using GanjooRazor.Utils;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
+using Newtonsoft.Json;
 using RMuseum.Models.GanjoorAudio;
 using RMuseum.Models.GanjoorAudio.ViewModels;
+using System.Net.Http;
+using System.Net;
+using System.Threading.Tasks;
 
 namespace GanjooRazor.Pages
 {
     public class _AudioPlayerPartialModel : PageModel
     {
         public bool LoggedIn { get; set; }
+        public bool IsAdmin { get; set; }
         public PublicRecitationViewModel[] Recitations { get; set; }
         public bool ShowAllRecitaions { get; set; }
         public bool CategoryMode { get; set; }
@@ -41,5 +48,7 @@ namespace GanjooRazor.Pages
         {
             return ShowAllRecitaions || (recitationIndex < 5) ? "audio-player" : "hidden-recitation";
         }
+
+        
     }
 }
diff --git a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
index d87d8531..b7bca0aa 100644
--- a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
+++ b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml
@@ -599,7 +599,7 @@
                                                 @(Model.GanjoorPage.Poem.Recitations.Where(a => a.RecitationType == RMuseum.Models.GanjoorAudio.RecitationType.Normal).Count() > 1 ? "خوانش‌ها" : "خوانش") <a role="button" class="w3tooltip cursor-pointer" onclick="switch_section('recitations-section', 'recitations-collapse-button')"><i class="info-buttons expand_circle_down" id="recitations-collapse-button"></i><span class="w3tooltiptext">جمع شود / باز شود</span></a>
                                             </div>
                                             <div id="recitations-section">
-                                                <partial name="_AudioPlayerPartial" model=@Model.GetRecitationsModel(Model.GanjoorPage.Poem.Recitations, false, RMuseum.Models.GanjoorAudio.RecitationType.Normal) />
+                                                <partial name="_AudioPlayerPartial" model=@Model.GetRecitationsModel(Model.GanjoorPage.Poem.Recitations, false, RMuseum.Models.GanjoorAudio.RecitationType.Normal, Model.CanEdit) />
                                             </div>
                                         </div>
                                     }
@@ -611,7 +611,7 @@
                                                 @(Model.GanjoorPage.Poem.Recitations.Where(a => a.RecitationType == RMuseum.Models.GanjoorAudio.RecitationType.Commentary).Count() > 1 ? "شرح‌‌های صوتی" : "شرح صوتی") <a role="button" class="w3tooltip cursor-pointer" onclick="switch_section('commentaries-section', 'commentaries-collapse-button')"><i class="info-buttons expand_circle_down" id="commentaries-collapse-button"></i><span class="w3tooltiptext">جمع شود / باز شود</span></a>
                                             </div>
                                             <div id="commentaries-section">
-                                                <partial name="_AudioPlayerPartial" model=@Model.GetRecitationsModel(Model.GanjoorPage.Poem.Recitations, false, RMuseum.Models.GanjoorAudio.RecitationType.Commentary) />
+                                                <partial name="_AudioPlayerPartial" model=@Model.GetRecitationsModel(Model.GanjoorPage.Poem.Recitations, false, RMuseum.Models.GanjoorAudio.RecitationType.Commentary, Model.CanEdit) />
                                             </div>
                                         </div>
                                     }
diff --git a/GanjooRazor/wwwroot/js/bk.js b/GanjooRazor/wwwroot/js/bk.js
index 30095610..698da0c4 100644
--- a/GanjooRazor/wwwroot/js/bk.js
+++ b/GanjooRazor/wwwroot/js/bk.js
@@ -754,6 +754,27 @@ function deleteMyComment(commentId, coupletIndex) {
         },
     });
 
+}
+function deleteMistake(mistakeId) {
+    if (!confirm('آیا از حذف این اشکال اطمینان دارید؟'))
+        return;
+
+    var url = '?handler=Mistake';
+
+    $.ajax({
+        type: "DELETE",
+        url: url,
+        data: {
+            id: mistakeId
+        },
+        success: function () {
+            var commentBlockId = '#mistake-' + mistakeId;
+            if ($(commentBlockId) != null) {
+                $(commentBlockId).remove();
+            }
+        },
+    });
+
 }
 
 function editMyComment(commentId, coupletIndex) {