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

docs: #327 bug fixes

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2023-02-08 21:01:21 +03:30
parent fae3a8b9f3
commit 9b403fe8d1
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml
View File

@ -64,7 +64,8 @@
var verseReviewResult = [];
var versePosReviewResult = [];
var verseReviewNotes = [];
for (var i = 0; i <= verseCount; i++) {
for (var i = 0; i <= (verseCount + 100); i++) {
var elementId = '#verse' + (i + 1).toString() + '_review_result_Approved';
if ($(elementId).length > 0) {

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

@ -263,6 +263,11 @@ namespace GanjooRazor.Areas.Admin.Pages
Correction.VerseOrderText[i].MarkForDeleteResult = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), verseReviewResult[i]);
}
else
if (Correction.VerseOrderText[i].NewVerse)
{
Correction.VerseOrderText[i].NewVerseResult = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), verseReviewResult[i]);
}
else
{
Correction.VerseOrderText[i].Result = (CorrectionReviewResult)Enum.Parse(typeof(CorrectionReviewResult), verseReviewResult[i]);
if (Correction.VerseOrderText[i].VersePosition != null)

2
GanjooRazor/Areas/User/Pages/VerseAdd.cshtml
View File

@ -91,7 +91,7 @@
<select asp-for="NewVerses.VOrder" style="width:100%">
@if(Model.PageInformation.Poem.Verses.Length == 0)
{
<option value="0">*</option>
<option value="1">*</option>
}
else
foreach (var verse in Model.PageInformation.Poem.Verses)

4
GanjooRazor/Areas/User/Pages/VerseAdd.cshtml.cs
View File

@ -118,19 +118,21 @@ namespace GanjooRazor.Areas.User.Pages
List<GanjoorVerseVOrderText> vOrderTexts = new List<GanjoorVerseVOrderText>();
VersePosition versePosition = VersePosition.Right;
int vOrderNext = 0;
foreach (string v in NewVerses.Lines.Split(new char[] { '\r', '\n'}, StringSplitOptions.RemoveEmptyEntries))
{
vOrderTexts.Add
(
new GanjoorVerseVOrderText()
{
VORder = NewVerses.VOrder,
VORder = NewVerses.VOrder + vOrderNext,
Text = v.Replace("ۀ", "هٔ").Replace("ك", "ک"),
NewVerse= true,
VersePosition = versePosition,
}
);
versePosition = versePosition == VersePosition.Right ? VersePosition.Left : VersePosition.Right;
vOrderNext++;
}
GanjoorPoemCorrectionViewModel correction = new GanjoorPoemCorrectionViewModel()
{

12
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-ModeratePoemCorrection.cs
View File

@ -198,8 +198,8 @@ namespace RMuseum.Services.Implementation
if(poemVerses.Any(v => v.VOrder >= moderatedVerse.VORder))
{
var previousVerse = poemVerses.Where(v => v.VOrder == moderatedVerse.VORder).Single();
int insertionIndex = poemVerses.IndexOf(previousVerse);
var previousVerse = poemVerses.Where(v => v.VOrder == moderatedVerse.VORder).SingleOrDefault();
int insertionIndex = previousVerse == null ? 0 : poemVerses.IndexOf(previousVerse);
foreach (var nextVerse in poemVerses.Where(v => v.VOrder >= moderatedVerse.VORder).ToList())
{
@ -211,10 +211,10 @@ namespace RMuseum.Services.Implementation
VOrder = moderatedVerse.VORder,
VersePosition = (VersePosition)moderatedVerse.VersePosition,
Text = moderatedVerse.Text.Replace(" ", " ").ApplyCorrectYeKe().Trim(),
SectionIndex1 = previousVerse.SectionIndex1,
SectionIndex2 = previousVerse.SectionIndex2,
SectionIndex3 = previousVerse.SectionIndex3,
SectionIndex4 = previousVerse.SectionIndex4,
SectionIndex1 = previousVerse == null ? 0 : previousVerse.SectionIndex1,
SectionIndex2 = previousVerse == null ? null : previousVerse.SectionIndex2,
SectionIndex3 = previousVerse == null ? null : previousVerse.SectionIndex3,
SectionIndex4 = previousVerse == null ? null : previousVerse.SectionIndex4,
});
}