diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
index 2f7ca8a4..811f3ff6 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
@@ -86,7 +86,7 @@ namespace GanjooRazor.Areas.Admin.Pages
if (Correction.Rhythm != null)
{
- Correction.OriginalRhythm = PageInformation.Poem.GanjoorMetre.Rhythm;
+ Correction.OriginalRhythm = PageInformation.Poem.GanjoorMetre == null ? null : PageInformation.Poem.GanjoorMetre.Rhythm;
if (Correction.OriginalRhythm == Correction.Rhythm)
Correction.RhythmResult = CorrectionReviewResult.NotChanged;
}
diff --git a/GanjooRazor/Areas/User/Pages/Edits.cshtml b/GanjooRazor/Areas/User/Pages/Edits.cshtml
index a444c378..fe26ec49 100644
--- a/GanjooRazor/Areas/User/Pages/Edits.cshtml
+++ b/GanjooRazor/Areas/User/Pages/Edits.cshtml
@@ -73,6 +73,14 @@ else
}
+ @if (!string.IsNullOrEmpty(correction.ReviewNote))
+ {
+
+ |
+ @correction.ReviewNote
+ |
+
+ }
}
@if (correction.Rhythm != null)
{
@@ -99,6 +107,14 @@ else
}
+ @if (!string.IsNullOrEmpty(correction.ReviewNote))
+ {
+
+ |
+ @correction.ReviewNote
+ |
+
+ }
}
@if (correction.VerseOrderText != null)
@foreach (var verse in correction.VerseOrderText)
@@ -126,12 +142,20 @@ else
}
+ @if (!string.IsNullOrEmpty(verse.ReviewNote))
+ {
+
+ |
+ @verse.ReviewNote
+ |
+
+ }
}
@if (!string.IsNullOrEmpty(correction.Note))
{
| یادداشت: |
-
+ |
@correction.Note
|
diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs
index 82c03443..e8d63816 100644
--- a/RMuseum/Services/Implementation/GanjoorService.cs
+++ b/RMuseum/Services/Implementation/GanjoorService.cs
@@ -1402,6 +1402,8 @@ namespace RMuseum.Services.Implementation
Reviewed = dbCorrection.Reviewed,
Result = dbCorrection.Result,
RhythmResult = dbCorrection.RhythmResult,
+ ReviewNote = dbCorrection.ReviewNote,
+ ReviewDate = dbCorrection.ReviewDate,
UserNickname = string.IsNullOrEmpty(dbCorrection.User.NickName) ? dbCorrection.User.Id.ToString() : dbCorrection.User.NickName
}
);
@@ -1445,6 +1447,8 @@ namespace RMuseum.Services.Implementation
Reviewed = dbCorrection.Reviewed,
Result = dbCorrection.Result,
RhythmResult = dbCorrection.RhythmResult,
+ ReviewNote = dbCorrection.ReviewNote,
+ ReviewDate = dbCorrection.ReviewDate,
UserNickname = string.IsNullOrEmpty(dbCorrection.User.NickName) ? dbCorrection.User.Id.ToString() : dbCorrection.User.NickName
}
);
@@ -1485,6 +1489,8 @@ namespace RMuseum.Services.Implementation
Reviewed = dbCorrection.Reviewed,
Result = dbCorrection.Result,
RhythmResult = dbCorrection.RhythmResult,
+ ReviewNote = dbCorrection.ReviewNote,
+ ReviewDate = dbCorrection.ReviewDate,
UserNickname = string.IsNullOrEmpty(dbCorrection.User.NickName) ? dbCorrection.User.Id.ToString() : dbCorrection.User.NickName
}
);
@@ -1523,6 +1529,8 @@ namespace RMuseum.Services.Implementation
Reviewed = dbCorrection.Reviewed,
Result = dbCorrection.Result,
RhythmResult = dbCorrection.RhythmResult,
+ ReviewNote = dbCorrection.ReviewNote,
+ ReviewDate = dbCorrection.ReviewDate,
UserNickname = string.IsNullOrEmpty(dbCorrection.User.NickName) ? dbCorrection.User.Id.ToString() : dbCorrection.User.NickName
}
);