From 277744c35f88fff415c13a37a41cfd108e0f1ec1 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Fri, 14 Feb 2025 11:19:05 +0330 Subject: [PATCH] #467 GanjoorCatCorrection model --- RMuseum/Models/Ganjoor/GanjoorCat.cs | 4 +- .../Models/Ganjoor/GanjoorCatCorrection.cs | 108 ++++++++++++++++ RMuseum/Models/Ganjoor/GanjoorTajikCat.cs | 2 +- RMuseum/Models/Ganjoor/GanjoorTajikPoet.cs | 2 +- .../Ganjoor/ViewModels/GanjoorCatViewModel.cs | 4 +- .../ViewModels/GanjoorModifyPageViewModel.cs | 4 +- RMuseum/RMuseum.csproj | 8 +- RMuseum/RMuseum.xml | 116 ++++++++++++++++-- 8 files changed, 228 insertions(+), 20 deletions(-) create mode 100644 RMuseum/Models/Ganjoor/GanjoorCatCorrection.cs diff --git a/RMuseum/Models/Ganjoor/GanjoorCat.cs b/RMuseum/Models/Ganjoor/GanjoorCat.cs index abc58a06..c2fc6a81 100644 --- a/RMuseum/Models/Ganjoor/GanjoorCat.cs +++ b/RMuseum/Models/Ganjoor/GanjoorCat.cs @@ -62,12 +62,12 @@ namespace RMuseum.Models.Ganjoor public GanjoorCatType CatType { get; set; } /// - /// additional descripion or note + /// additional description or note /// public string Description { get; set; } /// - /// html mode of additional descripion or note + /// html mode of additional description or note /// public string DescriptionHtml { get; set; } diff --git a/RMuseum/Models/Ganjoor/GanjoorCatCorrection.cs b/RMuseum/Models/Ganjoor/GanjoorCatCorrection.cs new file mode 100644 index 00000000..78b81daf --- /dev/null +++ b/RMuseum/Models/Ganjoor/GanjoorCatCorrection.cs @@ -0,0 +1,108 @@ +using RSecurityBackend.Models.Auth.Db; +using System; + +namespace RMuseum.Models.Ganjoor +{ + public class GanjoorCatCorrection + { + /// + /// correct id + /// + public int Id { get; set; } + + /// + /// category id + /// + public int CatId { get; set; } + + /// + /// category + /// + public GanjoorCat Cat { get; set; } + + /// + /// additional description or note + /// + public string Description { get; set; } + + /// + /// html mode of additional description or note + /// + public string DescriptionHtml { get; set; } + + /// + /// additional description or note + /// + public string OriginalDescription { get; set; } + + /// + /// html mode of additional description or note + /// + public string OriginalDescriptionHtml { get; set; } + + /// + /// note + /// + public string Note { get; set; } + + /// + /// date + /// + public DateTime Date { get; set; } + + /// + /// user Id + /// + public Guid UserId { get; set; } + + /// + /// user + /// + public RAppUser User { get; set; } + + /// + /// reviewed + /// + public bool Reviewed { get; set; } + + /// + /// reviewdate + /// + public DateTime ReviewDate { get; set; } + + /// + /// review note + /// + public string ReviewNote { get; set; } + + /// + /// reviewer id + /// + public Guid? ReviewerUserId { get; set; } + + /// + /// reviwer user id + /// + public virtual RAppUser ReviewerUser { get; set; } + + /// + /// application order for category + /// + public int ApplicationOrder { get; set; } + + /// + /// review result for description + /// + public CorrectionReviewResult Result { get; set; } + + /// + /// had any effect on category after moderation? effective in history + /// + public bool AffectedTheCat { get; set; } + + /// + /// hide the editors name + /// + public bool HideMyName { get; set; } + } +} diff --git a/RMuseum/Models/Ganjoor/GanjoorTajikCat.cs b/RMuseum/Models/Ganjoor/GanjoorTajikCat.cs index 4a534fd0..fe803a3e 100644 --- a/RMuseum/Models/Ganjoor/GanjoorTajikCat.cs +++ b/RMuseum/Models/Ganjoor/GanjoorTajikCat.cs @@ -17,7 +17,7 @@ namespace RMuseum.Models.Ganjoor public string TajikTitle { get; set; } /// - /// additional descripion or note in Tajik + /// additional description or note in Tajik /// public string TajikDescription { get; set; } diff --git a/RMuseum/Models/Ganjoor/GanjoorTajikPoet.cs b/RMuseum/Models/Ganjoor/GanjoorTajikPoet.cs index eaea8869..bf9cb4a5 100644 --- a/RMuseum/Models/Ganjoor/GanjoorTajikPoet.cs +++ b/RMuseum/Models/Ganjoor/GanjoorTajikPoet.cs @@ -17,7 +17,7 @@ namespace RMuseum.Models.Ganjoor public string TajikNickname { get; set; } /// - /// additional descripion or note in Tajik + /// additional description or note in Tajik /// public string TajikDescription { get; set; } diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs index 9110fab3..740564c7 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatViewModel.cs @@ -41,12 +41,12 @@ namespace RMuseum.Models.Ganjoor.ViewModels public GanjoorCatType CatType { get; set; } /// - /// additional descripion or note + /// additional description or note /// public string Description { get; set; } /// - /// html mode of additional descripion or note + /// html mode of additional description or note /// public string DescriptionHtml { get; set; } diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorModifyPageViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorModifyPageViewModel.cs index bf38f6a9..cfdb55f7 100644 --- a/RMuseum/Models/Ganjoor/ViewModels/GanjoorModifyPageViewModel.cs +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorModifyPageViewModel.cs @@ -96,12 +96,12 @@ public GanjoorCatType CatType { get; set; } /// - /// additional descripion or note + /// additional description or note /// public string Description { get; set; } /// - /// html mode of additional descripion or note + /// html mode of additional description or note /// public string DescriptionHtml { get; set; } diff --git a/RMuseum/RMuseum.csproj b/RMuseum/RMuseum.csproj index 538ced0f..75d6bbb5 100644 --- a/RMuseum/RMuseum.csproj +++ b/RMuseum/RMuseum.csproj @@ -19,15 +19,15 @@ - + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index df43a158..bcd41ae6 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -7839,12 +7839,12 @@ - additional descripion or note + additional description or note - html mode of additional descripion or note + html mode of additional description or note @@ -7882,6 +7882,106 @@ category map name + + + correct id + + + + + category id + + + + + category + + + + + additional description or note + + + + + html mode of additional description or note + + + + + additional description or note + + + + + html mode of additional description or note + + + + + note + + + + + date + + + + + user Id + + + + + user + + + + + reviewed + + + + + reviewdate + + + + + review note + + + + + reviewer id + + + + + reviwer user id + + + + + application order for category + + + + + review result for description + + + + + had any effect on category after moderation? effective in history + + + + + hide the editors name + + Ganjoor Category Type @@ -10021,7 +10121,7 @@ - additional descripion or note in Tajik + additional description or note in Tajik @@ -10091,7 +10191,7 @@ - additional descripion or note in Tajik + additional description or note in Tajik @@ -10895,12 +10995,12 @@ - additional descripion or note + additional description or note - html mode of additional descripion or note + html mode of additional description or note @@ -11400,12 +11500,12 @@ - additional descripion or note + additional description or note - html mode of additional descripion or note + html mode of additional description or note