Tweaks based on updated designs

DFE-Digital · Dec 4, 2023 · 1a7ea50 · 1a7ea50
1 parent 2b88765
commit 1a7ea50
Show file tree

Hide file tree

Showing 10 changed files with 57 additions and 8 deletions.
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/CheckAnswers.cshtml b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/CheckAnswers.cshtml
@@ -55,7 +55,7 @@
 
             <div class="govuk-button-group">
                 <govuk-button type="submit">Confirm mandatory qualification</govuk-button>
-                <govuk-button formaction="@LinkGenerator.MqAddCheckAnswersCancel(Model.PersonId, Model.JourneyInstance!.InstanceId)" class="govuk-button--secondary" type="submit">Cancel</govuk-button>
+                <govuk-button formaction="@LinkGenerator.MqAddCheckAnswersCancel(Model.PersonId, Model.JourneyInstance!.InstanceId)" class="govuk-button--secondary" type="submit">Cancel and return to record</govuk-button>
             </div>            
         </form>
     </div>

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Provider.cshtml b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Provider.cshtml
@@ -25,7 +25,11 @@
                     }
                 }
             </govuk-radios>
-            <govuk-button type="submit">Continue</govuk-button>
+
+            <div class="govuk-button-group">
+                <govuk-button type="submit">Continue</govuk-button>
+                <govuk-button formaction="@LinkGenerator.MqAddProviderCancel(Model.PersonId, Model.JourneyInstance!.InstanceId)" class="govuk-button--secondary" type="submit">Cancel and return to record</govuk-button>
+            </div>
         </form>
     </div>
 </div>
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Provider.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Provider.cshtml.cs
@@ -50,6 +50,12 @@ public async Task<IActionResult> OnPost()
         return Redirect(_linkGenerator.MqAddSpecialism(PersonId, JourneyInstance!.InstanceId));
     }
 
+    public async Task<IActionResult> OnPostCancel()
+    {
+        await JourneyInstance!.DeleteAsync();
+        return Redirect(_linkGenerator.PersonDetail(PersonId));
+    }
+
     public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
     {
         var personDetail = (ContactDetail?)context.HttpContext.Items["CurrentPersonDetail"];

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Result.cshtml b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Result.cshtml
@@ -16,9 +16,6 @@
     <div class="govuk-grid-column-two-thirds-from-desktop">
         <form action="@LinkGenerator.MqAddResult(Model.PersonId, Model.JourneyInstance!.InstanceId)" method="post">
             <govuk-radios asp-for="Result" data-testid="result-options">
-                <govuk-radios-item value="@dfeta_qualification_dfeta_MQ_Status.InProgress" data-testid="result-in-progress">
-                    In Progress
-                </govuk-radios-item>
                 <govuk-radios-item value="@dfeta_qualification_dfeta_MQ_Status.Deferred" data-testid="result-deferred">
                     Deferred
                 </govuk-radios-item>
@@ -28,6 +25,9 @@
                 <govuk-radios-item value="@dfeta_qualification_dfeta_MQ_Status.Failed" data-testid="result-failed">
                     Failed
                 </govuk-radios-item>
+                <govuk-radios-item value="@dfeta_qualification_dfeta_MQ_Status.InProgress" data-testid="result-in-progress">
+                    In Progress
+                </govuk-radios-item>
                 <govuk-radios-item value="@dfeta_qualification_dfeta_MQ_Status.Passed" data-testid="result-passed">
                     Passed
                     <govuk-radios-item-conditional>
@@ -43,7 +43,10 @@
                 </govuk-radios-item>                    
             </govuk-radios>
 
-            <govuk-button type="submit">Continue</govuk-button>
+            <div class="govuk-button-group">
+                <govuk-button type="submit">Continue</govuk-button>
+                <govuk-button formaction="@LinkGenerator.MqAddResultCancel(Model.PersonId, Model.JourneyInstance!.InstanceId)" class="govuk-button--secondary" type="submit">Cancel and return to record</govuk-button>
+            </div>
         </form>
     </div>
 </div>
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Result.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Result.cshtml.cs
@@ -58,6 +58,12 @@ public async Task<IActionResult> OnPost()
         return Redirect(_linkGenerator.MqAddCheckAnswers(PersonId, JourneyInstance!.InstanceId));
     }
 
+    public async Task<IActionResult> OnPostCancel()
+    {
+        await JourneyInstance!.DeleteAsync();
+        return Redirect(_linkGenerator.PersonDetail(PersonId));
+    }
+
     public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
     {
         var personDetail = (ContactDetail?)context.HttpContext.Items["CurrentPersonDetail"];

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Specialism.cshtml b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Specialism.cshtml
@@ -26,7 +26,10 @@
                 }
             </govuk-radios>
 
-            <govuk-button type="submit">Continue</govuk-button>
+            <div class="govuk-button-group">
+                <govuk-button type="submit">Continue</govuk-button>
+                <govuk-button formaction="@LinkGenerator.MqAddSpecialismCancel(Model.PersonId, Model.JourneyInstance!.InstanceId)" class="govuk-button--secondary" type="submit">Cancel and return to record</govuk-button>
+            </div>
         </form>
     </div>
 </div>
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Specialism.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/Specialism.cshtml.cs
@@ -48,6 +48,12 @@ public async Task<IActionResult> OnPost()
         return Redirect(_linkGenerator.MqAddStartDate(PersonId, JourneyInstance!.InstanceId));
     }
 
+    public async Task<IActionResult> OnPostCancel()
+    {
+        await JourneyInstance!.DeleteAsync();
+        return Redirect(_linkGenerator.PersonDetail(PersonId));
+    }
+
     public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
     {
         var personDetail = (ContactDetail?)context.HttpContext.Items["CurrentPersonDetail"];

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/StartDate.cshtml b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/StartDate.cshtml
@@ -19,7 +19,10 @@
                 </govuk-date-input-fieldset>
             </govuk-date-input>
 
-            <govuk-button type="submit">Continue</govuk-button>
+            <div class="govuk-button-group">
+                <govuk-button type="submit">Continue</govuk-button>
+                <govuk-button formaction="@LinkGenerator.MqAddStartDateCancel(Model.PersonId, Model.JourneyInstance!.InstanceId)" class="govuk-button--secondary" type="submit">Cancel and return to record</govuk-button>
+            </div>
         </form>
     </div>
 </div>
diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/StartDate.cshtml.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/AddMq/StartDate.cshtml.cs
@@ -45,6 +45,12 @@ public async Task<IActionResult> OnPost()
         return Redirect(_linkGenerator.MqAddResult(PersonId, JourneyInstance!.InstanceId));
     }
 
+    public async Task<IActionResult> OnPostCancel()
+    {
+        await JourneyInstance!.DeleteAsync();
+        return Redirect(_linkGenerator.PersonDetail(PersonId));
+    }
+
     public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingContext context, PageHandlerExecutionDelegate next)
     {
         var personDetail = (ContactDetail?)context.HttpContext.Items["CurrentPersonDetail"];

diff --git a/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TrsLinkGenerator.cs b/TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/TrsLinkGenerator.cs
@@ -51,15 +51,27 @@ public string MqAdd(Guid personId) =>
     public string MqAddProvider(Guid personId, JourneyInstanceId? journeyInstanceId) =>
         GetRequiredPathByPage("/Mqs/AddMq/Provider", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
 
+    public string MqAddProviderCancel(Guid personId, JourneyInstanceId journeyInstanceId) =>
+        GetRequiredPathByPage("/Mqs/AddMq/Provider", "cancel", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
+
     public string MqAddSpecialism(Guid personId, JourneyInstanceId journeyInstanceId) =>
         GetRequiredPathByPage("/Mqs/AddMq/Specialism", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
 
+    public string MqAddSpecialismCancel(Guid personId, JourneyInstanceId journeyInstanceId) =>
+        GetRequiredPathByPage("/Mqs/AddMq/Specialism", "cancel", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
+
     public string MqAddStartDate(Guid personId, JourneyInstanceId journeyInstanceId) =>
         GetRequiredPathByPage("/Mqs/AddMq/StartDate", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
 
+    public string MqAddStartDateCancel(Guid personId, JourneyInstanceId journeyInstanceId) =>
+        GetRequiredPathByPage("/Mqs/AddMq/StartDate", "cancel", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
+
     public string MqAddResult(Guid personId, JourneyInstanceId journeyInstanceId) =>
         GetRequiredPathByPage("/Mqs/AddMq/Result", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
 
+    public string MqAddResultCancel(Guid personId, JourneyInstanceId journeyInstanceId) =>
+        GetRequiredPathByPage("/Mqs/AddMq/Result", "cancel", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);
+
     public string MqAddCheckAnswers(Guid personId, JourneyInstanceId journeyInstanceId) =>
         GetRequiredPathByPage("/Mqs/AddMq/CheckAnswers", routeValues: new { personId }, journeyInstanceId: journeyInstanceId);