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

#266 returning approved mistake for recitations to be shown on the website and versionng js/css files

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-12-23 12:45:02 +03:30
parent 190456d59d
commit c434ece31d
23 changed files with 89 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GanjooRazor/Pages/AudioClip.cshtml
View File

@ -15,7 +15,7 @@
گنجور » نمایش خوانش
</title>
<link href="~/dist/skin/pink.flag/css/jplayer.pink.flag.min.css" rel="stylesheet" type="text/css" />
<link href="~/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="~/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
<script>
@ -149,7 +149,7 @@
</p>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<script src="~/js/bk.js?version=16"></script>
<script src="~/js/bk.js?version=17"></script>
<script src="~/js/jplayersupport.js"></script>
<script src="~/js/vaabd.js"></script>
<script src="~/dist/jplayer/jquery.jplayer.min.js"></script>

2
GanjooRazor/Pages/Bp.cshtml
View File

@ -11,7 +11,7 @@
<title>انتخاب قطعهٔ موسیقی مرتبط با شعر از بیپتونز</title>
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/spotify.css" rel="stylesheet" type="text/css" />
<script src="/lib/jquery/dist/jquery.min.js"></script>

2
GanjooRazor/Pages/Error.cshtml
View File

@ -14,7 +14,7 @@
@ViewData["Title"]
</title>
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

2
GanjooRazor/Pages/Golha.cshtml
View File

@ -10,7 +10,7 @@
<title>انتخاب قطعه‌ای از برنامهٔ گلها مرتبط با این شعر</title>
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/spotify.css" rel="stylesheet" type="text/css" />
<script src="/lib/jquery/dist/jquery.min.js"></script>
<script src="~/js/golha.js"></script>

4
GanjooRazor/Pages/Index.cshtml
View File

@ -16,7 +16,7 @@
{
<meta name="robots" content="noindex, nofollow" />
}
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/fab.css" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
@ -24,7 +24,7 @@
<script>
var playerScrollLock = false;
</script>
<script src="/js/bk.js?version=16"></script>
<script src="/js/bk.js?version=17"></script>
@if (Model.IsHomePage)
{

2
GanjooRazor/Pages/Login.cshtml
View File

@ -13,7 +13,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="hdr">

2
GanjooRazor/Pages/Map.cshtml
View File

@ -12,7 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="description" content="شاعران و نویسندگان گنجور روی نقشهٔ جغرافیایی" />
<meta charset="utf-8" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link rel="stylesheet" href="/css/leaflet.css" />
<style>
.leaflet-container {

2
GanjooRazor/Pages/Pin.cshtml
View File

@ -11,7 +11,7 @@
<title>پیشنهاد شعر مرتبط با تصویر</title>
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/spotify.css" rel="stylesheet" type="text/css" />
<script src="/lib/jquery/dist//jquery.min.js"></script>

2
GanjooRazor/Pages/ReportComment.cshtml
View File

@ -11,7 +11,7 @@
<meta name="robots" content="noindex, nofollow" />
<title>درخواست حذف حاشیه</title>
<script src="/lib/jquery/dist/jquery.min.js"></script>
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<style>
label {
width: 100px;

2
GanjooRazor/Pages/ReportRecitation.cshtml
View File

@ -12,7 +12,7 @@
<meta name="robots" content="noindex, nofollow" />
<title>گزارش خطا در خوانش</title>
<script src="/lib/jquery/dist/jquery.min.js"></script>
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<style>
label {
width: 100px;

2
GanjooRazor/Pages/ResetPassword.cshtml
View File

@ -12,7 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="hdr">

4
GanjooRazor/Pages/Search.cshtml
View File

@ -15,7 +15,7 @@
@ViewData["Title"]
</title>
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/fab.css" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
@ -187,7 +187,7 @@
</div>
<script src="/lib/jquery/dist/jquery.min.js"></script>
<script src="/js/bk.js?version=16"></script>
<script src="/js/bk.js?version=17"></script>
<script src="/js/vaabd.js"></script>
@if (!string.IsNullOrEmpty(ViewData["GoogleAnalyticsCode"].ToString()))

2
GanjooRazor/Pages/Shared/_AdminLayout.cshtml
View File

@ -9,7 +9,7 @@
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" />
<link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/fab.css" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

2
GanjooRazor/Pages/Shared/_Layout.cshtml
View File

@ -9,7 +9,7 @@
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.min.css" />
<link rel="stylesheet" href="~/css/site.css" />
<link href="/dist/skin/blue.monday/css/jplayer.blue.monday.min.css" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/fab.css" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

2
GanjooRazor/Pages/SignUp.cshtml
View File

@ -12,7 +12,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="hdr">

2
GanjooRazor/Pages/Spotify.cshtml
View File

@ -11,7 +11,7 @@
<title>انتخاب قطعهٔ موسیقی مرتبط با شعر از اسپاتیفای</title>
<meta name="robots" content="noindex, nofollow" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link href="/css/spotify.css" rel="stylesheet" type="text/css" />
<script src="/lib/jquery/dist/jquery.min.js"></script>

2
GanjooRazor/Pages/Trans.cshtml
View File

@ -14,7 +14,7 @@
گنجور &raquo; برگردان‌ها و نویس‌های شعر
</title>
<script src="~/lib/jquery/dist/jquery.min.js"></script>
<link href="~/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="~/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />
</head>

2
GanjooRazor/Pages/errors/404.cshtml
View File

@ -14,7 +14,7 @@
@ViewData["Title"]
</title>
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

2
GanjooRazor/Pages/errors/503.cshtml
View File

@ -15,7 +15,7 @@
@ViewData["Title"]
</title>
<link href="/css/p8.css?version=23" rel="stylesheet" type="text/css" />
<link href="/css/p8.css?version=24" rel="stylesheet" type="text/css" />
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
<link rel="search" type="application/opensearchdescription+xml" title="گنجور" href="https://ganjoor.net/search.xml" />

5
RMuseum/Models/GanjoorAudio/ViewModels/PublicRecitationViewModel.cs
View File

@ -97,5 +97,10 @@ namespace RMuseum.Models.GanjoorAudio.ViewModels
/// </summary>
public string HtmlText { get; set; }
/// <summary>
/// mistakes
/// </summary>
public RecitationMistakeViewModel[] Mistakes { get; set; }
}
}

23
RMuseum/Models/GanjoorAudio/ViewModels/RecitationMistakeViewModel.cs Normal file
View File

@ -0,0 +1,23 @@
namespace RMuseum.Models.GanjoorAudio.ViewModels
{
/// <summary>
/// approved mistake view model
/// </summary>
public class RecitationMistakeViewModel
{
/// <summary>
/// mistake
/// </summary>
public string Mistake { get; set; }
/// <summary>
/// number of verses affected
/// </summary>
public int NumberOfLinesAffected { get; set; }
/// <summary>
/// couplet index
/// </summary>
public int CoupletIndex { get; set; }
}
}

25
RMuseum/RMuseum.xml
View File

@ -4059,6 +4059,11 @@
Poem Html Text
</summary>
</member>
<member name="P:RMuseum.Models.GanjoorAudio.ViewModels.PublicRecitationViewModel.Mistakes">
<summary>
mistakes
</summary>
</member>
<member name="T:RMuseum.Models.GanjoorAudio.ViewModels.RecitationErrorReportViewModel">
<summary>
Post Error Report for recitations
@ -4099,6 +4104,26 @@
DateTime
</summary>
</member>
<member name="T:RMuseum.Models.GanjoorAudio.ViewModels.RecitationMistakeViewModel">
<summary>
approved mistake view model
</summary>
</member>
<member name="P:RMuseum.Models.GanjoorAudio.ViewModels.RecitationMistakeViewModel.Mistake">
<summary>
mistake
</summary>
</member>
<member name="P:RMuseum.Models.GanjoorAudio.ViewModels.RecitationMistakeViewModel.NumberOfLinesAffected">
<summary>
number of verses affected
</summary>
</member>
<member name="P:RMuseum.Models.GanjoorAudio.ViewModels.RecitationMistakeViewModel.CoupletIndex">
<summary>
couplet index
</summary>
</member>
<member name="T:RMuseum.Models.GanjoorAudio.ViewModels.RecitationModerateViewModel">
<summary>
Poem Narration Moderation View Model

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

@ -547,7 +547,20 @@ namespace RMuseum.Services.Implementation
PlainText = "", //poem.PlainText
HtmlText = "",//poem.HtmlText
};
return new RServiceResult<PublicRecitationViewModel[]>(await source.AsNoTracking().ToArrayAsync());
var recitations = await source.AsNoTracking().ToArrayAsync();
foreach (var recitation in recitations)
{
recitation.Mistakes =
await _context.RecitationApprovedMistakes.AsNoTracking()
.Where(m => m.RecitationId == recitation.Id)
.Select(m => new RecitationMistakeViewModel()
{
Mistake = m.Mistake,
NumberOfLinesAffected = m.NumberOfLinesAffected,
CoupletIndex = m.CoupletIndex
}).ToArrayAsync();
}
return new RServiceResult<PublicRecitationViewModel[]>(recitations);
}
/// <summary>