From 36c7ebb8dd40018a790c4626e8ea92b60b19f908 Mon Sep 17 00:00:00 2001 From: Hamid Reza Mohammadi Date: Mon, 11 Dec 2023 15:41:44 +0330 Subject: [PATCH] #415 separate recitations by type --- GanjooRazor/Pages/Index.cshtml.cs | 5 +++-- GanjooRazor/Pages/_GanjoorPagePartial.cshtml | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/GanjooRazor/Pages/Index.cshtml.cs b/GanjooRazor/Pages/Index.cshtml.cs index b9997446..0ab49a43 100644 --- a/GanjooRazor/Pages/Index.cshtml.cs +++ b/GanjooRazor/Pages/Index.cshtml.cs @@ -9,6 +9,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using RMuseum.Models.Ganjoor; using RMuseum.Models.Ganjoor.ViewModels; +using RMuseum.Models.GanjoorAudio; using RMuseum.Models.GanjoorAudio.ViewModels; using System; using System.Collections.Generic; @@ -93,12 +94,12 @@ namespace GanjooRazor.Pages }; } - public _AudioPlayerPartialModel GetRecitationsModel(PublicRecitationViewModel[] recitations, bool minimumControls) + public _AudioPlayerPartialModel GetRecitationsModel(PublicRecitationViewModel[] recitations, bool minimumControls, RecitationType recitationType) { return new _AudioPlayerPartialModel() { LoggedIn = LoggedIn, - Recitations = recitations, + Recitations = recitations.Where(a => a.RecitationType == recitationType).ToArray(), ShowAllRecitaions = minimumControls ? true : ShowAllRecitaions, CategoryMode = minimumControls }; diff --git a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml index abc63adc..27d5bf65 100644 --- a/GanjooRazor/Pages/_GanjoorPagePartial.cshtml +++ b/GanjooRazor/Pages/_GanjoorPagePartial.cshtml @@ -592,14 +592,26 @@ @{ - if (Model.GanjoorPage.Poem.Recitations.Length > 0) + if (Model.GanjoorPage.Poem.Recitations.Where(a => a.RecitationType == RMuseum.Models.GanjoorAudio.RecitationType.Normal).Any()) { + } + + if (Model.GanjoorPage.Poem.Recitations.Where(a => a.RecitationType == RMuseum.Models.GanjoorAudio.RecitationType.Commentary).Any()) + { + }