diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml b/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml
index 2372de4b..caa1b89e 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml
@@ -40,11 +40,14 @@ else
}
var rhythmReviewResult = 'DontCare';
- if ($('#rhythm_review_result_Approved').length > 0) {
- rhythmReviewResult = $('input[name=rhythm_review_result]:checked').val()
+ if ($('#rhyme_review_result_Approved').length > 0) {
+ rhythmReviewResult = $('input[name=rhyme_review_result]:checked').val()
}
-
+ var rhymeReviewResult = 'DontCare';
+ if ($('#rhyme_review_result_Approved').length > 0) {
+ rhymeReviewResult = $('input[name=rhyme_review_result]:checked').val()
+ }
var url = '?handler=SendCorrectionsModeration';
@@ -55,6 +58,7 @@ else
data: {
correctionId: correctionId,
rhythmReviewResult: rhythmReviewResult,
+ rhymeReviewResult: rhymeReviewResult,
breakFromVIndices: breakFromVIndices,
titleReviewNote: $('#title_review_note') == null ? null : $('#title_review_note').val(),
reviewNote: $('#review_note').val()
@@ -193,29 +197,81 @@ else
@if (Model.Correction.RhythmResult == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged)
{
-
-
+
+
-
+
}
else
{
-
-
+
+
-
+
}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ }
+
+ @if (Model.Correction.RhymeLetters != null)
+ {
+
+ |
+ قافیه
+ |
+
+ @if (Model.Correction.Rhythm == null)
+ {
+
+ |
+ @Html.Raw(Model.PoemSection.HtmlText)
+ |
+
+ }
+
+ | متن اولیه |
+ پیشنهاد |
+
+
+ |
+ @Model.PoemSection.RhymeLetters
+ |
+
+ @Model.Correction.RhymeLetters
+ |
+
+
+
+
+ @if (Model.Correction.RhymeLettersReviewResult == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged)
+ {
+
+
+
+
+
+ }
+ else
+ {
+
+
+
+
+
+ }
+
+
+
+
+
|
@@ -240,26 +296,26 @@ else
@for (int v = 0; v < Model.Verses.Count; v++)
{
- if
+ if
(
Model.Correction.BreakFromVerse1VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse2VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse3VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse4VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse5VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse6VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse7VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse8VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse9VOrder == Model.Verses[v].VOrder
- ||
+ ||
Model.Correction.BreakFromVerse10VOrder == Model.Verses[v].VOrder
)
{
diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml.cs
index a0c71a4f..b2a3baa4 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewPartEdits.cshtml.cs
@@ -170,6 +170,7 @@ namespace GanjooRazor.Areas.Admin.Pages
public async Task OnPostSendCorrectionsModerationAsync(int correctionId,
string rhythmReviewResult,
+ string rhymeReviewResult,
int[] breakFromVIndices,
string titleReviewNote,
string reviewNote)
@@ -289,6 +290,19 @@ namespace GanjooRazor.Areas.Admin.Pages
}
}
+ if (Correction.RhymeLetters != null)
+ {
+ if (rhymeReviewResult == null)
+ {
+ return new BadRequestObjectResult("لطفا تغییر قافیه را بازبینی کنید.");
+ }
+ else
+ {
+ Correction.RhymeLettersReviewResult = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), rhymeReviewResult);
+ Correction.ReviewNote = titleReviewNote;
+ }
+ }
+
Correction.BreakFromVerse1VOrder = breakFromVerse1VOrder;
Correction.BreakFromVerse2VOrder = breakFromVerse2VOrder;
Correction.BreakFromVerse3VOrder = breakFromVerse3VOrder;