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

#186 new field for rhythm review result and other small changes

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-08-03 19:45:17 +04:30
parent 83745cbc1e
commit 74dccf7fbe
7 changed files with 127 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using RMuseum.Models.Ganjoor;
using RMuseum.Models.Ganjoor.ViewModels;
using RSecurityBackend.Models.Generic;
@ -66,17 +67,25 @@ namespace GanjooRazor.Areas.Admin.Pages
if(Correction.Title != null)
{
Correction.OriginalRhythm = PageInformation.Poem.Title;
Correction.OriginalTitle = PageInformation.Poem.Title;
if (Correction.OriginalTitle == PageInformation.Poem.Title)
Correction.Result = CorrectionReviewResult.NotChanged;
}
if(Correction.VerseOrderText != null)
foreach(var verse in Correction.VerseOrderText)
{
verse.OriginalText = PageInformation.Poem.Verses.Where(v => v.VOrder == verse.VORder).Single().Text;
if (verse.OriginalText == verse.Text)
verse.Result = CorrectionReviewResult.NotChanged;
}
if (Correction.Rhythm != null)
{
Correction.OriginalRhythm = PageInformation.Poem.GanjoorMetre.Rhythm;
if (Correction.OriginalRhythm == PageInformation.Poem.GanjoorMetre.Rhythm)
Correction.RhythmResult = CorrectionReviewResult.NotChanged;
}
}
else
{

16
RMuseum/Models/Ganjoor/CorrectionReviewResult.cs Normal file
View File

@ -0,0 +1,16 @@
namespace RMuseum.Models.Ganjoor
{
/// <summary>
/// correction review result
/// </summary>
public enum CorrectionReviewResult
{
NotReviewed = 0,
Approved = 1,
NotChanged = 2,
RejectedBecauseWrong = 3,
RejectedBecauseVariant = 4,
RejectedBecauseUnnecessaryChange = 5,
Rejected = 6
}
}

54
RMuseum/Models/Ganjoor/GanjoorPoemCorrection.cs
View File

@ -103,54 +103,14 @@ namespace RMuseum.Models.Ganjoor
/// review result for title and rhythm
/// </summary>
public CorrectionReviewResult Result { get; set; }
/// <summary>
/// review result for rhythm
/// </summary>
public CorrectionReviewResult RhythmResult { get; set; }
}
/// <summary>
/// Verse Vorder / Text
/// </summary>
public class GanjoorVerseVOrderText
{
/// <summary>
/// record id
/// </summary>
public int Id { get; set; }
/// <summary>
/// verse order
/// </summary>
public int VORder { get; set; }
/// <summary>
/// text
/// </summary>
public string Text { get; set; }
/// <summary>
/// original text
/// </summary>
public string OriginalText { get; set; }
/// <summary>
/// review result
/// </summary>
public CorrectionReviewResult Result { get; set; }
/// <summary>
/// note
/// </summary>
public string ReviewNote { get; set; }
}
/// <summary>
/// correction review result
/// </summary>
public enum CorrectionReviewResult
{
NotReviewed = 0,
Approved = 1,
NoChanged = 2,
RejectedBecauseWrong = 3,
RejectedBecauseVariant = 4,
RejectedBecauseUnnecessaryChange = 5,
Rejected = 6
}
}

37
RMuseum/Models/Ganjoor/GanjoorVerseVOrderText.cs Normal file
View File

@ -0,0 +1,37 @@
namespace RMuseum.Models.Ganjoor
{
/// <summary>
/// Verse Vorder / Text
/// </summary>
public class GanjoorVerseVOrderText
{
/// <summary>
/// record id
/// </summary>
public int Id { get; set; }
/// <summary>
/// verse order
/// </summary>
public int VORder { get; set; }
/// <summary>
/// text
/// </summary>
public string Text { get; set; }
/// <summary>
/// original text
/// </summary>
public string OriginalText { get; set; }
/// <summary>
/// review result
/// </summary>
public CorrectionReviewResult Result { get; set; }
/// <summary>
/// note
/// </summary>
public string ReviewNote { get; set; }
}
}

7
RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCorrectionViewModel.cs
View File

@ -78,8 +78,13 @@ namespace RMuseum.Models.Ganjoor.ViewModels
public string ReviewNote { get; set; }
/// <summary>
/// review result for title and rhythm
/// review result for title
/// </summary>
public CorrectionReviewResult Result { get; set; }
/// <summary>
/// review result for rhythm
/// </summary>
public CorrectionReviewResult RhythmResult { get; set; }
}
}

86
RMuseum/RMuseum.xml
View File

@ -4216,6 +4216,11 @@
pinterest image url
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.CorrectionReviewResult">
<summary>
correction review result
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.GanjoorCat">
<summary>
Ganjoor Category
@ -4870,44 +4875,9 @@
review result for title and rhythm
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText">
<member name="P:RMuseum.Models.Ganjoor.GanjoorPoemCorrection.RhythmResult">
<summary>
Verse Vorder / Text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.Id">
<summary>
record id
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.VORder">
<summary>
verse order
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.Text">
<summary>
text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.OriginalText">
<summary>
original text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.Result">
<summary>
review result
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.ReviewNote">
<summary>
note
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.CorrectionReviewResult">
<summary>
correction review result
review result for rhythm
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.GanjoorPoet">
@ -5030,6 +5000,41 @@
text
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText">
<summary>
Verse Vorder / Text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.Id">
<summary>
record id
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.VORder">
<summary>
verse order
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.Text">
<summary>
text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.OriginalText">
<summary>
original text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.Result">
<summary>
review result
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorVerseVOrderText.ReviewNote">
<summary>
note
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.PoemMusicTrack">
<summary>
poem related track
@ -5822,7 +5827,12 @@
</member>
<member name="P:RMuseum.Models.Ganjoor.ViewModels.GanjoorPoemCorrectionViewModel.Result">
<summary>
review result for title and rhythm
review result for title
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.ViewModels.GanjoorPoemCorrectionViewModel.RhythmResult">
<summary>
review result for rhythm
</summary>
</member>
<member name="T:RMuseum.Models.Ganjoor.ViewModels.GanjoorPoemSummaryViewModel">

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

@ -1399,9 +1399,10 @@ namespace RMuseum.Services.Implementation
Date = dbCorrection.Date,
Reviewed = dbCorrection.Reviewed,
Result = dbCorrection.Result,
RhythmResult = dbCorrection.RhythmResult,
UserNickname = string.IsNullOrEmpty(dbCorrection.User.NickName) ? dbCorrection.User.Id.ToString() : dbCorrection.User.NickName
}
);
);;
}
/// <summary>
@ -1435,6 +1436,7 @@ namespace RMuseum.Services.Implementation
Date = dbCorrection.Date,
Reviewed = dbCorrection.Reviewed,
Result = dbCorrection.Result,
RhythmResult = dbCorrection.RhythmResult,
UserNickname = string.IsNullOrEmpty(dbCorrection.User.NickName) ? dbCorrection.User.Id.ToString() : dbCorrection.User.NickName
}
);