Merge pull request #58 from DFE-Digital/fix/add-back-buttons

Added back links to working Create project pages
DFE-Digital · Jan 29, 2025 · 3ae61d4 · 3ae61d4
2 parents 9907d6e + 0a76c0a
commit 3ae61d4
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/src/Frontend/Dfe.Complete/Constants/RouteConstants.cs b/src/Frontend/Dfe.Complete/Constants/RouteConstants.cs
@@ -2,11 +2,15 @@
 {
     public static class RouteConstants
     {
+        public const string YourProjects = "/";
         public const string ProjectsInProgress = "/projects/all/in-progress/all";
 
         // Project
         public const string Project = "/projects/{0}";
         public const string CreateNewProject = "/projects/CreateNewProject";
+
+        public const string SelectCreateProjectType = "/projects/new";
+
 
         public const string ProjectViewNotes = Project + "/notes";
         public const string ProjectAddNote = ProjectViewNotes + "/edit";

diff --git a/src/Frontend/Dfe.Complete/Pages/Projects/Conversion/CreateNewProject.cshtml b/src/Frontend/Dfe.Complete/Pages/Projects/Conversion/CreateNewProject.cshtml
@@ -1,4 +1,5 @@
 @page "/projects/conversions/new"
+@using Dfe.Complete.Constants
 @model Dfe.Complete.Pages.Projects.Conversion.CreateNewProjectModel
 @inject Dfe.Complete.Services.IErrorService ErrorService
 @{
@@ -13,6 +14,13 @@
     const string handingToRSCField = nameof(Model.IsHandingToRCS);
     const string directiveAcademyOrderField = nameof(Model.DirectiveAcademyOrder);
     const string isDueTo2RIField = nameof(Model.IsDueTo2RI);
+
+    const string backLink = RouteConstants.SelectCreateProjectType;
+}
+
+@section BeforeMain
+{
+<govuk-back-link href="@backLink" xmlns="http://www.w3.org/1999/html"/>
 }
 
 <div class="govuk-grid-row">
@@ -74,7 +82,7 @@
                         </govuk-date-input-hint>
                         @if (ErrorService.HasErrorForKey(@advisoryBoardDateField))
                         {
-                        <govuk-date-input-error-message>@(ErrorService.GetErrorMessage(advisoryBoardDateField))</govuk-date-input-error-message>
+                            <govuk-date-input-error-message>@(ErrorService.GetErrorMessage(advisoryBoardDateField))</govuk-date-input-error-message>
                         }
                     </govuk-date-input-fieldset>
                 </govuk-date-input>
@@ -95,7 +103,7 @@
                         </govuk-date-input-hint>
                         @if (ErrorService.HasErrorForKey(@provisionalConversionDateField))
                         {
-                        <govuk-date-input-error-message>@(ErrorService.GetErrorMessage(provisionalConversionDateField))</govuk-date-input-error-message>
+                            <govuk-date-input-error-message>@(ErrorService.GetErrorMessage(provisionalConversionDateField))</govuk-date-input-error-message>
                         }
                     </govuk-date-input-fieldset>
                 </govuk-date-input >
@@ -130,7 +138,7 @@
                         <govuk-radios-fieldset-legend class="govuk-fieldset__legend--m">
                             Are you handing this project over to RCS (Regional Casework Services)?
                         </govuk-radios-fieldset-legend>
-                        
+
                         @if (ErrorService.HasErrorForKey(handingToRSCField))
                         {
                             <govuk-radios-error-message>@(ErrorService.GetErrorMessage(handingToRSCField))</govuk-radios-error-message>
@@ -171,7 +179,7 @@
 
                         @if (ErrorService.HasErrorForKey(directiveAcademyOrderField))
                         {
-                        <govuk-radios-error-message>@(ErrorService.GetErrorMessage(directiveAcademyOrderField))</govuk-radios-error-message>
+                            <govuk-radios-error-message>@(ErrorService.GetErrorMessage(directiveAcademyOrderField))</govuk-radios-error-message>
                         }
 
                         @* This value should be enums *@
@@ -192,7 +200,7 @@
 
                         @if (ErrorService.HasErrorForKey(isDueTo2RIField))
                         {
-                        <govuk-radios-error-message>@(ErrorService.GetErrorMessage(isDueTo2RIField))</govuk-radios-error-message>
+                            <govuk-radios-error-message>@(ErrorService.GetErrorMessage(isDueTo2RIField))</govuk-radios-error-message>
                         }
 
                         <govuk-radios-item value="true" checked="@Model.IsDueTo2RI">Yes</govuk-radios-item>

diff --git a/src/Frontend/Dfe.Complete/Pages/Projects/CreateNewProject.cshtml b/src/Frontend/Dfe.Complete/Pages/Projects/CreateNewProject.cshtml
@@ -1,7 +1,15 @@
 @page "/projects/new"
+@using Dfe.Complete.Constants
+@using GovUk.Frontend.AspNetCore.TagHelpers
 @model Dfe.Complete.Pages.Projects.CreateNewProjectModel
 @{
     ViewData["Title"] = "Create new project";
+    const string backLink = RouteConstants.YourProjects;
+}
+
+@section BeforeMain
+{
+    <govuk-back-link href="@backLink" xmlns="http://www.w3.org/1999/html"/>
 }
 
 <div class="govuk-grid-row">

diff --git a/src/Frontend/Dfe.Complete/Pages/Projects/MatConversion/CreateNewProject.cshtml b/src/Frontend/Dfe.Complete/Pages/Projects/MatConversion/CreateNewProject.cshtml
@@ -1,4 +1,6 @@
 @page "/projects/conversions/new_mat"
+@using Dfe.Complete.Constants
+@using GovUk.Frontend.AspNetCore.TagHelpers
 @model Dfe.Complete.Pages.Projects.MatConversion.CreateNewProject
 @inject Dfe.Complete.Services.IErrorService ErrorService
 @{
@@ -14,8 +16,14 @@
     const string handingToRSCField = nameof(Model.IsHandingToRCS);
     const string directiveAcademyOrderField = nameof(Model.DirectiveAcademyOrder);
     const string isDueTo2RIField = nameof(Model.IsDueTo2RI);
+
+    const string backLink = RouteConstants.SelectCreateProjectType;
 }
 
+@section BeforeMain
+{
+    <govuk-back-link href="@backLink" xmlns="http://www.w3.org/1999/html"/>
+}
     <div class="govuk-grid-row">
         <div class="govuk-grid-column-two-thirds">
             @{