Feature/839 profile page pagination

SAPPub.Web/Areas/Compare/Views/Secondary/AcademicPerformancePupilAttainment.cshtml

@@ -39,7 +39,7 @@
                     <a class="moj-sub-navigation__link" aria-current="page" href="@Url.RouteUrl(RouteConstants.CompareSecondaryAcademicPerformancePupilAttainment)@Model.RouteQueryString">@ViewData["SubHeader"]</a>
                 </li>
                 <li class="moj-sub-navigation__item">
-                    <a class="moj-sub-navigation__link" href="@Url.RouteUrl(RouteConstants.CompareSecondaryAcademicPerformanceEnglishAndMathsResults)@Model.RouteQueryString">@PageTitleConstants.SecondarySchoolPageTitles.EnglishAndMathsResults</a>
+                    <a class="moj-sub-navigation__link" href="@Url.RouteUrl(RouteConstants.CompareSecondaryAcademicPerformanceEnglishAndMathsResults)@Model.RouteQueryString">@PageTitleConstants.SecondarySchoolPageTitles.EnglishAndMathsResultsTab</a>
                 </li>
             </ul>
         </nav>

SAPPub.Web/Areas/Profiles/Controllers/CurriculumController.cs

@@ -38,7 +38,7 @@ public async Task<IActionResult> Index([FromServices] IEstablishmentService esta
     [HttpGet]
     [FeatureGate(Constants.Constants.EnablePrimary)]
     [ServiceFilter(typeof(PrimaryQueryValidationFilter))]
-    [Route("school/{urn}/{schoolName}/curriculum/primary", Name = RouteConstants.PrimaryCurriculum)]
+    [Route("school/{urn}/{schoolName}/curriculum/primary", Name = RouteConstants.PrimaryCurriculumAndExtraCurricularActivities)]
     public async Task<IActionResult> KS2(
         [FromServices] IEstablishmentService establishmentService,
         string urn, string schoolName, CancellationToken ct)

SAPPub.Web/Areas/Profiles/ViewModels/Admissions/AdmissionsViewModel.cs

@@ -5,7 +5,7 @@
 
 namespace SAPPub.Web.Areas.Profiles.ViewModels.Admissions;
 
-public class AdmissionsViewModel : BaseViewModel
+public class AdmissionsViewModel : ProfileBaseViewModel
 {
     public required DisplayField<string> SchoolWebsite { get; init; }
 

SAPPub.Web/Areas/Profiles/Views/About/AboutSchool.cshtml

@@ -1,14 +1,15 @@
 @model SAPPub.Web.Areas.Profiles.ViewModels.AboutSchool.AboutSchoolViewModel;
 @inject IMySchoolsListService mySchoolsListService;
-@using SAPPub.Web.Constants
 @using SAPPub.Core.Helpers
 @using SAPPub.Core.Interfaces.Services
+@using SAPPub.Web.Constants
 @using SAPPub.Web.Models.Banner
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 @using static SAPPub.Web.Constants.Constants;
 
 @{
-    ViewData["Header"] = Model.IsExclusivelyKS5 ? "About the school or college" : "About the school";
+    ViewData["Header"] = Model.IsExclusivelyKS5 ? PageTitleConstants.KS5SchoolPageTitles.About : PageTitleConstants.PageTitles.About;
     ViewData["Title"] = $"{Model.SchoolName} - {ViewData["Header"]}";
 }
 
@@ -508,11 +509,7 @@
                 </div>
             </div>
         }
-
-
-        <govuk-pagination id="about-the-school-pagination">
-            <govuk-pagination-next asp-route="@RouteConstants.SecondaryAdmissions" asp-all-route-data="@Model.RouteAttributes">Admissions</govuk-pagination-next>
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.AboutTheSchool))
     </div>
 </div>
 @section Scripts {

SAPPub.Web/Areas/Profiles/Views/Admissions/KS2.cshtml

@@ -1,6 +1,7 @@
 @model AdmissionsViewModel
 @using SAPPub.Web.Areas.Profiles.ViewModels.Admissions
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 
 @{
@@ -257,17 +258,6 @@
                         </govuk-accordion>
         }
 
-
-        <govuk-pagination id="admissions-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.AboutTheSchool" asp-all-route-data="@Model.RouteAttributes">About the school</govuk-pagination-previous>
-            @if(Model.IsKS4)
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.SecondaryAdmissions" asp-all-route-data="@Model.RouteAttributes">Secondary admissions</govuk-pagination-next>
-            }
-            else
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.PrimaryCurriculum" asp-all-route-data="@Model.RouteAttributes">Curriculum and extra-curricular activities</govuk-pagination-next>
-            }
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.PrimaryAdmissions))
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/Admissions/KS4.cshtml

@@ -1,6 +1,7 @@
 @model AdmissionsViewModel
 @using SAPPub.Web.Areas.Profiles.ViewModels.Admissions
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 
 @{
@@ -225,9 +226,7 @@
             </govuk-accordion-item>
         </govuk-accordion>
 
-        <govuk-pagination id="admissions-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.AboutTheSchool" asp-all-route-data="@Model.RouteAttributes">About the school</govuk-pagination-previous>
-            <govuk-pagination-next asp-route="@RouteConstants.SecondaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">Curriculum and extra-curricular activities</govuk-pagination-next>
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.SecondaryAdmissions))
+
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/Attendance/Attendance.cshtml

@@ -1,5 +1,6 @@
 @using SAPPub.Web.Areas.Profiles.ViewModels.Attendance
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 
 @model AttendanceViewModel;
@@ -237,9 +238,7 @@
             </tbody>
         </table>
 
-        <govuk-pagination id="attendance-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.SecondaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">Curriculum and extra-curricular activities</govuk-pagination-previous>
-            <govuk-pagination-next asp-route="@RouteConstants.SecondaryAcademicPerformanceAttainmentAndProgress" asp-all-route-data="@Model.RouteAttributes">Secondary academic performance: Progress and attainment</govuk-pagination-next>
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.Attendance))
+
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/Curriculum/KS2.cshtml

@@ -1,6 +1,7 @@
 @model CurriculumAndExtraCurricularActivitiesViewModel;
 @using SAPPub.Web.Areas.Profiles.ViewModels.KS2
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 
 @{
@@ -29,7 +30,7 @@
             <nav id="sub-navigation-academic-performance" class="moj-sub-navigation" aria-label="Sub navigation">
                 <ul class="moj-sub-navigation__list">
                     <li class="moj-sub-navigation__item">
-                        <a class="moj-sub-navigation__link" aria-current="page" asp-route="@RouteConstants.PrimaryCurriculum" asp-all-route-data="@Model.RouteAttributes">@PageTitleConstants.PrimarySchoolPageTitles.Curriculum</a>
+                        <a class="moj-sub-navigation__link" aria-current="page" asp-route="@RouteConstants.PrimaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">@PageTitleConstants.PrimarySchoolPageTitles.Curriculum</a>
                     </li>
                     <li class="moj-sub-navigation__item">
                         <a class="moj-sub-navigation__link" asp-route="@RouteConstants.SecondaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">@PageTitleConstants.SecondarySchoolPageTitles.Curriculum</a>
@@ -149,23 +150,7 @@
             </div>
         </div>
 
-        <govuk-pagination id="current-extra-curricular-activities-pagination">
-            @if (Model.IsKS4)
-            {
-                <govuk-pagination-previous asp-route="@RouteConstants.SecondaryAdmissions" asp-all-route-data="@Model.RouteAttributes">Secondary admissions</govuk-pagination-previous>
-            }
-            else
-            {
-                <govuk-pagination-previous asp-route="@RouteConstants.PrimaryAdmissions" asp-all-route-data="@Model.RouteAttributes">Admissions</govuk-pagination-previous>
-            }
-            @if (Model.IsKS4)
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.SecondaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">Secondary curriculum</govuk-pagination-next>
-            }
-            else
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.Attendance" asp-all-route-data="@Model.RouteAttributes">Attendance</govuk-pagination-next>
-            }
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.PrimaryCurriculumAndExtraCurricularActivities))
+
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/Curriculum/KS4.cshtml

@@ -1,6 +1,7 @@
 @model CurriculumAndExtraCurricularActivitiesViewModel;
 @using SAPPub.Web.Areas.Profiles.ViewModels.KS4
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 
 @{
@@ -30,7 +31,7 @@
             <nav id="sub-navigation-academic-performance" class="moj-sub-navigation" aria-label="Sub navigation">
                 <ul class="moj-sub-navigation__list">
                     <li class="moj-sub-navigation__item">
-                        <a class="moj-sub-navigation__link" asp-route="@RouteConstants.PrimaryCurriculum" asp-all-route-data="@Model.RouteAttributes">@PageTitleConstants.PrimarySchoolPageTitles.Curriculum</a>
+                        <a class="moj-sub-navigation__link" asp-route="@RouteConstants.PrimaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">@PageTitleConstants.PrimarySchoolPageTitles.Curriculum</a>
                     </li>
                     <li class="moj-sub-navigation__item">
                         <a class="moj-sub-navigation__link" aria-current="page" asp-route="@RouteConstants.SecondaryCurriculumAndExtraCurricularActivities" asp-all-route-data="@Model.RouteAttributes">@PageTitleConstants.SecondarySchoolPageTitles.Curriculum</a>
@@ -166,9 +167,7 @@
             </div>
         </div>
 
-        <govuk-pagination id="current-extra-curricular-activities-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.SecondaryAdmissions" asp-all-route-data="@Model.RouteAttributes">Admissions</govuk-pagination-previous>
-            <govuk-pagination-next asp-route="@RouteConstants.Attendance" asp-all-route-data="@Model.RouteAttributes">Attendance</govuk-pagination-next>            
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.SecondaryCurriculumAndExtraCurricularActivities))
+
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/Destinations/KS4.cshtml

@@ -1,6 +1,7 @@
 @model KS4DestinationsViewModel;
 @using SAPPub.Web.Areas.Profiles.ViewModels.Destinations
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 @using static SAPPub.Web.Constants.Constants;
 
@@ -226,9 +227,8 @@
             </div>
         </div> *@
 
-        <govuk-pagination id="destinations-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.SecondaryAcademicPerformanceAdditionalMeasures" asp-all-route-data="@Model.RouteAttributes">Secondary academic performance: Additional measures</govuk-pagination-previous>
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.SecondaryDestinations))
+
     </div>
 </div>
 

SAPPub.Web/Areas/Profiles/Views/Destinations/KS5.cshtml

@@ -1,6 +1,7 @@
 @model KS5DestinationsViewModel;
 @using SAPPub.Web.Areas.Profiles.ViewModels.Destinations
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 @using static SAPPub.Web.Constants.Constants;
 
@@ -134,21 +135,11 @@
             </p>
         </govuk-inset-text>
 
-        <govuk-pagination id="destinations-pagination">
-            @if (Model.IsKS4 == true)
-            {
-                <govuk-pagination-previous asp-route="@RouteConstants.SecondaryDestinations" asp-all-route-data="@Model.RouteAttributes">Destinations</govuk-pagination-previous>
-            }
-            else
-            {
-                <govuk-pagination-previous asp-route="@RouteConstants.KS5AcademicPerformanceSubjectsEntered" asp-all-route-data="@Model.RouteAttributes">Academic performance: Subjects entered</govuk-pagination-previous>
-            }
-            <govuk-pagination-next asp-route="@RouteConstants.KS5DestinationsHigher" asp-all-route-data="@Model.RouteAttributes">Student destinations after 16 to 19 study</govuk-pagination-next>
-
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.KS5Destinations))
+
     </div>
 </div>
-
+`
 @section Scripts {
     <script src="~/js/chart.umd.js"></script>
     <script src="~/js/chartjs-plugin-datalabels.min.js"></script>

SAPPub.Web/Areas/Profiles/Views/Destinations/KS5HigherLevel.cshtml

@@ -1,5 +1,6 @@
 @model SAPPub.Web.Areas.Profiles.ViewModels.AboutSchool.AboutSchoolViewModel;
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 
 @{
@@ -53,18 +54,8 @@
 
 
 
-        <govuk-pagination id="destinations-pagination">
-            @if (Model.IsKS4 == true)
-            {
-                <govuk-pagination-previous asp-route="@RouteConstants.SecondaryDestinations" asp-all-route-data="@Model.RouteAttributes">Destinations</govuk-pagination-previous>
-            }
-            else
-            {
-                <govuk-pagination-previous asp-route="@RouteConstants.SecondaryAcademicPerformanceSubjectsEntered" asp-all-route-data="@Model.RouteAttributes">Academic performance: Subjects entered</govuk-pagination-previous>
-            }
-            <govuk-pagination-next asp-route="@RouteConstants.KS5DestinationsHigher" asp-all-route-data="@Model.RouteAttributes">Student destinations after 16 to 19 study</govuk-pagination-next>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.KS5DestinationsHigher))
 
-        </govuk-pagination>
     </div>
 </div>
 

SAPPub.Web/Areas/Profiles/Views/KS2/AcademicPerformanceAdditionalMeasures.cshtml

@@ -1,7 +1,8 @@
 @model SAPPub.Web.Areas.Profiles.ViewModels.KS2.AcademicPerformanceAdditionalMeasuresViewModel
 @using SAPPub.Web.Constants
-@using static SAPPub.Web.Constants.PageTitleConstants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
+@using static SAPPub.Web.Constants.PageTitleConstants
 
 @{
     ViewData["Header"] = "Academic performance";
@@ -170,13 +171,7 @@
             </govuk-accordion-item>
         </govuk-accordion>
 
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.PrimaryAcademicPerformanceAdditionalMeasures))
 
-        <govuk-pagination id="bottom-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.PrimaryAcademicPerformancePupilProgress" asp-all-route-data="@Model.RouteAttributes">Primary academic performance: Pupil progress</govuk-pagination-previous>
-            @if (Model.IsKS4)
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.SecondaryAcademicPerformanceAttainmentAndProgress" asp-all-route-data="@Model.RouteAttributes">Secondary academic performance: Progress and attainment</govuk-pagination-next>
-            }
-        </govuk-pagination>
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/KS2/AcademicPerformanceMeetingOrExceedingStandards.cshtml

@@ -1,6 +1,7 @@
 @model SAPPub.Web.Areas.Profiles.ViewModels.KS2.AcademicPerformanceMeetingOrExceedingStandardsViewModel
 @using SAPPub.Web.Constants
 @using SAPPub.Web.ViewComponents.ChartWithTableToggle
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 @using static SAPPub.Web.Constants.PageTitleConstants
 
@@ -116,13 +117,9 @@
                 })
         </div>
 
-        <govuk-pagination id="bottom-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.PrimaryAcademicPerformancePupilProgress" asp-all-route-data="@Model.RouteAttributes">Primary academic performance: Pupil progress</govuk-pagination-previous>
-            @if (Model.IsKS4)
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.SecondaryAcademicPerformanceAttainmentAndProgress" asp-all-route-data="@Model.RouteAttributes">Secondary academic performance: Progress and attainment</govuk-pagination-next>
-            }
-        </govuk-pagination>
+
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.PrimaryAcademicPerformanceMeetingOrExceedingStandards))
+
     </div>
 </div>
 

SAPPub.Web/Areas/Profiles/Views/KS2/AcademicPerformancePupilProgress.cshtml

@@ -1,6 +1,7 @@
 @model AcademicPerformancePupilProgressViewModel;
 @using SAPPub.Web.Areas.Profiles.ViewModels.KS2
 @using SAPPub.Web.Constants
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 @using static SAPPub.Web.Constants.PageTitleConstants
 
@@ -231,10 +232,7 @@
 
             </div>
         }
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.PrimaryAcademicPerformancePupilProgress))
 
-        <govuk-pagination id="bottom-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.Attendance" asp-all-route-data="@Model.RouteAttributes">Attendance</govuk-pagination-previous>
-            <govuk-pagination-next asp-route="@RouteConstants.PrimaryAcademicPerformanceAdditionalMeasures" asp-all-route-data="@Model.RouteAttributes">Primary academic performance: Additional measures</govuk-pagination-next>
-        </govuk-pagination>
     </div>
 </div>

SAPPub.Web/Areas/Profiles/Views/KS2/AcademicPerformanceSubjectScaledScores.cshtml

@@ -1,6 +1,7 @@
 @model SAPPub.Web.Areas.Profiles.ViewModels.KS2.AcademicPerformanceSubjectScaledScoresViewModel
 @using SAPPub.Web.Constants
 @using SAPPub.Web.ViewComponents.ChartWithTableToggle
+@using SAPPub.Web.ViewComponents.SchoolProfilePagination
 @using SAPPub.Web.ViewComponents.VerticalNavigation
 @using static SAPPub.Web.Constants.PageTitleConstants
 
@@ -185,13 +186,8 @@
         </govuk-accordion>
 
 
-        <govuk-pagination id="bottom-pagination">
-            <govuk-pagination-previous asp-route="@RouteConstants.PrimaryAcademicPerformancePupilProgress" asp-all-route-data="@Model.RouteAttributes">Primary academic performance: Pupil progress</govuk-pagination-previous>
-            @if (Model.IsKS4)
-            {
-                <govuk-pagination-next asp-route="@RouteConstants.SecondaryAcademicPerformanceAttainmentAndProgress" asp-all-route-data="@Model.RouteAttributes">Secondary academic performance: Progress and attainment</govuk-pagination-next>
-            }
-        </govuk-pagination>
+        @await Component.InvokeAsync("SchoolProfilePagination", SchoolProfilePaginationModel.From(Model, RouteConstants.PrimaryAcademicPerformanceSubjectScaledScores))
+
     </div>
 </div>