anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#186 fixes and improvements

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-08-15 14:50:46 +04:30
parent 7241840e43
commit 161cfe952b
3 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
View File

@ -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;
}

26
GanjooRazor/Areas/User/Pages/Edits.cshtml
View File

@ -73,6 +73,14 @@ else
}
</td>
</tr>
@if (!string.IsNullOrEmpty(correction.ReviewNote))
{
<tr>
<td colspan="3">
<p>@correction.ReviewNote</p>
</td>
</tr>
}
}
@if (correction.Rhythm != null)
{
@ -99,6 +107,14 @@ else
}
</td>
</tr>
@if (!string.IsNullOrEmpty(correction.ReviewNote))
{
<tr>
<td colspan="3">
<p>@correction.ReviewNote</p>
</td>
</tr>
}
}
@if (correction.VerseOrderText != null)
@foreach (var verse in correction.VerseOrderText)
@ -126,12 +142,20 @@ else
}
</td>
</tr>
@if (!string.IsNullOrEmpty(verse.ReviewNote))
{
<tr>
<td colspan="3">
<p>@verse.ReviewNote</p>
</td>
</tr>
}
}
@if (!string.IsNullOrEmpty(correction.Note))
{
<tr>
<td>یادداشت:</td>
<td>
<td colspan="2">
@correction.Note
</td>
</tr>

8
RMuseum/Services/Implementation/GanjoorService.cs
View File

@ -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
}
);