diff --git a/GanjooRazor/Areas/User/Pages/Edits.cshtml b/GanjooRazor/Areas/User/Pages/Edits.cshtml index 5e558806..acd6383c 100644 --- a/GanjooRazor/Areas/User/Pages/Edits.cshtml +++ b/GanjooRazor/Areas/User/Pages/Edits.cshtml @@ -1,5 +1,6 @@ @page @model GanjooRazor.Areas.User.Pages.EditsModel +@using DNTPersianUtils.Core @using RMuseum.Models.Ganjoor @using RMuseum.Services.Implementation @{ @@ -274,6 +275,89 @@ else   } + @if (correction.GeoDateTags != null && correction.GeoDateTags.Length > 0) + @foreach (var geoTag in correction.GeoDateTags) + { + + + برچسب جغرافیایی/تاریخی - + @if (geoTag.CoupletIndex == null) + { + کل شعر + } + else + { + بیت @((geoTag.CoupletIndex + 1).ToPersianNumbers()) + } + + + @if (geoTag.MarkForDelete) + { + + +

درخواست حذف برچسب موجود

+ + +

حذف شود

+ + + + + + } + else + { + + +

-

+ + +

+ @if (geoTag.LocationId != null) + { + @(geoTag.Location != null ? geoTag.Location.Name : $"مکان #{geoTag.LocationId}") + } + else if (!string.IsNullOrEmpty(geoTag.SuggestedLocationName)) + { + @($"{geoTag.SuggestedLocationName} ({geoTag.SuggestedLatitude}, {geoTag.SuggestedLongitude})") + } + @if (geoTag.LunarYear != null) + { + - سال @geoTag.LunarYear + if (geoTag.LunarMonth != null) + { + /@geoTag.LunarMonth + if (geoTag.LunarDay != null) + { + /@geoTag.LunarDay + } + } + } +

+ + + + + + } + @if (!string.IsNullOrEmpty(geoTag.SuggestionNote)) + { + + +

یادداشت من: @geoTag.SuggestionNote

+ + + } + @if (!string.IsNullOrEmpty(geoTag.ReviewNote)) + { + + +

@geoTag.ReviewNote

+ + + } +   + } @if (correction.VerseOrderText != null && correction.VerseOrderText.Length > 0) @foreach (var verse in correction.VerseOrderText) diff --git a/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml b/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml index aa0c73cc..31918a1d 100644 --- a/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml +++ b/GanjooRazor/Areas/User/Pages/PoemCorrectionsHistory.cshtml @@ -168,6 +168,66 @@ else } + @if (correction.GeoDateTags != null) + @foreach (var geoTag in correction.GeoDateTags.Where(g => g.Result == CorrectionReviewResult.Approved)) + { + + + برچسب جغرافیایی/تاریخی - + @if (geoTag.CoupletIndex == null) + { + کل شعر + } + else + { + بیت @((geoTag.CoupletIndex + 1).ToPersianNumbers()) + } + + + @if (geoTag.MarkForDelete) + { + + +

برچسب موجود

+ + +

حذف شد

+ + + } + else + { + + +

-

+ + +

+ @if (geoTag.LocationId != null) + { + @(geoTag.Location != null ? geoTag.Location.Name : $"مکان #{geoTag.LocationId}") + } + else if (!string.IsNullOrEmpty(geoTag.SuggestedLocationName)) + { + @($"{geoTag.SuggestedLocationName} ({geoTag.SuggestedLatitude}, {geoTag.SuggestedLongitude})") + } + @if (geoTag.LunarYear != null) + { + - سال @geoTag.LunarYear + if (geoTag.LunarMonth != null) + { + /@geoTag.LunarMonth + if (geoTag.LunarDay != null) + { + /@geoTag.LunarDay + } + } + } +

+ + + } + } @if (correction.VerseOrderText != null) @foreach (var verse in correction.VerseOrderText) {