diff --git a/RMuseum/DbContext/RMuseumDbContext.cs b/RMuseum/DbContext/RMuseumDbContext.cs index 4a1a51e5..15d5f34c 100644 --- a/RMuseum/DbContext/RMuseumDbContext.cs +++ b/RMuseum/DbContext/RMuseumDbContext.cs @@ -669,5 +669,10 @@ namespace RMuseum.DbContext /// public DbSet TajikPages { get; set; } + /// + /// ganjoor cat corrections + /// + public DbSet GanjoorCatCorrections { get; set; } + } } diff --git a/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatCorrectionViewModel.cs b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatCorrectionViewModel.cs new file mode 100644 index 00000000..05d696ba --- /dev/null +++ b/RMuseum/Models/Ganjoor/ViewModels/GanjoorCatCorrectionViewModel.cs @@ -0,0 +1,87 @@ +using System; + +namespace RMuseum.Models.Ganjoor.ViewModels +{ + public class GanjoorCatCorrectionViewModel + { + /// + /// 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; } + + /// + /// nickname + /// + public string UserNickname { get; set; } + + /// + /// reviewed + /// + public bool Reviewed { get; set; } + + /// + /// reviewdate + /// + public DateTime ReviewDate { get; set; } + + /// + /// review note + /// + public string ReviewNote { get; set; } + + /// + /// review result for description + /// + public CorrectionReviewResult Result { get; set; } + + /// + /// hide the editors name + /// + public bool HideMyName { get; set; } + } +} diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml index bcd41ae6..aba6c4ea 100644 --- a/RMuseum/RMuseum.xml +++ b/RMuseum/RMuseum.xml @@ -3764,6 +3764,11 @@ tajik pages + + + ganjoor cat corrections + + @@ -10958,6 +10963,86 @@ simulate naming + + + 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 + + + + + nickname + + + + + reviewed + + + + + reviewdate + + + + + review note + + + + + review result for description + + + + + hide the editors name + + cat view model diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs index d39f84ae..aa74f5cc 100644 --- a/RMuseum/Services/Implementation/GanjoorService.cs +++ b/RMuseum/Services/Implementation/GanjoorService.cs @@ -25,12 +25,6 @@ using System.IO; using RSecurityBackend.Models.Image; using FluentFTP; using System.Drawing; -using RSecurityBackend.Models.Auth.ViewModels; -using Newtonsoft.Json; -using System.Net; -using System.Text; -using RMuseum.Models.Auth.ViewModel; -using System.Net.Http.Headers; using RMuseum.Models.GanjoorIntegration; using RSecurityBackend.Models.Notification; @@ -3878,6 +3872,9 @@ namespace RMuseum.Services.Implementation } } + + + /// /// aggressive cache ///