diff --git a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
index 3c866ae5..3960ea79 100644
--- a/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
+++ b/GanjooRazor/Areas/Admin/Pages/ReviewEdits.cshtml.cs
@@ -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
{
diff --git a/RMuseum/Models/Ganjoor/CorrectionReviewResult.cs b/RMuseum/Models/Ganjoor/CorrectionReviewResult.cs
new file mode 100644
index 00000000..759444e9
--- /dev/null
+++ b/RMuseum/Models/Ganjoor/CorrectionReviewResult.cs
@@ -0,0 +1,16 @@
+namespace RMuseum.Models.Ganjoor
+{
+ ///
+ /// correction review result
+ ///
+ public enum CorrectionReviewResult
+ {
+ NotReviewed = 0,
+ Approved = 1,
+ NotChanged = 2,
+ RejectedBecauseWrong = 3,
+ RejectedBecauseVariant = 4,
+ RejectedBecauseUnnecessaryChange = 5,
+ Rejected = 6
+ }
+}
diff --git a/RMuseum/Models/Ganjoor/GanjoorPoemCorrection.cs b/RMuseum/Models/Ganjoor/GanjoorPoemCorrection.cs
index 45a4dc9d..aff966d4 100644
--- a/RMuseum/Models/Ganjoor/GanjoorPoemCorrection.cs
+++ b/RMuseum/Models/Ganjoor/GanjoorPoemCorrection.cs
@@ -103,54 +103,14 @@ namespace RMuseum.Models.Ganjoor
/// review result for title and rhythm
///
public CorrectionReviewResult Result { get; set; }
+
+ ///
+ /// review result for rhythm
+ ///
+ public CorrectionReviewResult RhythmResult { get; set; }
}
- ///
- /// Verse Vorder / Text
- ///
- public class GanjoorVerseVOrderText
- {
- ///
- /// record id
- ///
- public int Id { get; set; }
- ///
- /// verse order
- ///
- public int VORder { get; set; }
+
- ///
- /// text
- ///
- public string Text { get; set; }
-
- ///
- /// original text
- ///
- public string OriginalText { get; set; }
-
- ///
- /// review result
- ///
- public CorrectionReviewResult Result { get; set; }
-
- ///
- /// note
- ///
- public string ReviewNote { get; set; }
- }
-
- ///
- /// correction review result
- ///
- public enum CorrectionReviewResult
- {
- NotReviewed = 0,
- Approved = 1,
- NoChanged = 2,
- RejectedBecauseWrong = 3,
- RejectedBecauseVariant = 4,
- RejectedBecauseUnnecessaryChange = 5,
- Rejected = 6
- }
+
}
diff --git a/RMuseum/Models/Ganjoor/GanjoorVerseVOrderText.cs b/RMuseum/Models/Ganjoor/GanjoorVerseVOrderText.cs
new file mode 100644
index 00000000..cdc77ab1
--- /dev/null
+++ b/RMuseum/Models/Ganjoor/GanjoorVerseVOrderText.cs
@@ -0,0 +1,37 @@
+namespace RMuseum.Models.Ganjoor
+{
+ ///
+ /// Verse Vorder / Text
+ ///
+ public class GanjoorVerseVOrderText
+ {
+ ///
+ /// record id
+ ///
+ public int Id { get; set; }
+ ///
+ /// verse order
+ ///
+ public int VORder { get; set; }
+
+ ///
+ /// text
+ ///
+ public string Text { get; set; }
+
+ ///
+ /// original text
+ ///
+ public string OriginalText { get; set; }
+
+ ///
+ /// review result
+ ///
+ public CorrectionReviewResult Result { get; set; }
+
+ ///
+ /// note
+ ///
+ public string ReviewNote { get; set; }
+ }
+}
diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCorrectionViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCorrectionViewModel.cs
index c16ebea3..9c35b386 100644
--- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCorrectionViewModel.cs
+++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorPoemCorrectionViewModel.cs
@@ -78,8 +78,13 @@ namespace RMuseum.Models.Ganjoor.ViewModels
public string ReviewNote { get; set; }
///
- /// review result for title and rhythm
+ /// review result for title
///
public CorrectionReviewResult Result { get; set; }
+
+ ///
+ /// review result for rhythm
+ ///
+ public CorrectionReviewResult RhythmResult { get; set; }
}
}
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index 70e14257..10f8155f 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -4216,6 +4216,11 @@
pinterest image url
+
+
+ correction review result
+
+
Ganjoor Category
@@ -4870,44 +4875,9 @@
review result for title and rhythm
-
+
- Verse Vorder / Text
-
-
-
-
- record id
-
-
-
-
- verse order
-
-
-
-
- text
-
-
-
-
- original text
-
-
-
-
- review result
-
-
-
-
- note
-
-
-
-
- correction review result
+ review result for rhythm
@@ -5030,6 +5000,41 @@
text
+
+
+ Verse Vorder / Text
+
+
+
+
+ record id
+
+
+
+
+ verse order
+
+
+
+
+ text
+
+
+
+
+ original text
+
+
+
+
+ review result
+
+
+
+
+ note
+
+
poem related track
@@ -5822,7 +5827,12 @@
- review result for title and rhythm
+ review result for title
+
+
+
+
+ review result for rhythm
diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs
index c33368c9..7c98343e 100644
--- a/RMuseum/Services/Implementation/GanjoorService.cs
+++ b/RMuseum/Services/Implementation/GanjoorService.cs
@@ -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
}
- );
+ );;
}
///
@@ -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
}
);