From b642af88c79211c7910f33b2e150a2dcf3632f54 Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:06:00 +0000
Subject: [PATCH 1/6] update project list view

---
 .../Models/AcademyConversionProject.cs        |  1 +
 .../Pages/ProjectList/Index.cshtml            | 17 +----
 .../Shared/FormAMatProjectListRow.cshtml      | 39 ------------
 .../Shared/SponsoredProjectListRow.cshtml     | 46 --------------
 .../Shared/VoluntaryProjectListRow.cshtml     | 45 -------------
 .../Pages/Shared/_ProjectListRows.cshtml      | 63 +++++++++++++++++++
 .../Utils/ProjectListHelper.cs                |  3 +-
 .../ViewModels/ProjectListViewModel.cs        |  1 +
 8 files changed, 68 insertions(+), 147 deletions(-)
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/SponsoredProjectListRow.cshtml
 delete mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/VoluntaryProjectListRow.cshtml
 create mode 100644 Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
index 2cc9d77e9..df5cba080 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions.Data/Models/AcademyConversionProject.cs
@@ -49,6 +49,7 @@ public class AcademyConversionProject
    public string ConversionSupportGrantEnvironmentalImprovementGrant { get; set; }
    public bool? ConversionSupportGrantAmountChanged { get; set; }
    public DateTime? DaoPackSentDate { get; set; }
+   public string Region { get; set; }
 
    // Annex B
    public bool? AnnexBFormReceived { get; set; }
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
index 4a70c624c..3ee232b4c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
@@ -51,24 +51,9 @@
          <table class="govuk-table">
             <caption class="govuk-table__caption govuk-table__caption--m govuk-visually-hidden">Projects (@Model.ProjectCount)</caption>
 
-            <thead class="govuk-table__head">
-            <tr class="govuk-table__row">
-               <th class="govuk-table__header app-!-width-three-fifths">Application information</th>
-               <th class="govuk-table__header govuk-!-text-align-right app-!-width-two-fifths prepare-text-align-right">Project status and dates</th>
-            </tr>
-            </thead>
-
             <tbody class="govuk-table__body">
             @{
-               var index = 0;
-               foreach (ProjectListViewModel project in Model.Projects)
-               {
-                  <partial if="project.IsSponsored" name="Shared/SponsoredProjectListRow" model="project.Row(index)"/>
-                  <partial if="project.IsVoluntary" name="Shared/VoluntaryProjectListRow" model="project.Row(index)"/>
-                  <partial if="project.IsFormAMat" name="Shared/FormAMatProjectListRow" model="project.Row(index)"/>
-
-                  index++;
-               }
+               <partial name="Shared/_ProjectListRows" model="Model.Projects" />
             }
             </tbody>
          </table>
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml
deleted file mode 100644
index fb58aad23..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/FormAMatProjectListRow.cshtml
+++ /dev/null
@@ -1,39 +0,0 @@
-@using Dfe.Academisation.ExtensionMethods
-@using Dfe.PrepareConversions.TagHelpers
-@model ProjectListRowViewModel
-
-<tr class="govuk-table__row form-a-mat" data-cy="select-projectlist-filter-row">
-   <td class="govuk-table__cell">
-      <h2 class="govuk-caption-l govuk-!-margin-bottom-0 govuk-!-margin-top-1">
-         <strong>
-            <a id="@("school-name-" + Model.Index)" class="govuk-link" asp-page="@Links.FormAMat.Index.Page" asp-route-id="@Model.Item.Id">@Model.Item.SchoolName</a>
-         </strong>
-         <span id="@("urn-" + Model.Index)">URN: @Model.Item.SchoolURN</span>
-      </h2>
-      <p class="govuk-!-margin-top-3">
-         <div data-cy="route">Route: @Model.Item.TypeAndRoute.RouteDescription()</div>
-         <div id="@("application-to-join-trust-" + Model.Index)">Application to join a trust: @Model.Item.NameOfTrust</div>
-         @if (@Model.Item.LocalAuthority.IsEmpty() is false)
-         {
-            <div id="@("local-authority-" + Model.Index)">Local authority: @Model.Item.LocalAuthority</div>
-         }
-      </p>
-   </td>
-   <td class="govuk-table__cell govuk-table__cell prepare-text-align-right">
-      <p class="govuk-!-margin-top-0">
-         <strong class="govuk-tag govuk-tag--@Model.Item.Status.Colour" id="project-status-@Model.Item.Id">@Model.Item.Status.Value</strong>
-      </p>
-      <p class="govuk-hint  govuk-!-margin-top-0">
-         <span id="application-received-date-@Model.Index">
-            Project created date: @Model.Item.CreatedOn.ToDateString()<br>
-         </span>
-         <span if="Model.Item.ShowHtbDate" id="@("Advisory-Board-date-" + Model.Index)">
-            @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)<br>
-         </span>
-         <span if="Model.Item.ShowProposedOpeningDate" id="@("opening-date-" + Model.Index)">
-            Opening date:
-            <span if="Model.Item.ProposedAcademyOpeningDate.IsPresent()">@Model.Item.ProposedAcademyOpeningDate</span>
-         </span>
-      </p>
-   </td>
-</tr>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/SponsoredProjectListRow.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/SponsoredProjectListRow.cshtml
deleted file mode 100644
index e7a9e2351..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/SponsoredProjectListRow.cshtml
+++ /dev/null
@@ -1,46 +0,0 @@
-@using Dfe.PrepareConversions.TagHelpers
-@using Dfe.Academisation.ExtensionMethods
-@model ProjectListRowViewModel
-
-<tr class="govuk-table__row join-a-mat" data-cy="select-projectlist-filter-row">
-   <td class="govuk-table__cell">
-      <h2 class="govuk-caption-l govuk-!-margin-bottom-0 govuk-!-margin-top-1">
-         <strong>
-            <a id="@("school-name-" + Model.Index)" class="govuk-link" asp-page="@Links.TaskList.Index.Page" asp-route-id="@Model.Item.Id">@Model.Item.SchoolName</a>
-         </strong>
-         <span id="@("urn-" + Model.Index)">URN: @Model.Item.SchoolURN</span>
-      </h2>
-      <p class="govuk-!-margin-top-3">
-         <div data-cy="route">Route: @Model.Item.TypeAndRoute.RouteDescription()</div>
-         <div id="@("application-to-join-trust-" + Model.Index)">Application to join a trust: @Model.Item.NameOfTrust</div>
-
-         @if (@Model.Item.LocalAuthority.IsEmpty() is false)
-         {
-            <div id="@("local-authority-" + Model.Index)">Local authority: @Model.Item.LocalAuthority</div>
-         }
-         <div id="@("delivery-officer-" + Model.Index)" class="do">
-            Delivery officer:
-            <span if="Model.Item.AssignedUserFullName.IsEmpty()" class="empty">Empty</span>
-            <strong if="Model.Item.AssignedUserFullName.IsPresent()">@Model.Item.AssignedUserFullName</strong>
-         </div>
-      </p>
-   </td>
-   <td class="govuk-table__cell govuk-table__cell prepare-text-align-right">
-      <p class="govuk-!-margin-top-0">
-         <strong class="govuk-tag govuk-tag--@Model.Item.Status.Colour" id="project-status-@Model.Item.Id">@Model.Item.Status.Value</strong>
-      </p>
-      <p class="govuk-hint  govuk-!-margin-top-0">
-         <span id="application-received-date-@Model.Index">
-            Project created date: @Model.Item.CreatedOn.ToDateString()<br>
-         </span>
-         <span if="Model.Item.ShowHtbDate" id="@("Advisory-Board-date-" + Model.Index)">
-            @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)<br>
-         </span>
-         <span if="Model.Item.ShowHtbDate" id="@("opening-date-" + Model.Index)">
-            Opening date:
-            <span if="Model.Item.ProposedAcademyOpeningDate.IsEmpty()" class="empty">EMPTY</span>
-            <span if="Model.Item.ProposedAcademyOpeningDate.IsPresent()">@Model.Item.ProposedAcademyOpeningDate</span>
-         </span>
-      </p>
-   </td>
-</tr>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/VoluntaryProjectListRow.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/VoluntaryProjectListRow.cshtml
deleted file mode 100644
index 893310905..000000000
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/VoluntaryProjectListRow.cshtml
+++ /dev/null
@@ -1,45 +0,0 @@
-@using Dfe.Academisation.ExtensionMethods
-@using Dfe.PrepareConversions.TagHelpers
-@model ProjectListRowViewModel
-
-<tr class="govuk-table__row join-a-mat" data-cy="select-projectlist-filter-row">
-   <td class="govuk-table__cell">
-      <h2 class="govuk-caption-l govuk-!-margin-bottom-0 govuk-!-margin-top-1">
-         <strong>
-            <a id="@("school-name-" + Model.Index)" class="govuk-link" asp-page="@Links.TaskList.Index.Page" asp-route-id="@Model.Item.Id">@Model.Item.SchoolName</a>
-         </strong>
-         <span id="@("urn-" + Model.Index)">URN: @Model.Item.SchoolURN</span>
-      </h2>
-      <p class="govuk-!-margin-top-3">
-         <div data-cy="route">Route: @Model.Item.TypeAndRoute.RouteDescription()</div>
-         <div id="@("application-to-join-trust-" + Model.Index)">Application to join a trust: @Model.Item.NameOfTrust</div>
-         @if (@Model.Item.LocalAuthority.IsEmpty() is false)
-         {
-            <div id="@("local-authority-" + Model.Index)">Local authority: @Model.Item.LocalAuthority</div>
-         }
-         <div id="@("delivery-officer-" + Model.Index)" class="do">
-            Delivery officer:
-            <span if="Model.Item.AssignedUserFullName.IsEmpty()" class="empty">Empty</span>
-            <strong if="Model.Item.AssignedUserFullName.IsPresent()">@Model.Item.AssignedUserFullName</strong>
-         </div>
-      </p>
-   </td>
-   <td class="govuk-table__cell govuk-table__cell prepare-text-align-right">
-      <p class="govuk-!-margin-top-0">
-         <strong class="govuk-tag govuk-tag--@Model.Item.Status.Colour" id="project-status-@Model.Item.Id">@Model.Item.Status.Value</strong>
-      </p>
-      <p class="govuk-hint  govuk-!-margin-top-0">
-         <span id="application-received-date-@Model.Index">
-            Project created date: @Model.Item.CreatedOn.ToDateString()<br>
-         </span>
-         <span if="Model.Item.ShowHtbDate" id="@("Advisory-Board-date-" + Model.Index)">
-            @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)<br>
-         </span>
-         <span if="Model.Item.ShowHtbDate" id="@("opening-date-" + Model.Index)">
-            Opening date:
-            <span if="Model.Item.ProposedAcademyOpeningDate.IsEmpty()" class="empty">EMPTY</span>
-            <span if="Model.Item.ProposedAcademyOpeningDate.IsPresent()">@Model.Item.ProposedAcademyOpeningDate</span>
-         </span>
-      </p>
-   </td>
-</tr>
\ No newline at end of file
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
new file mode 100644
index 000000000..fe6cbc756
--- /dev/null
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
@@ -0,0 +1,63 @@
+@using Dfe.Academisation.ExtensionMethods
+@using Dfe.PrepareConversions.TagHelpers
+@model List<ProjectListViewModel>
+
+@{
+    var index = 0;
+
+    foreach (var project in Model)
+    {
+        var projectRow = project.Row(index);
+
+        var isFormAMat = project.IsFormAMat;
+        var matTypeClass = isFormAMat ? "form-a-mat" : "join-a-mat";
+        var link = isFormAMat ? @Links.FormAMat.Index.Page : @Links.TaskList.Index.Page;
+
+        <tr class="govuk-table__row @matTypeClass" data-cy="select-projectlist-filter-row">
+            <td class="govuk-table__cell">
+               <div class="govuk-!-margin-top-1 govuk-!-margin-bottom-2">
+                  <strong>
+                     <a id="@("school-name-" + projectRow.Index)" class="govuk-link" asp-page="@link" asp-route-id="@projectRow.Item.Id">@projectRow.Item.SchoolName</a>
+                  </strong>
+               </div>
+               <div>
+                  <span id="@("urn-" + projectRow.Index)"><strong>URN:</strong> @projectRow.Item.SchoolURN</span>
+               </div>
+               @if (@projectRow.Item.LocalAuthority.IsEmpty() is false)
+               {
+                  <div id="@("local-authority-" + projectRow.Index)">
+                     <strong>Local authority:</strong> 
+                     @projectRow.Item.LocalAuthority
+                  </div>
+               }
+               <div id="@("region-" + projectRow.Index)">
+                  <strong>Region:</strong> 
+                  @projectRow.Item.Region
+               </div>
+               <div id="@("incoming-trust-" + projectRow.Index)">
+                  <strong>Incoming trust:</strong>
+                  @projectRow.Item.NameOfTrust
+               </div>
+               <div id="@("advisory-board-date-" + projectRow.Index)">
+                  <strong>Advisory board date:</strong>
+                    <span if="projectRow.Item.HeadTeacherBoardDate.IsEmpty()" class="empty">Empty</span>
+                    <span if="projectRow.Item.HeadTeacherBoardDate.IsPresent()">@projectRow.Item.HeadTeacherBoardDate</span>
+               </div>
+               @if (!isFormAMat)
+               {
+                  <div id="@("assigned-to-" + projectRow.Index)" class="do">
+                     <strong>Assigned to:</strong>
+                     <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Empty</span>
+                     <strong if="projectRow.Item.AssignedUserFullName.IsPresent()">@projectRow.Item.AssignedUserFullName</strong>
+                  </div>
+               }
+               <div>
+                  <strong class="govuk-tag govuk-tag--@projectRow.Item.Status.Colour" id="project-status-@projectRow.Item.Id">@projectRow.Item.Status.Value</strong>
+               </div>
+            </td>
+        </tr>
+
+        index++;
+    }
+}
+
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs
index 2a3d1ea71..1ebef1d50 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/ProjectListHelper.cs
@@ -25,7 +25,8 @@ public static ProjectListViewModel Build(AcademyConversionProject academyConvers
             Status = MapProjectStatus(academyConversionProject.ProjectStatus),
             AssignedUserFullName = academyConversionProject.AssignedUser?.FullName,
             CreatedOn = academyConversionProject.CreatedOn,
-            TypeAndRoute = academyConversionProject.AcademyTypeAndRoute
+            TypeAndRoute = academyConversionProject.AcademyTypeAndRoute,
+            Region = academyConversionProject.Region
          };
       }
 
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs
index c5db15240..6ef92156c 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/ViewModels/ProjectListViewModel.cs
@@ -17,6 +17,7 @@ public class ProjectListViewModel: ProjectTypeBase
    public string AssignedUserFullName { get; init; }
    public DateTime? CreatedOn { get; init; }
    public string TypeAndRoute { get; init; }
+   public string Region { get; set; }
 
    public bool ShowHtbDate => string.IsNullOrWhiteSpace(HeadTeacherBoardDate) is false;
    public bool ShowProposedOpeningDate => string.IsNullOrWhiteSpace(ProposedAcademyOpeningDate) is false;

From 6acbac0861e218011bf1559e4741e5494d7ac524 Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:21:16 +0000
Subject: [PATCH 2/6] re-add thead to remove code smell

---
 .../Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
index 3ee232b4c..612ab2186 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
@@ -50,7 +50,8 @@
 
          <table class="govuk-table">
             <caption class="govuk-table__caption govuk-table__caption--m govuk-visually-hidden">Projects (@Model.ProjectCount)</caption>
-
+                <thead class="govuk-table__head">
+                </thead>
             <tbody class="govuk-table__body">
             @{
                <partial name="Shared/_ProjectListRows" model="Model.Projects" />

From 369c9f57cbec15676215ca14d98c11c30f29722d Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:52:16 +0000
Subject: [PATCH 3/6] re-add table heading

---
 .../Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
index 612ab2186..8b3aee2d3 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
@@ -51,6 +51,9 @@
          <table class="govuk-table">
             <caption class="govuk-table__caption govuk-table__caption--m govuk-visually-hidden">Projects (@Model.ProjectCount)</caption>
                 <thead class="govuk-table__head">
+                   <th>
+
+                   </th>
                 </thead>
             <tbody class="govuk-table__body">
             @{

From 6916e7d80d3dd1fcaf2cc6af891f136313c5e315 Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Wed, 13 Dec 2023 15:05:52 +0000
Subject: [PATCH 4/6] remove boolean literal - code smell

---
 .../Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml   | 6 +++---
 .../Pages/Shared/_ProjectListRows.cshtml                    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
index 8b3aee2d3..d8e5a46dd 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml
@@ -51,9 +51,9 @@
          <table class="govuk-table">
             <caption class="govuk-table__caption govuk-table__caption--m govuk-visually-hidden">Projects (@Model.ProjectCount)</caption>
                 <thead class="govuk-table__head">
-                   <th>
-
-                   </th>
+                <tr class="govuk-table__row">
+                    <th class="govuk-table__header app-!-width-three-fifths">Application information</th>
+                </tr>
                 </thead>
             <tbody class="govuk-table__body">
             @{
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
index fe6cbc756..d81096cbf 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
@@ -23,7 +23,7 @@
                <div>
                   <span id="@("urn-" + projectRow.Index)"><strong>URN:</strong> @projectRow.Item.SchoolURN</span>
                </div>
-               @if (@projectRow.Item.LocalAuthority.IsEmpty() is false)
+               @if (!@projectRow.Item.LocalAuthority.IsEmpty())
                {
                   <div id="@("local-authority-" + projectRow.Index)">
                      <strong>Local authority:</strong> 

From 1769d5ba23ada87778ce012296f3ed6a1fed6660 Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Wed, 13 Dec 2023 16:50:10 +0000
Subject: [PATCH 5/6] Change incoming trust to title case. Change empty tag
 descriptions

---
 .../Pages/Shared/_ProjectListRows.cshtml                    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
index d81096cbf..04fe5c216 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
@@ -36,18 +36,18 @@
                </div>
                <div id="@("incoming-trust-" + projectRow.Index)">
                   <strong>Incoming trust:</strong>
-                  @projectRow.Item.NameOfTrust
+                    @projectRow.Item.NameOfTrust.ToTitleCase()
                </div>
                <div id="@("advisory-board-date-" + projectRow.Index)">
                   <strong>Advisory board date:</strong>
-                    <span if="projectRow.Item.HeadTeacherBoardDate.IsEmpty()" class="empty">Empty</span>
+                     <span if="projectRow.Item.HeadTeacherBoardDate.IsEmpty()" class="empty">Unconfirmed</span>
                     <span if="projectRow.Item.HeadTeacherBoardDate.IsPresent()">@projectRow.Item.HeadTeacherBoardDate</span>
                </div>
                @if (!isFormAMat)
                {
                   <div id="@("assigned-to-" + projectRow.Index)" class="do">
                      <strong>Assigned to:</strong>
-                     <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Empty</span>
+                     <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Unassigned</span>
                      <strong if="projectRow.Item.AssignedUserFullName.IsPresent()">@projectRow.Item.AssignedUserFullName</strong>
                   </div>
                }

From 6f7c6620dae002f6022741517c4a2c04fc66f17d Mon Sep 17 00:00:00 2001
From: Elijah Aremu <45821029+elielijah321@users.noreply.github.com>
Date: Thu, 14 Dec 2023 10:15:53 +0000
Subject: [PATCH 6/6] Add margin to rows

---
 .../Pages/Shared/_ProjectListRows.cshtml           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
index 04fe5c216..8dd06b907 100644
--- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
+++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/Shared/_ProjectListRows.cshtml
@@ -20,38 +20,38 @@
                      <a id="@("school-name-" + projectRow.Index)" class="govuk-link" asp-page="@link" asp-route-id="@projectRow.Item.Id">@projectRow.Item.SchoolName</a>
                   </strong>
                </div>
-               <div>
+                <div class="govuk-!-margin-top-1">
                   <span id="@("urn-" + projectRow.Index)"><strong>URN:</strong> @projectRow.Item.SchoolURN</span>
                </div>
                @if (!@projectRow.Item.LocalAuthority.IsEmpty())
                {
-                  <div id="@("local-authority-" + projectRow.Index)">
+                  <div id="@("local-authority-" + projectRow.Index)" class="govuk-!-margin-top-1">
                      <strong>Local authority:</strong> 
                      @projectRow.Item.LocalAuthority
                   </div>
                }
-               <div id="@("region-" + projectRow.Index)">
+               <div id="@("region-" + projectRow.Index)" class="govuk-!-margin-top-1">
                   <strong>Region:</strong> 
                   @projectRow.Item.Region
                </div>
-               <div id="@("incoming-trust-" + projectRow.Index)">
+               <div id="@("incoming-trust-" + projectRow.Index)" class="govuk-!-margin-top-1">
                   <strong>Incoming trust:</strong>
                     @projectRow.Item.NameOfTrust.ToTitleCase()
                </div>
-               <div id="@("advisory-board-date-" + projectRow.Index)">
+               <div id="@("advisory-board-date-" + projectRow.Index)" class="govuk-!-margin-top-1">
                   <strong>Advisory board date:</strong>
                      <span if="projectRow.Item.HeadTeacherBoardDate.IsEmpty()" class="empty">Unconfirmed</span>
                     <span if="projectRow.Item.HeadTeacherBoardDate.IsPresent()">@projectRow.Item.HeadTeacherBoardDate</span>
                </div>
                @if (!isFormAMat)
                {
-                  <div id="@("assigned-to-" + projectRow.Index)" class="do">
+                    <div id="@("assigned-to-" + projectRow.Index)" class="do govuk-!-margin-top-1">
                      <strong>Assigned to:</strong>
                      <span if="projectRow.Item.AssignedUserFullName.IsEmpty()" class="empty">Unassigned</span>
                      <strong if="projectRow.Item.AssignedUserFullName.IsPresent()">@projectRow.Item.AssignedUserFullName</strong>
                   </div>
                }
-               <div>
+                <div class="govuk-!-margin-top-2 govuk-!-margin-bottom-3">
                   <strong class="govuk-tag govuk-tag--@projectRow.Item.Status.Colour" id="project-status-@projectRow.Item.Id">@projectRow.Item.Status.Value</strong>
                </div>
             </td>