From 0fa0c8102172d9292344e2c8f3dc8122871ddd72 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Sun, 2 Apr 2023 10:17:55 +0330 Subject: [PATCH] docs: #373 UI for reviewing language changes --- .../Areas/Admin/Pages/ReviewEdits.cshtml | 150 ++++++++++++------ .../Areas/Admin/Pages/ReviewEdits.cshtml.cs | 24 ++- 2 files changed, 127 insertions(+), 47 deletions(-) diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml index 93710030..12a46287 100644 --- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml +++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml @@ -676,54 +676,112 @@ else } - - -

@verse.OriginalText

- - -

@verse.Text

- - - - -

@verse.OriginalText

- - - - - - @if (verse.Result == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged) - { - - -
- - } - else - { - - + @if(verse.Text != null) + { + + +

@verse.OriginalText

+ + +

@verse.Text

+ + + + +

@verse.OriginalText

+ + + + + + @if (verse.Result == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged) + { + + -
- - } -
- -
- -
- -
- -
- - - +
+ + } + else + { + + + +
+ + } +
+ +
+ +
+ +
+ +
+ + + + } + + + @if (verse.LanguageId != null) + { + + متن مصرع جهت تغییر زبان: + @verse.OriginalText + + + + @if (verse.OriginalLanguageId == null) + { + + زبان پیشین مصرع:

فارسی

+
+ } + else + { + + زبان پیشین مصرع:

@Model.Languages.Where(l => l.Id == verse.OriginalLanguageId).Single().Name

+
+ } + + + زبان پیشنهادی مصرع:

@Model.Languages.Where(l => l.Id == verse.LanguageId).Single().Name

+ + + + + + @if (verse.LanguageReviewResult == RMuseum.Models.Ganjoor.CorrectionReviewResult.NotChanged) + { + + +
+ + } + else + { + + +
+ + } +
+ +
+ +
+ +
+ + + } @if(verse.CoupletSummary != null) { diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs index 2f64ffc6..32fd6613 100644 --- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs +++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs @@ -51,6 +51,20 @@ namespace GanjooRazor.Areas.Admin.Pages public string RhymeLetters { get; set; } + public GanjoorLanguage[] Languages { get; set; } + + private async Task ReadLanguagesAsync(HttpClient secureClient) + { + HttpResponseMessage response = await secureClient.GetAsync($"{APIRoot.Url}/api/translations/languages"); + if (!response.IsSuccessStatusCode) + { + FatalError = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); + return; + } + + Languages = JsonConvert.DeserializeObject(await response.Content.ReadAsStringAsync()); + } + public async Task OnGetAsync() { if (string.IsNullOrEmpty(Request.Cookies["Token"])) @@ -76,6 +90,10 @@ namespace GanjooRazor.Areas.Admin.Pages { TotalCount = JsonConvert.DeserializeObject(paginnationMetadata).totalCount; } + + await ReadLanguagesAsync(secureClient); + + Correction = JsonConvert.DeserializeObject(await nextResponse.Content.ReadAsStringAsync()); if(Correction != null) { @@ -131,6 +149,9 @@ namespace GanjooRazor.Areas.Admin.Pages if (!verse.NewVerse) { verse.OriginalText = v.Text; + verse.OriginalCoupletSummary = v.CoupletSummary; + verse.OriginalLanguageId = v.LanguageId; + verse.OriginalVersePosition = v.VersePosition; verse.CoupletIndex = v.CoupletIndex; if(string.IsNullOrEmpty(verse.Text)) { @@ -138,7 +159,6 @@ namespace GanjooRazor.Areas.Admin.Pages } if(!string.IsNullOrEmpty(verse.CoupletSummary)) { - verse.OriginalCoupletSummary = v.CoupletSummary; if(verse.CoupletSummary == verse.OriginalCoupletSummary) { verse.SummaryReviewResult = CorrectionReviewResult.NotChanged; @@ -200,6 +220,8 @@ namespace GanjooRazor.Areas.Admin.Pages return Page(); } + + public async Task OnPostSendCorrectionsModerationAsync(int correctionId, string titleReviewResult, string summaryReviewResult, string rhythmReviewResult, string rhythm2ReviewResult, string rhymeReviewResult, string titleReviewNote, string[] verseReviewResult,