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

#327 trying to fix insert new verses problem

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2023-07-08 10:15:40 +03:30
parent cecae3663a
commit 75b8fe3975
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,14 +92,17 @@
<tr>
<td>
<select asp-for="NewVerses.VOrder" style="width:100%">
@if(Model.PageInformation.Poem.Verses.Length == 0)
@if (Model.PageInformation.Poem.Verses.Length == 0)
{
<option value="1">*</option>
}
else
foreach (var verse in Model.PageInformation.Poem.Verses)
{
<option value="@verse.VOrder">@($"{(verse.CoupletIndex + 1).ToPersianNumbers()} - {verse.Text}")</option>
foreach (var verse in Model.PageInformation.Poem.Verses)
{
<option value="@verse.VOrder">@($"{(verse.CoupletIndex + 1).ToPersianNumbers()} - {verse.Text}")</option>
}
<option value="@(1 + Model.PageInformation.Poem.Verses.Last().VOrder)">* بعد از مصرع آخر</option>
}
</select>
</td>

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

@ -250,8 +250,8 @@ namespace RMuseum.Services.Implementation
var firstInsertedVerse = addedVerses.Where(v => v.NewVerseResult == CorrectionReviewResult.Approved).OrderBy(v => v.VORder).First();
int newVersesCount = addedVerses.Count(v => v.NewVerseResult == CorrectionReviewResult.Approved);
var beforeVerse = poemVerses.Where(v => v.VOrder == firstInsertedVerse.VORder).SingleOrDefault();
int nextVerseOrder = beforeVerse == null ? 1 : beforeVerse.VOrder; //VOrder starts from 1
int insertionIndex = beforeVerse == null ? 0 : poemVerses.IndexOf(beforeVerse);
int nextVerseOrder = beforeVerse == null ? poemVerses.OrderBy(v => v.VOrder).Last().VOrder + 1 : beforeVerse.VOrder; //VOrder starts from 1
int insertionIndex = beforeVerse == null ? poemVerses.Count : poemVerses.IndexOf(beforeVerse);
foreach(var nextVerse in poemVerses.Where(v => v.VOrder >= nextVerseOrder))
{