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..d8e5a46dd 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Pages/ProjectList/Index.cshtml @@ -50,25 +50,14 @@ - - - - - - - - + + + + + @{ - var index = 0; - foreach (ProjectListViewModel project in Model.Projects) - { - - - - - index++; - } + }
Projects (@Model.ProjectCount)
Application informationProject status and dates
Application information
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 - - - -

- - @Model.Item.SchoolName - - URN: @Model.Item.SchoolURN -

-

-

Route: @Model.Item.TypeAndRoute.RouteDescription()
-
Application to join a trust: @Model.Item.NameOfTrust
- @if (@Model.Item.LocalAuthority.IsEmpty() is false) - { -
Local authority: @Model.Item.LocalAuthority
- } -

- - -

- @Model.Item.Status.Value -

-

- - Project created date: @Model.Item.CreatedOn.ToDateString()
-
- - @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)
-
- - Opening date: - @Model.Item.ProposedAcademyOpeningDate - -

- - \ 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 - - - -

- - @Model.Item.SchoolName - - URN: @Model.Item.SchoolURN -

-

-

Route: @Model.Item.TypeAndRoute.RouteDescription()
-
Application to join a trust: @Model.Item.NameOfTrust
- - @if (@Model.Item.LocalAuthority.IsEmpty() is false) - { -
Local authority: @Model.Item.LocalAuthority
- } -
- Delivery officer: - Empty - @Model.Item.AssignedUserFullName -
-

- - -

- @Model.Item.Status.Value -

-

- - Project created date: @Model.Item.CreatedOn.ToDateString()
-
- - @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)
-
- - Opening date: - EMPTY - @Model.Item.ProposedAcademyOpeningDate - -

- - \ 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 - - - -

- - @Model.Item.SchoolName - - URN: @Model.Item.SchoolURN -

-

-

Route: @Model.Item.TypeAndRoute.RouteDescription()
-
Application to join a trust: @Model.Item.NameOfTrust
- @if (@Model.Item.LocalAuthority.IsEmpty() is false) - { -
Local authority: @Model.Item.LocalAuthority
- } -
- Delivery officer: - Empty - @Model.Item.AssignedUserFullName -
-

- - -

- @Model.Item.Status.Value -

-

- - Project created date: @Model.Item.CreatedOn.ToDateString()
-
- - @("Advisory board date: " + Model.Item.HeadTeacherBoardDate)
-
- - Opening date: - EMPTY - @Model.Item.ProposedAcademyOpeningDate - -

- - \ 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..8dd06b907 --- /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 + +@{ + 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; + + + +
+ + @projectRow.Item.SchoolName + +
+
+ URN: @projectRow.Item.SchoolURN +
+ @if (!@projectRow.Item.LocalAuthority.IsEmpty()) + { +
+ Local authority: + @projectRow.Item.LocalAuthority +
+ } +
+ Region: + @projectRow.Item.Region +
+
+ Incoming trust: + @projectRow.Item.NameOfTrust.ToTitleCase() +
+
+ Advisory board date: + Unconfirmed + @projectRow.Item.HeadTeacherBoardDate +
+ @if (!isFormAMat) + { +
+ Assigned to: + Unassigned + @projectRow.Item.AssignedUserFullName +
+ } +
+ @projectRow.Item.Status.Value +
+ + + + 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;