diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
index 829d3b74..2e470773 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
@@ -9,12 +9,88 @@
@ViewData["Title"]
@if (!string.IsNullOrEmpty(Model.FatalError))
{
@@ -113,7 +189,7 @@ else
@Model.Correction.OriginalTitle
@@ -315,58 +391,78 @@ else
}
|
-
- | متن اولیه |
- پیشنهاد |
-
-
- |
- @verse.OriginalText
- |
-
- @verse.Text
- |
-
-
- |
- @verse.OriginalText
-
- |
-
-
- |
- @if (verse.Result == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged)
- {
-
-
+ if (@verse.MarkForDelete)
+ {
+ |
+ |
+ @verse.OriginalText
+ |
+
+
+ حذف شود |
+
+
+
+
+ |
+
+ }
+ else
+ {
+
+ | متن اولیه |
+ پیشنهاد |
+
+
+ |
+ @verse.OriginalText
+ |
+
+ @verse.Text
+ |
+
+
+ |
+ @verse.OriginalText
+
+ |
+
+
+
+ @if (verse.Result == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged)
+ {
+
+
-
-
- }
- else
- {
-
-
+
+
+ }
+ else
+ {
+
+
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ |
+
+ }
-
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
}
@if (!string.IsNullOrEmpty(Model.Correction.Note))
{
diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
index bd18081a..f53f4fd2 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
@@ -155,7 +155,9 @@ namespace GanjooRazor.Areas.Admin.Pages
public async Task OnPostSendCorrectionsModerationAsync(int correctionId,
string titleReviewResult, string rhythmReviewResult, string rhythm2ReviewResult,
string titleReviewNote, string[] verseReviewResult,
- string[] verseReviewNotes)
+ string[] verseReviewNotes,
+ int[] versesToBeDeletedVOrders
+ )
{
using (HttpClient secureClient = new HttpClient())
{
@@ -217,7 +219,14 @@ namespace GanjooRazor.Areas.Admin.Pages
{
for (int i = 0; i < Correction.VerseOrderText.Length; i++)
{
- Correction.VerseOrderText[i].Result = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), verseReviewResult[i]);
+ if (Correction.VerseOrderText[i].MarkForDelete)
+ {
+ Correction.VerseOrderText[i].MarkForDeleteResult = versesToBeDeletedVOrders.Contains(Correction.VerseOrderText[i].VORder) ? CorrectionReviewResult.Approved : CorrectionReviewResult.Rejected;
+ }
+ else
+ {
+ Correction.VerseOrderText[i].Result = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), verseReviewResult[i]);
+ }
Correction.VerseOrderText[i].ReviewNote = verseReviewNotes[i];
}
}
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index a06332f5..49db0e44 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -256,72 +256,7 @@
result.appendChild(fragment);
}
- function moderatePoemCorrections(verseCount, correctionId) {
-
- $('#moderatecorrections').hide();
- $('#saving').text('در حال بررسی ...');
-
-
- var titleReviewResult = 'DontCare';
- if ($('#title_review_result_Approved').length > 0) { //has title
- titleReviewResult = $('input[name=title_review_result]:checked').val()
- }
-
-
- var rhythmReviewResult = 'DontCare';
- if ($('#rhythm_review_result_Approved').length > 0) {
- rhythmReviewResult = $('input[name=rhythm_review_result]:checked').val()
- }
-
- var rhythm2ReviewResult = 'DontCare';
- if ($('#rhythm2_review_result_Approved').length > 0) {
- rhythm2ReviewResult = $('input[name=rhythm2_review_result]:checked').val()
- }
-
-
- var verseReviewResult = [];
- var verseReviewNotes = [];
- for (var i = 0; i <= verseCount; i++) {
-
- var elementId = '#verse' + (i + 1).toString() + '_review_result_Approved';
- if ($(elementId).length > 0) {
- var elementName = 'verse' + (i + 1).toString() + '_review_result';
- verseReviewResult.push($('input[name=' + elementName + ']:checked').val())
-
- verseReviewNotes.push($('#verse' + (i + 1).toString() + '_review_note').val())
- }
- }
-
- var url = '?handler=SendCorrectionsModeration';
-
- $.ajax({
- type: "POST",
- url: url,
- data: {
- correctionId: correctionId,
- titleReviewResult: titleReviewResult,
- rhythmReviewResult: rhythmReviewResult,
- rhythm2ReviewResult: rhythm2ReviewResult,
- titleReviewNote: $('#title_review_note') == null? null : $('#title_review_note').val(),
- verseReviewResult: verseReviewResult,
- verseReviewNotes: verseReviewNotes,
- },
- success: function () {
- location.reload(true);
- },
- error: function (e) {
- if (e.responseText == null)
- alert(e);
- else
- alert(e.responseText);
- $('#moderatecorrections').show();
- $('#saving').text('');
- }
- });
-
-
-
- }
+