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

#445 GanjoorTajikPage

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2024-07-21 15:03:02 +03:30
parent d0f79f9a59
commit 9a036b356d
6 changed files with 48 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
RMuseum/DbContext/RMuseumDbContext.cs
View File

@ -619,5 +619,10 @@ namespace RMuseum.DbContext
/// </summary>
public DbSet<GanjoorTajikVerse> TajikVerses { get; set; }
/// <summary>
/// tajik pages
/// </summary>
public DbSet<GanjoorTajikPage> TajikPages { get; set; }
}
}

20
RMuseum/Models/Ganjoor/GanjoorTajikPage.cs Normal file
View File

@ -0,0 +1,20 @@
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
namespace RMuseum.Models.Ganjoor
{
public class GanjoorTajikPage
{
/// <summary>
/// id
/// </summary>
[Key, DatabaseGenerated(DatabaseGeneratedOption.None)]
public int Id { get; set; }
/// <summary>
/// verses text as html (ganjoor.net format)
/// </summary>
public string TajikHtmlText { get; set; }
}
}

6
RMuseum/Models/Ganjoor/GanjoorTajikPoem.cs
View File

@ -25,11 +25,5 @@ namespace RMuseum.Models.Ganjoor
/// verses text
/// </summary>
public string TajikPlainText { get; set; }
/// <summary>
/// verses text as html (ganjoor.net format)
/// </summary>
public string TajikHtmlText { get; set; }
}
}

20
RMuseum/RMuseum.xml
View File

@ -3638,6 +3638,11 @@
tajik verse
</summary>
</member>
<member name="P:RMuseum.DbContext.RMuseumDbContext.TajikPages">
<summary>
tajik pages
</summary>
</member>
<member name="T:RMuseum.Migrations.PictureFileExtUrl">
<inheritdoc />
</member>
@ -9794,6 +9799,16 @@
additional descripion or note in Tajik
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPage.Id">
<summary>
id
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPage.TajikHtmlText">
<summary>
verses text as html (ganjoor.net format)
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPoem.Id">
<summary>
id
@ -9814,11 +9829,6 @@
verses text
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPoem.TajikHtmlText">
<summary>
verses text as html (ganjoor.net format)
</summary>
</member>
<member name="P:RMuseum.Models.Ganjoor.GanjoorTajikPoet.Id">
<summary>
id

8
RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-Tajik.cs
View File

@ -47,6 +47,12 @@ namespace RMuseum.Services.Implementation
int poetId = page.Poem != null ? page.Poem.Category.Poet.Id : page.PoetOrCat.Poet.Id;
var tajikPage = await _context.TajikPages.AsNoTracking().Where(p => p.Id == page.Id).SingleOrDefaultAsync();
if (tajikPage == null)
return new RServiceResult<GanjoorPageCompleteViewModel>(null, "Ин сафҳа ҳануз ба тоҷикии баргардонида нашуда.");
page.HtmlText = tajikPage.TajikHtmlText;
var tajikPoet = await _context.TajikPoets.AsNoTracking().Where(p => p.Id == poetId).SingleOrDefaultAsync();
if (tajikPoet == null)
return new RServiceResult<GanjoorPageCompleteViewModel>(null, "Ин суханвар ҳануз ба тоҷикӣ дар дастрас нест.");
@ -129,7 +135,7 @@ namespace RMuseum.Services.Implementation
var tajikPoem = await _context.TajikPoems.AsNoTracking().Where(p => p.Id == page.Poem.Id).SingleAsync();
page.Poem.Title = tajikPoem.TajikTitle;
page.Poem.PlainText = tajikPoem.TajikPlainText;
page.Poem.HtmlText = tajikPoem.TajikHtmlText;
var tajikVerses = await _context.TajikVerses.AsNoTracking().Where(v => v.PoemId == page.Poem.Id).OrderBy(v => v.VOrder).ToListAsync();
foreach( var verse in page.Poem.Verses)

1
TajikGanjoor/Pages/Index.cshtml.cs
View File

@ -116,6 +116,7 @@ namespace TajikGanjoor.Pages
ViewData["Title"] = title;
}
ViewData["BreadCrumpUrls"] = BreadCrumpUrls;
ViewData["GoogleAnalyticsCode"] = Configuration["GoogleAnalyticsCode"];
return Page();
}