From cae18f21cae644c4bfd7e16b89883e96c32a18ad Mon Sep 17 00:00:00 2001
From: dneed <113213942+dneed-nimble@users.noreply.github.com>
Date: Tue, 23 Apr 2024 11:19:54 +0100
Subject: [PATCH 1/3] Application form allowing Form a MATs

---
 .../Pages/ApplicationForm/Index.cshtml.cs                      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs
index b2bbcd8da..a2a95669b 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs
@@ -40,7 +40,8 @@ public override async Task<IActionResult> OnGetAsync(int id)
          return NotFound();
       }
 
-      if (applicationResponse.Body.ApplicationType is not ("JoinMat" or "joinAMat"))
+      // MAT = Multi academy trust
+      if (applicationResponse.Body.ApplicationType.ToUpper().Contains("MAT") is false)
       {
          return StatusCode(501);
       }

From e006f8e4a926f75289f3e89eb7334aabf9d1c0af Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Wed, 24 Apr 2024 11:28:11 +0100
Subject: [PATCH 2/3] Form a mat application bug fix

---
 .../Pages/ApplicationForm/Index.cshtml.cs     |  4 +-
 .../Pages/Shared/_SubMenu.cshtml              | 62 +++++++++----------
 .../ViewModels/ProjectViewModel.cs            |  1 -
 3 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs
index a2a95669b..7324979ea 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ApplicationForm/Index.cshtml.cs
@@ -40,8 +40,8 @@ public override async Task<IActionResult> OnGetAsync(int id)
          return NotFound();
       }
 
-      // MAT = Multi academy trust
-      if (applicationResponse.Body.ApplicationType.ToUpper().Contains("MAT") is false)
+      // This page should only show for join a mat application forms
+      if (applicationResponse.Body.ApplicationType is not ("JoinMat" or "joinAMat"))
       {
          return StatusCode(501);
       }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
index 8d3abba76..44d3c27af 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
@@ -3,25 +3,24 @@
 @{
     var id = ViewContext.RouteData.Values["id"];
 }
-
 <nav class="moj-sub-navigation" aria-label="Sub navigation">
-   <ul class="moj-sub-navigation__list govuk-!-margin-top-6">
-      <li class="moj-sub-navigation__item">
-         <sub-menu-link class="moj-sub-navigation__link"
-                        asp-page="@Links.TaskList.Index.Page"
-                        asp-route-id="@id">
-            Project details
-         </sub-menu-link>
-      </li>
+    <ul class="moj-sub-navigation__list govuk-!-margin-top-6">
+        <li class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.TaskList.Index.Page"
+                           asp-route-id="@id">
+                Project details
+            </sub-menu-link>
+        </li>
 
-        <li if="@Model.IsVoluntary && !Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
-         <sub-menu-link class="moj-sub-navigation__link"
-                        asp-page="@Links.ApplicationForm.Index.Page"
-                        asp-route-id="@id">
-            School application form
-         </sub-menu-link>
-      </li>
-        <li if="@Model.IsFormAMat;" class="moj-sub-navigation__item">
+        <li if="@Model.IsVoluntary && !Model.IsExternalSchoolApplication && !Model.IsFormAMat" class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.ApplicationForm.Index.Page"
+                           asp-route-id="@id">
+                School application form
+            </sub-menu-link>
+        </li>
+        <li if="@Model.IsFormAMat" class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
                            asp-page="@Links.FormAMat.Index.Page"
                            asp-route-id="@id">
@@ -30,12 +29,13 @@
         </li>
 
         <li if="@Model.IsSponsored" class="moj-sub-navigation__item">
-         <sub-menu-link class="moj-sub-navigation__link"
-                        asp-page="@Links.AnnexB.Index.Page"
-                        asp-route-id="@id">
-            Annex B form
-         </sub-menu-link>
-      </li>
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.AnnexB.Index.Page"
+                           asp-route-id="@id">
+                Annex B form
+            </sub-menu-link>
+        </li>
+
         <li if="@Model.IsVoluntary && Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
                            asp-page="@Links.ExternalApplicationForm.Index.Page"
@@ -50,12 +50,12 @@
                 Record a decision
             </sub-menu-link>
         </li>
-      <li class="moj-sub-navigation__item">
-         <sub-menu-link class="moj-sub-navigation__link"
-                        asp-page="@Links.ProjectNotes.Index.Page"
-                        asp-route-id="@id">
-            Project notes
-         </sub-menu-link>
-      </li>
-   </ul>
+        <li class="moj-sub-navigation__item">
+            <sub-menu-link class="moj-sub-navigation__link"
+                           asp-page="@Links.ProjectNotes.Index.Page"
+                           asp-route-id="@id">
+                Project notes
+            </sub-menu-link>
+        </li>
+    </ul>
 </nav>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
index cacccd5f1..6a14b791a 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectViewModel.cs
@@ -130,7 +130,6 @@ public ProjectViewModel(AcademyConversionProject project)
 
    public string Id { get; }
    public int? FormAMatProjectId { get; }
-   public bool IsFormAMat { get; }
    public string ProjectStatus { get; }
    public string ProjectStatusColour { get; }
    public string ApplicationReferenceNumber { get; set; }

From d9b6b402d0bf121b5d07446800e1532f57026486 Mon Sep 17 00:00:00 2001
From: plockwood <paul.lockwood@education.gov.uk>
Date: Wed, 24 Apr 2024 13:23:02 +0100
Subject: [PATCH 3/3] another form a mat bug fix for the submenu

---
 .../Pages/Shared/_SubMenu.cshtml              | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
index 44d3c27af..d75b360d0 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_SubMenu.cshtml
@@ -20,29 +20,31 @@
                 School application form
             </sub-menu-link>
         </li>
-        <li if="@Model.IsFormAMat" class="moj-sub-navigation__item">
+
+        <li if="@Model.IsVoluntary && Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
-                           asp-page="@Links.FormAMat.Index.Page"
+                           asp-page="@Links.ExternalApplicationForm.Index.Page"
                            asp-route-id="@id">
                 School application form
             </sub-menu-link>
         </li>
 
-        <li if="@Model.IsSponsored" class="moj-sub-navigation__item">
+        <li if="@Model.IsFormAMat && !Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
-                           asp-page="@Links.AnnexB.Index.Page"
+                           asp-page="@Links.FormAMat.Index.Page"
                            asp-route-id="@id">
-                Annex B form
+                School application form
             </sub-menu-link>
         </li>
 
-        <li if="@Model.IsVoluntary && Model.IsExternalSchoolApplication" class="moj-sub-navigation__item">
+        <li if="@Model.IsSponsored" class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
-                           asp-page="@Links.ExternalApplicationForm.Index.Page"
+                           asp-page="@Links.AnnexB.Index.Page"
                            asp-route-id="@id">
-                School application form
+                Annex B form
             </sub-menu-link>
         </li>
+
         <li class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
                            asp-page="@Links.Decision.SubMenuRecordADecision.Page"
@@ -50,6 +52,7 @@
                 Record a decision
             </sub-menu-link>
         </li>
+
         <li class="moj-sub-navigation__item">
             <sub-menu-link class="moj-sub-navigation__link"
                            asp-page="@Links.ProjectNotes.Index.Page"