From 9817530e39e1555d4f61c3b9e73c224447a44efa Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Thu, 12 Aug 2021 18:56:08 +0430 Subject: [PATCH] #186 converting review results from javascript to enums --- .../Areas/Admin/Pages/ReviewEdits.cshtml.cs | 43 ++++++++++++++++++- GanjooRazor/Pages/Shared/_AdminLayout.cshtml | 10 ++--- 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs index 687da196..07bb1958 100644 --- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs +++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System; +using System.Linq; using System.Net.Http; using System.Threading.Tasks; using GanjooRazor.Utils; @@ -122,6 +123,46 @@ namespace GanjooRazor.Areas.Admin.Pages correctionResponse.EnsureSuccessStatusCode(); Correction = JsonConvert.DeserializeObject(await correctionResponse.Content.ReadAsStringAsync()); + + if (Correction.Title != null) + { + if(titleReviewResult == null) + { + return new BadRequestObjectResult("لطفا تغییر عنوان را بازبینی کنید."); + } + else + { + Correction.Result = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), titleReviewResult); + Correction.ReviewNote = titleReviewNote; + } + } + + if (Correction.Rhythm != null) + { + if(rhythmReviewResult == null) + { + return new BadRequestObjectResult("لطفا تغییر وزن را بازبینی کنید."); + } + else + { + Correction.RhythmResult = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), rhythmReviewResult); + Correction.ReviewNote = titleReviewNote; + } + } + + if(verseReviewResult.Length != Correction.VerseOrderText.Length) + { + return new BadRequestObjectResult("لطفا تکلیف بررسی تمام مصرعهای پیشنهادی را مشخص کنید."); + } + else + { + for (int i = 0; i < Correction.VerseOrderText.Length; i++) + { + Correction.VerseOrderText[i].Result = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), verseReviewResult[i]); + Correction.VerseOrderText[i].ReviewNote = verseReviewNotes[i]; + } + } + return new OkObjectResult(true); } diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml index a6452860..c70a6548 100644 --- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml +++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml @@ -328,10 +328,7 @@ if ($('#title_review_result_Approved').length > 0) { //has title titleReviewResult = $('input[name=title_review_result]:checked').val() } - else { - titleReviewResult = null; - } - + var rhythmReviewResult = 'DontCare'; if ($('#rhythm_review_result_Approved').length > 0) { @@ -369,7 +366,10 @@ location.reload(true); }, error: function (e) { - alert(e); + if (e.responseText == null) + alert(e); + else + alert(e.responseText); }