diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/AdvisoryBoardExtensions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/AdvisoryBoardExtensions.cs index c279d3a16..847851e81 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/AdvisoryBoardExtensions.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/AdvisoryBoardExtensions.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Linq; -namespace Dfe.PrepareConversions.Areas.Transfers.ExtensionMethods; +namespace Dfe.PrepareTransfers.ExtensionMethods; public static class AdvisoryBoardExtensions { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/ModelStateDictionaryExtensions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/ModelStateDictionaryExtensions.cs index 8c8960b99..20ce90037 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/ModelStateDictionaryExtensions.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/ExtensionMethods/ModelStateDictionaryExtensions.cs @@ -1,7 +1,7 @@ using System.Linq; using Microsoft.AspNetCore.Mvc.ModelBinding; -namespace Dfe.PrepareConversions.Areas.Transfers.ExtensionMethods; +namespace Dfe.PrepareTransfers.Web.ExtensionMethods; public static class ModelStateDictionaryExtensions { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/BackToPreviewPageTagHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/BackToPreviewPageTagHelper.cs index ca4fe2420..42f110877 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/BackToPreviewPageTagHelper.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/BackToPreviewPageTagHelper.cs @@ -1,12 +1,9 @@ -using System; using System.Text.Encodings.Web; using Dfe.PrepareTransfers.Web.Models; -using Microsoft.AspNetCore.Mvc.TagHelpers; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.AspNetCore.Routing; -using Dfe.PrepareConversions.Areas.Transfers.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Helpers.TagHelpers +namespace Dfe.PrepareTransfers.Web.Helpers.TagHelpers { [HtmlTargetElement("backtopreview")] public class BackToPreviewPageTagHelper : TagHelper diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/StringSummaryTagHelper.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/StringSummaryTagHelper.cs index f8a1605fa..36f624da5 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/StringSummaryTagHelper.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Helpers/TagHelpers/StringSummaryTagHelper.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Razor.TagHelpers; -namespace Dfe.PrepareConversions.Areas.Transfers.Helpers.TagHelpers +namespace Dfe.PrepareTransfers.Web.Helpers.TagHelpers { [HtmlTargetElement("stringsummary")] public class StringSummaryTagHelper : TagHelper diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Links.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Links.cs index 898ddc2d6..7c067d0b5 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Links.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Links.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using System.Collections.Concurrent; using System.Collections.Generic; -namespace Dfe.PrepareConversions.Areas.Transfers; +namespace Dfe.PrepareTransfers.Web.Transfers; public static class Links { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AcademyAndTrustInformation/RecommendationViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AcademyAndTrustInformation/RecommendationViewModel.cs index 4cb40c90b..5f019f69d 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AcademyAndTrustInformation/RecommendationViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AcademyAndTrustInformation/RecommendationViewModel.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Data.Models.Projects; using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.AcademyAndTrustInformation +namespace Dfe.PrepareTransfers.Web.Models.AcademyAndTrustInformation { public class RecommendationViewModel : CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AutoCompleteSearchModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AutoCompleteSearchModel.cs index b4b476753..b63ba27b2 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AutoCompleteSearchModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/AutoCompleteSearchModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models; +namespace Dfe.PrepareTransfers.Web.Models; public class AutoCompleteSearchModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/BenefitsSummaryViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/BenefitsSummaryViewModel.cs index 8f631e58c..57639aabe 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/BenefitsSummaryViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/BenefitsSummaryViewModel.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Linq; @@ -6,7 +6,7 @@ using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Helpers; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Benefits +namespace Dfe.PrepareTransfers.Web.Models.Benefits { public class BenefitsSummaryViewModel : CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/EqualitiesImpactAssessmentViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/EqualitiesImpactAssessmentViewModel.cs index 817e12128..2656be60c 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/EqualitiesImpactAssessmentViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/EqualitiesImpactAssessmentViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Benefits +namespace Dfe.PrepareTransfers.Web.Models.Benefits { public class EqualitiesImpactAssessmentViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/IntendedBenefitsViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/IntendedBenefitsViewModel.cs index 632eef48a..3f2e9e5b1 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/IntendedBenefitsViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/IntendedBenefitsViewModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Dfe.PrepareTransfers.Data.Models.Projects; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Benefits +namespace Dfe.PrepareTransfers.Web.Models.Benefits { public class IntendedBenefitsViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsItemViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsItemViewModel.cs index aa3b69956..f3f65ff85 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsItemViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsItemViewModel.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models.Projects; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Benefits +namespace Dfe.PrepareTransfers.Web.Models.Benefits { public class OtherFactorsItemViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsViewModel.cs index 83dce9baf..0296e2411 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/OtherFactorsViewModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Benefits +namespace Dfe.PrepareTransfers.Web.Models.Benefits { public class OtherFactorsViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/RisksViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/RisksViewModel.cs index c7d9ee706..21bb4a276 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/RisksViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Benefits/RisksViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Benefits +namespace Dfe.PrepareTransfers.Web.Models.Benefits { public class RisksViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/CommonPageModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/CommonPageModel.cs index 1c328eeb5..9cf549d1b 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/CommonPageModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/CommonPageModel.cs @@ -1,7 +1,7 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.RazorPages; -namespace Dfe.PrepareConversions.Areas.Transfers.Models +namespace Dfe.PrepareTransfers.Web.Models { public abstract class CommonPageModel : PageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/DateInputModelBinder.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/DateInputModelBinder.cs index 2f87a43fb..c4eef153e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/DateInputModelBinder.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/DateInputModelBinder.cs @@ -6,7 +6,7 @@ using System.Linq; using System.Threading.Tasks; -namespace Dfe.PrepareConversions.Areas.Transfers.Models; +namespace Dfe.PrepareTransfers.Web.Models; public class DateInputModelBinder : IModelBinder { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Error.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Error.cs index b2e6c0998..c981172ba 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Error.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Error.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Dfe.PrepareConversions.Areas.Transfers.Models; +namespace Dfe.PrepareTransfers.Web.Models; public class Error { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ErrorViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ErrorViewModel.cs index d24c45de7..982afc9e5 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ErrorViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ErrorViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models +namespace Dfe.PrepareTransfers.Web.Models { public class ErrorViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesInitiatedViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesInitiatedViewModel.cs index 8dcb329b3..de45b0cb7 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesInitiatedViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesInitiatedViewModel.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models.Projects; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Features +namespace Dfe.PrepareTransfers.Web.Models.Features { public class FeaturesInitiatedViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesReasonViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesReasonViewModel.cs index 4da86ec54..370c76882 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesReasonViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesReasonViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Features +namespace Dfe.PrepareTransfers.Web.Models.Features { public class FeaturesReasonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesTypeViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesTypeViewModel.cs index 344fbbe51..273feb326 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesTypeViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Features/FeaturesTypeViewModel.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models.Projects; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Features +namespace Dfe.PrepareTransfers.Web.Models.Features { public class FeaturesTypeViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/CommonViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/CommonViewModel.cs index a74e6dbed..3d72bf713 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/CommonViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/CommonViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Forms +namespace Dfe.PrepareTransfers.Web.Models.Forms { public abstract class CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/DateInputViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/DateInputViewModel.cs index 8a12eda0d..d145c9d56 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/DateInputViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/DateInputViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Forms +namespace Dfe.PrepareTransfers.Web.Models.Forms { public class DateInputViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/RadioButtonViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/RadioButtonViewModel.cs index 285996442..c06a638b5 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/RadioButtonViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Forms/RadioButtonViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Forms +namespace Dfe.PrepareTransfers.Web.Models.Forms { public class RadioButtonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/CommonLegalViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/CommonLegalViewModel.cs index ca63691bb..4fa996ef9 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/CommonLegalViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/CommonLegalViewModel.cs @@ -1,10 +1,10 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Web.Models.Forms; using System.Collections.Generic; using System.Linq; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Models.LegalRequirements { public abstract class CommonLegalViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/DiocesanConsentViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/DiocesanConsentViewModel.cs index 52bb4d18d..feb359ae7 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/DiocesanConsentViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/DiocesanConsentViewModel.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Models.LegalRequirements { public class DiocesanConsentViewModel : CommonLegalViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/IncomingTrustAgreementViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/IncomingTrustAgreementViewModel.cs index 23be68674..71a3f5341 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/IncomingTrustAgreementViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/IncomingTrustAgreementViewModel.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Models.LegalRequirements { public class IncomingTrustAgreementViewModel : CommonLegalViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/LegalRequirementsViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/LegalRequirementsViewModel.cs index 95466b485..e6ef6efe9 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/LegalRequirementsViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/LegalRequirementsViewModel.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Models.LegalRequirements { public class LegalRequirementsViewModel : CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/OutgoingTrustConsentViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/OutgoingTrustConsentViewModel.cs index fa8eb76cc..25a881099 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/OutgoingTrustConsentViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LegalRequirements/OutgoingTrustConsentViewModel.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Models.LegalRequirements { public class OutgoingTrustConsentViewModel : CommonLegalViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LinkItem.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LinkItem.cs index 4a129581e..09a77866a 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LinkItem.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/LinkItem.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Http; -namespace Dfe.PrepareConversions.Areas.Transfers.Models; +namespace Dfe.PrepareTransfers.Web.Models; public class LinkItem { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Links.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Links.cs index 8819a0839..8a20ed0dc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Links.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Links.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; -namespace Dfe.PrepareConversions.Areas.Transfers.Models; +namespace Dfe.PrepareTransfers.Web.Models; public static class Links { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/MarkSectionCompletedViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/MarkSectionCompletedViewModel.cs index 33f7a4dce..8b044dbf2 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/MarkSectionCompletedViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/MarkSectionCompletedViewModel.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Models +namespace Dfe.PrepareTransfers.Web.Models { public class MarkSectionCompletedViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectList/ProjectListFilters.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectList/ProjectListFilters.cs index 54602101c..0aacab0db 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectList/ProjectListFilters.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectList/ProjectListFilters.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.ProjectList; +namespace Dfe.PrepareTransfers.Web.Models.ProjectList; public class ProjectListFilters { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectListFilters.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectListFilters.cs deleted file mode 100644 index 0aacab0db..000000000 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectListFilters.cs +++ /dev/null @@ -1,146 +0,0 @@ -#nullable enable - -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Primitives; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace Dfe.PrepareTransfers.Web.Models.ProjectList; - -public class ProjectListFilters -{ - public const string TransfersFilterTitle = nameof(TransfersFilterTitle); - public const string TransfersFilterStatuses = nameof(TransfersFilterStatuses); - public const string TransfersFilterOfficers = nameof(TransfersFilterOfficers); - - private IDictionary _store = null!; - - public List AvailableStatuses { get; set; } = new(); - public List AvailableDeliveryOfficers { get; set; } = new(); - - [BindProperty] - public string? Title { get; set; } - - [BindProperty] - public string[] SelectedStatuses { get; set; } = Array.Empty(); - - [BindProperty] - public string[] SelectedOfficers { get; set; } = Array.Empty(); - - public bool IsVisible => string.IsNullOrWhiteSpace(Title) is false || - SelectedStatuses.Length > 0 || - SelectedOfficers.Length > 0; - - public ProjectListFilters PersistUsing(IDictionary store) - { - _store = store; - - Title = Get(TransfersFilterTitle).FirstOrDefault()?.Trim(); - SelectedStatuses = Get(TransfersFilterStatuses); - SelectedOfficers = Get(TransfersFilterOfficers); - - return this; - } - - public void PopulateFrom(IEnumerable> requestQuery) - { - Dictionary? query = new(requestQuery, StringComparer.OrdinalIgnoreCase); - - if (query.ContainsKey("clear")) - { - ClearFilters(); - - Title = default; - SelectedStatuses = Array.Empty(); - SelectedOfficers = Array.Empty(); - - return; - } - - if (query.ContainsKey("remove")) - { - SelectedStatuses = GetAndRemove(TransfersFilterStatuses, GetFromQuery(nameof(SelectedStatuses)), true); - SelectedOfficers = GetAndRemove(TransfersFilterOfficers, GetFromQuery(nameof(SelectedOfficers)), true); - - return; - } - - bool activeFilterChanges = query.ContainsKey(nameof(Title)) || - query.ContainsKey(nameof(SelectedStatuses)) || - query.ContainsKey(nameof(SelectedOfficers)); ; - - if (activeFilterChanges) - { - Title = Cache(TransfersFilterTitle, GetFromQuery(nameof(Title))).FirstOrDefault()?.Trim(); - SelectedStatuses = Cache(TransfersFilterStatuses, GetFromQuery(nameof(SelectedStatuses))); - SelectedOfficers = Cache(TransfersFilterOfficers, GetFromQuery(nameof(SelectedOfficers))); - } - else - { - Title = Get(TransfersFilterTitle, true).FirstOrDefault()?.Trim(); - SelectedStatuses = Get(TransfersFilterStatuses, true); - SelectedOfficers = Get(TransfersFilterOfficers, true); - } - - string[] GetFromQuery(string key) - { - return query.ContainsKey(key) ? query[key]! : Array.Empty(); - } - } - - private string[] Get(string key, bool persist = false) - { - if (_store.ContainsKey(key) is false) return Array.Empty(); - - string[]? value = (string[]?)_store[key]; - if (persist) Cache(key, value); - - return value ?? Array.Empty(); - } - - private string[] GetAndRemove(string key, string[]? value, bool persist = false) - { - if (_store.ContainsKey(key) is false) return Array.Empty(); - - string[]? currentValues = (string[]?)_store[key]; - - if (value is not null && value.Length > 0 && currentValues is not null) - { - currentValues = currentValues.Where(x => !value.Contains(x)).ToArray(); - } - - if (persist) Cache(key, currentValues); - - return currentValues ?? Array.Empty(); - } - - private string[] Cache(string key, string[]? value) - { - if (value is null || value.Length == 0) - _store.Remove(key); - else - _store[key] = value; - - return value ?? Array.Empty(); - } - - private void ClearFilters() - { - Cache(TransfersFilterTitle, default); - Cache(TransfersFilterStatuses, default); - Cache(TransfersFilterOfficers, default); - } - - /// - /// Removes all project list filters from the store - /// - /// the store used to cache filters between pages - /// - /// Note that, when using TempData, this won't take effect until after the next request context that returns a 2xx response! - /// - public static void ClearFiltersFrom(IDictionary store) - { - new ProjectListFilters().PersistUsing(store).ClearFilters(); - } -} diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTemplate/ProjectTemplateAcademyModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTemplate/ProjectTemplateAcademyModel.cs index c84966601..6514c2137 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTemplate/ProjectTemplateAcademyModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTemplate/ProjectTemplateAcademyModel.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Dfe.PrepareTransfers.Data.Models.KeyStagePerformance; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.ProjectTemplate +namespace Dfe.PrepareTransfers.Web.Models.ProjectTemplate { public class ProjectTemplateAcademyModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypeViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypeViewModel.cs index 7d5d129b5..776d28705 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypeViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypeViewModel.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models +namespace Dfe.PrepareTransfers.Web.Models { public class ProjectTypeViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypes.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypes.cs index 139fe8f45..d706653c4 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypes.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/ProjectTypes.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Models +namespace Dfe.PrepareTransfers.Web.Models { public enum ProjectTypes { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Rationale/RationaleTrustOrSponsorViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Rationale/RationaleTrustOrSponsorViewModel.cs index 1e5ce1e62..53b71c02f 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Rationale/RationaleTrustOrSponsorViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/Rationale/RationaleTrustOrSponsorViewModel.cs @@ -1,7 +1,7 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.Rationale +namespace Dfe.PrepareTransfers.Web.Models.Rationale { public class RationaleTrustOrSponsorViewModel : CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/AdvisoryBoardViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/AdvisoryBoardViewModel.cs index 5ad0ea19a..465ffd07f 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/AdvisoryBoardViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/AdvisoryBoardViewModel.cs @@ -1,6 +1,6 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates +namespace Dfe.PrepareTransfers.Web.Models.TransferDates { public class AdvisoryBoardViewModel : CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/DateViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/DateViewModel.cs index 62fc759ab..0c3321a22 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/DateViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/DateViewModel.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using Dfe.PrepareTransfers.Helpers; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; +namespace Dfe.PrepareTransfers.Web.Models.TransferDates; public class DateViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/TargetDateViewModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/TargetDateViewModel.cs index 26ecdfcd4..8c5d946e7 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/TargetDateViewModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransferDates/TargetDateViewModel.cs @@ -1,6 +1,6 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates +namespace Dfe.PrepareTransfers.Web.Models.TransferDates { public class TargetDateViewModel : CommonViewModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransfersPageModel.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransfersPageModel.cs index 252ed96b1..b5ca88fa2 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransfersPageModel.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Models/TransfersPageModel.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Web.Models; namespace Dfe.PrepareTransfers.Web.Pages.Transfers diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml index d758fce5d..b82156553 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml @@ -3,7 +3,7 @@ @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.Academisation.ExtensionMethods -@model Dfe.PrepareConversions.Areas.Transfers.Pages.NewTransfer.CheckYourAnswersModel +@model Dfe.PrepareTransfers.Web.Transfers.Pages.NewTransfer.CheckYourAnswersModel @{ ViewBag.Title = "Check trust and academy details"; Layout = "_Layout"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml.cs index cc3d33010..e40f52fbc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/CheckYourAnswers.cshtml.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Data.Models.Projects; @@ -11,7 +11,7 @@ using System.Linq; using System.Threading.Tasks; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.NewTransfer +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.NewTransfer { public class CheckYourAnswersModel : TransfersPageModel { @@ -113,7 +113,7 @@ public async Task OnPostAsync() HttpContext.Session.Remove(ProposedTrustNameSessionKey); HttpContext.Session.Remove(IsFormAMatSessionKey); - return RedirectToPage($"/Projects/{nameof(Projects.Index)}", new + return RedirectToPage($"/transfers/Projects/{nameof(Projects.Index)}", new { urn = createResponse.Result.Urn }); diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml index 3d2c3d132..a07956120 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml @@ -1,7 +1,7 @@ @page @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.NewTransfer.IsFormAMatModel +@model Dfe.PrepareTransfers.Web.Transfers.Pages.NewTransfer.IsFormAMatModel @{ Layout = "_Layout"; ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Does this transfer result in the forming of a new multi academy trust?"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml.cs index 09bcbc431..b3d7565bb 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/IsFormAMat.cshtml.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Web.Models.Forms; using Microsoft.AspNetCore.Mvc; @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.NewTransfer +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.NewTransfer { public class IsFormAMatModel : PageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/PreferredTrust.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/PreferredTrust.cshtml.cs index f0579512c..d6caf7f3d 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/PreferredTrust.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/PreferredTrust.cshtml.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Web.Models.Forms; using Microsoft.AspNetCore.Mvc; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml index 3eed2ca39..f109fe081 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml @@ -1,7 +1,7 @@ @page @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareConversions.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.NewTransfer.TrustNameModel +@model Dfe.PrepareTransfers.Web.Transfers.Pages.NewTransfer.TrustNameModel @{ Layout = "_Layout"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml.cs index df488c13b..3a69c75d8 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/NewTransfer/TrustName.cshtml.cs @@ -1,7 +1,7 @@ using Dfe.PrepareTransfers.Web.Pages.Transfers; using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.NewTransfer +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.NewTransfer { public class TrustNameModel : TransfersPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/IncomingTrustName.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/IncomingTrustName.cshtml new file mode 100644 index 000000000..7396e59a1 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/IncomingTrustName.cshtml @@ -0,0 +1,40 @@ +@page "/transfers/project/{urn}/academy-and-trust-information/incoming-trust-name" +@using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers +@using Microsoft.AspNetCore.Mvc.TagHelpers +@using Dfe.Academisation.ExtensionMethods +@model Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation.IncomingTrustNameModel +@{ + Layout = "_Layout"; + ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Enter the project name"; + var formClasses = ViewData.ModelState.IsValid ? "" : "govuk-form-group--error"; +} + +@section BeforeMain +{ + Back +} + +
+ +
+
+
+ + +
+
+ +

+ Enter the incoming trust's name +

+
+

+ +
+
+ +
+
+
\ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/IncomingTrustName.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/IncomingTrustName.cshtml.cs new file mode 100644 index 000000000..fb6e04d0a --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/IncomingTrustName.cshtml.cs @@ -0,0 +1,54 @@ +using Dfe.PrepareTransfers.Data; +using FluentValidation.AspNetCore; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Validators.Transfers; + +namespace Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation +{ + public class IncomingTrustNameModel : CommonPageModel + { + private readonly IProjects _projectRepository; + + public IncomingTrustNameModel(IProjects projectRepository) + { + _projectRepository = projectRepository; + } + + public async Task OnGetAsync(string urn, bool returnToPreview = false) + { + var project = await _projectRepository.GetByUrn(urn); + + var projectResult = project.Result; + + Urn = projectResult.Urn; + ReturnToPreview = returnToPreview; + IncomingTrustName = projectResult.IncomingTrustName; + OutgoingAcademyUrn = projectResult.OutgoingAcademyUrn; + + return Page(); + } + + public async Task OnPostAsync() + { + var validator = new EditIncomingTrustNameValidator(); + var validationResults = await validator.ValidateAsync(this); + validationResults.AddToModelState(ModelState, null); + + if (!ModelState.IsValid) + { + return await OnGetAsync(Urn); + } + + await _projectRepository.UpdateIncomingTrust(Urn, IncomingTrustName); + + if (ReturnToPreview) + { + return RedirectToPage(Links.HeadteacherBoard.Preview.PageName, new { Urn }); + } + + return RedirectToPage("/Projects/AcademyAndTrustInformation/Index", new { Urn }); + } + } +} diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Index.cshtml new file mode 100644 index 000000000..b550db211 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Index.cshtml @@ -0,0 +1,36 @@ +@page "/transfers/project/{urn}/academy-and-trust-information" +@using Microsoft.AspNetCore.Mvc.TagHelpers +@model Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation.Index + +@{ + ViewBag.Title = "Trust information"; + Layout = "_Layout"; +} + +@section BeforeMain +{ + Back +} + +
+
+ + Project reference: @Model.ProjectReference + +

+ Trust information +

+
+
+
+ +
+
+ +
+ +
+
+
\ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Index.cshtml.cs new file mode 100644 index 000000000..1f9b170fe --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Index.cshtml.cs @@ -0,0 +1,40 @@ +using System.Threading.Tasks; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Data.Models.Projects; +using Microsoft.AspNetCore.Mvc; + +namespace Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation +{ + public class Index : CommonPageModel + { + public TransferAcademyAndTrustInformation.RecommendationResult Recommendation { get; set; } + public string Author { get; set; } + public string AdvisoryBoardDate { get; set; } + public string TargetDate { get; set; } + + private readonly IGetInformationForProject _getInformationForProject; + + public Index(IGetInformationForProject getInformationForProject) + { + _getInformationForProject = getInformationForProject; + } + + public async Task OnGetAsync(string urn) + { + var projectInformation = await _getInformationForProject.Execute(urn); + + ProjectReference = projectInformation.Project.Reference; + Recommendation = projectInformation.Project.AcademyAndTrustInformation.Recommendation; + Author = projectInformation.Project.AcademyAndTrustInformation.Author; + AdvisoryBoardDate = projectInformation.Project.Dates?.Htb; + IncomingTrustName = projectInformation.Project.IncomingTrustName; + TargetDate = projectInformation.Project.Dates?.Target; + OutgoingAcademyUrn = projectInformation.Project.OutgoingAcademyUrn; + Urn = projectInformation.Project.Urn; + IsFormAMAT = projectInformation.Project.IsFormAMat.HasValue && projectInformation.Project.IsFormAMat.Value == true; + + return Page(); + } + } +} \ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Recommendation.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Recommendation.cshtml new file mode 100644 index 000000000..43efab52f --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Recommendation.cshtml @@ -0,0 +1,50 @@ +@page "/transfers/project/{urn}/academy-and-trust-information/recommendation" +@using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers +@using Microsoft.AspNetCore.Mvc.TagHelpers +@model Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation.Recommendation + +@{ + ViewBag.Title = "Recommendation"; + Layout = "_Layout"; + var radioButtons = Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation.Recommendation.RecommendedRadioButtons(Model.RecommendationResult); +} + +@section BeforeMain +{ + + Back + +} + +
+
+ + @Model.IncomingTrustName + +

+ Recommendation +

+
+ + + +
+
+ + What is the recommendation for this project? + + @await Html.PartialAsync("_RadioButtons", radioButtons) +
+
+
+ + +
+ +
+
+
\ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Recommendation.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Recommendation.cshtml.cs new file mode 100644 index 000000000..4fefefc26 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/Recommendation.cshtml.cs @@ -0,0 +1,78 @@ +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Dfe.PrepareTransfers.Data; +using Dfe.PrepareTransfers.Data.Models.Projects; +using Dfe.PrepareTransfers.Helpers; +using Microsoft.AspNetCore.Mvc; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.AcademyAndTrustInformation; + +namespace Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation +{ + public class Recommendation : CommonPageModel + { + private readonly IProjects _projectRepository; + public TransferAcademyAndTrustInformation.RecommendationResult RecommendationResult { get; set; } + public string Author { get; set; } + + public static List RecommendedRadioButtons( + TransferAcademyAndTrustInformation.RecommendationResult selected) + { + var values = + EnumHelpers.GetDisplayableValues( + TransferAcademyAndTrustInformation.RecommendationResult + .Empty); + + var result = values.Select(value => new RadioButtonViewModel + { + Value = value.ToString(), + Name = "recommendation", + DisplayName = value.ToString(), + Checked = selected == value + }).ToList(); + + return result; + } + + public Recommendation(IProjects projectRepository) + { + _projectRepository = projectRepository; + } + + public async Task OnGetAsync(string urn, bool returnToPreview = false) + { + var project = await _projectRepository.GetByUrn(urn); + + var projectResult = project.Result; + + Urn = projectResult.Urn; + IncomingTrustName = projectResult.IncomingTrustName; + ReturnToPreview = returnToPreview; + Author = projectResult.AcademyAndTrustInformation.Author; + RecommendationResult = projectResult.AcademyAndTrustInformation.Recommendation; + OutgoingAcademyUrn = projectResult.OutgoingAcademyUrn; + + return Page(); + } + + public async Task OnPostAsync(RecommendationViewModel vm) + { + var project = await _projectRepository.GetByUrn(vm.Urn); + + var projectResult = project.Result; + projectResult.AcademyAndTrustInformation.Recommendation = vm.Recommendation; + projectResult.AcademyAndTrustInformation.Author = vm.Author; + + await _projectRepository.UpdateGeneralInfomation(projectResult); + + if (vm.ReturnToPreview) + { + return RedirectToPage(Links.HeadteacherBoard.Preview.PageName, new {vm.Urn}); + } + + return RedirectToPage("/Projects/AcademyAndTrustInformation/Index", new {vm.Urn}); + } + } +} \ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/UpdateIncomingTrust.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/UpdateIncomingTrust.cshtml new file mode 100644 index 000000000..c8ef29ef9 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/UpdateIncomingTrust.cshtml @@ -0,0 +1,36 @@ +@page "/transfers/project/{urn}/academy-and-trust-information/update-incoming-trust" +@using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers +@using Microsoft.AspNetCore.Mvc.TagHelpers +@using Dfe.Academisation.ExtensionMethods +@model Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation.UpdateIncomingTrustModel +@{ + Layout = "_Layout"; + ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "What is the incoming trust name?"; + var formClasses = ViewData.ModelState.IsValid ? "" : "govuk-form-group--error"; +} + + +@section BeforeMain +{ + Back +} + + +
+
+
+
+ @* *@ +

+ +

+ + + +
+ +
+
+
\ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/UpdateIncomingTrust.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/UpdateIncomingTrust.cshtml.cs new file mode 100644 index 000000000..85ab02d5c --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/AcademyAndTrustInformation/UpdateIncomingTrust.cshtml.cs @@ -0,0 +1,132 @@ +using Dfe.PrepareTransfers.Data; +using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; +using System; +using Dfe.PrepareTransfers.Data.Models; +using System.Collections.Generic; +using System.Linq; +using Dfe.Academisation.ExtensionMethods; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareConversions.Services; + +namespace Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation +{ + public class UpdateIncomingTrustModel : CommonPageModel + { + private const string SEARCH_LABEL = + "Enter the name, UKPRN (UK Provider Reference Number) or Companies House number."; + + private const string SEARCH_ENDPOINT = "/transfers/project/0/academy-and-trust-information/update-incoming-trust?handler=Search&searchQuery="; + private readonly ErrorService _errorService; + private readonly ITrusts _trustsRepository; + private readonly IProjects _repository; + + public UpdateIncomingTrustModel(ITrusts trustsRepository, IProjects projectRepository, ErrorService errorService) + { + _trustsRepository = trustsRepository; + _repository = projectRepository; + _errorService = errorService; + AutoCompleteSearchModel = new AutoCompleteSearchModel(SEARCH_LABEL, string.Empty, SEARCH_ENDPOINT); + } + + [BindProperty] + public string SearchQuery { get; set; } = ""; + public AutoCompleteSearchModel AutoCompleteSearchModel { get; set; } + + public async Task OnGetAsync(int urn) + { + AutoCompleteSearchModel = new AutoCompleteSearchModel(SEARCH_LABEL, SearchQuery, SEARCH_ENDPOINT); + + return Page(); + } + + public async Task OnGetSearch(string searchQuery) + { + string[] searchSplit = SplitOnBrackets(searchQuery); + + List trusts = await _trustsRepository.SearchTrusts(searchSplit[0].Trim()); + + return new JsonResult(trusts.Select(t => + { + string displayUkprn = string.IsNullOrWhiteSpace(t.Ukprn) ? string.Empty : $"({t.Ukprn})"; + string suggestion = $@"{t.Name?.ToTitleCase() ?? ""} {displayUkprn} +
+ Companies House number: {t.CompaniesHouseNumber ?? ""}"; + return new { suggestion = HighlightSearchMatch(suggestion, searchSplit[0].Trim(), t), value = $"{t.Name?.ToTitleCase() ?? ""} ({t.Ukprn})" }; + })); + } + + public async Task OnPostAsync(int urn) + { + AutoCompleteSearchModel = new AutoCompleteSearchModel(SEARCH_LABEL, SearchQuery, SEARCH_ENDPOINT); + if (string.IsNullOrWhiteSpace(SearchQuery)) + { + ModelState.AddModelError(nameof(SearchQuery), "Enter the Trust name, UKPRN or Companies House number"); + _errorService.AddErrors(ModelState.Keys, ModelState); + return Page(); + } + + string[] searchSplit = SplitOnBrackets(SearchQuery); + if (searchSplit.Length < 2) + { + ModelState.AddModelError(nameof(SearchQuery), "We could not find any trusts matching your search criteria"); + _errorService.AddErrors(ModelState.Keys, ModelState); + return Page(); + } + + string ukprn = searchSplit[searchSplit.Length - 1]; + string trustName = searchSplit[0]; + + List trusts = await _trustsRepository.SearchTrusts(ukprn); + + if (trusts.Count != 1) + { + ModelState.AddModelError(nameof(SearchQuery), "We could not find a trust matching your search criteria"); + _errorService.AddErrors(ModelState.Keys, ModelState); + return Page(); + } + + if (ModelState.IsValid) + { + try + { + var trust = trusts.First(); + + await _repository.UpdateIncomingTrust(urn.ToString(), trustName, ukprn); + + + return RedirectToPage("/Projects/AcademyAndTrustInformation/Index", new { urn }); + + } + catch (Exception ex) + { + + _errorService.AddApiError(); + return Page(); + } + + } + return Page(); + } + + private static string HighlightSearchMatch(string input, string toReplace, Trust trust) + { + if (trust == null || + string.IsNullOrWhiteSpace(trust.Name)) + return string.Empty; + + int index = input.IndexOf(toReplace, StringComparison.InvariantCultureIgnoreCase); + string correctCaseSearchString = input.Substring(index, toReplace.Length); + + return input.Replace(toReplace, $"{correctCaseSearchString}", StringComparison.InvariantCultureIgnoreCase); + } + + private static string[] SplitOnBrackets(string input) + { + // return array containing one empty string if input string is null or empty + if (string.IsNullOrWhiteSpace(input)) return new string[1] { string.Empty }; + + return input.Split(new[] { '(', ')' }, StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries); + } + } +} diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml index e84f6bcfc..9c736f8dc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml @@ -1,6 +1,6 @@ @page "/project/{urn}/features" @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features.Index +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features.Index @{ ViewBag.Title = "Features of the transfer"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml.cs index 9696057bd..1e5946478 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Index.cshtml.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using System.Collections.Generic; using System.Threading.Tasks; using Dfe.PrepareTransfers.Data; @@ -7,7 +7,7 @@ using Dfe.PrepareTransfers.Web.Models; using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features { public class Index : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml index dca7899b4..e84a549fa 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml @@ -1,8 +1,8 @@ @page "/project/{urn}/features/reason" @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers -@using Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features.Reason +@using Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features.Reason @{ ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Reason for the transfer"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml.cs index 92ddd661a..4bb02d73e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Reason.cshtml.cs @@ -1,6 +1,6 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; -using Dfe.PrepareConversions.Areas.Transfers.Validators.Features; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.Forms; +using Dfe.PrepareTransfers.Web.Transfers.Validators.Features; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -13,7 +13,7 @@ using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features { public class Reason : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml index 8af2956e1..1c5eef52d 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml @@ -1,9 +1,9 @@ @page "/project/{urn}/features/specificreason" -@using Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features +@using Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features @using Microsoft.AspNetCore.Html @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features.SpecificReason +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features.SpecificReason @{ ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Specific reason for the transfer"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml.cs index 9e4d23019..de5018509 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/SpecificReason.cshtml.cs @@ -1,5 +1,5 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.Forms; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -8,12 +8,12 @@ using FluentValidation.AspNetCore; using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Web.Models.Forms; -using Dfe.PrepareConversions.Areas.Transfers.Validators.Features; +using Dfe.PrepareTransfers.Web.Transfers.Validators.Features; using Dfe.PrepareTransfers.Helpers; using Microsoft.AspNetCore.Mvc; -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features { public class SpecificReason : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml index f5404c161..865064f11 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml @@ -1,5 +1,5 @@ @page "/project/{urn}/features/type" -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features.Type +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features.Type @using Dfe.PrepareTransfers.Data.Models.Projects @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml.cs index bfbf0fba6..5f3499b5a 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Features/Type.cshtml.cs @@ -1,6 +1,6 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.Features; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.Features; +using Dfe.PrepareTransfers.Web.Models.Forms; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -11,7 +11,7 @@ using Dfe.PrepareTransfers.Helpers; using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features { public class Type : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml index ae0b9dbd9..be299a0ca 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml @@ -2,7 +2,7 @@ @using Microsoft.AspNetCore.Mvc.TagHelpers @using NetEscapades.AspNetCore.SecurityHeaders.TagHelpers @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Index +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Index @{ Layout = "_Layout"; ViewBag.Title = Model.IncomingTrustName; @@ -39,7 +39,7 @@ @Model.AssignedUser.FullName } - Change + Change

@{ @@ -180,7 +180,7 @@ Project documents are in Microsoft Word format. You can preview them first and make changes to them afterwards.

-
+
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml.cs index 69a532e6a..cb9acb725 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/Index.cshtml.cs @@ -1,5 +1,5 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using System; using System.Collections.Generic; using System.Threading; @@ -7,10 +7,10 @@ using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Web.BackgroundServices; using Dfe.PrepareTransfers.Web.Models; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects { public class Index : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml index 8819edd6a..aa9fac1ca 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml @@ -2,7 +2,7 @@ @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements.DiocesanConsentModel +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements.DiocesanConsentModel @{ ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Diocesan consent"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml.cs index a42974b73..55e419a87 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/DiocesanConsent.cshtml.cs @@ -1,6 +1,6 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; -using Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.LegalRequirements; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Web.Models; @@ -10,7 +10,7 @@ using Dfe.PrepareTransfers.Data.TRAMS.ExtensionMethods; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements { public class DiocesanConsentModel : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml index f3ed2a2c0..d7becd9eb 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml @@ -1,7 +1,7 @@ @page "/project/{urn}/legalrequirements/incoming-trust-agreement" -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements.IncomingTrustAgreementModel; +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements.IncomingTrustAgreementModel; @using Microsoft.AspNetCore.Mvc.TagHelpers -@using Dfe.PrepareConversions.Areas.Transfers.Helpers.TagHelpers +@using Dfe.PrepareTransfers.Web.Helpers.TagHelpers @{ ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Incoming trust agreement"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml.cs index 32cfbd1e9..e6b593dfc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/IncomingTrustAgreement.cshtml.cs @@ -1,13 +1,13 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; -using Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.LegalRequirements; using Dfe.PrepareTransfers.Data; using Microsoft.AspNetCore.Mvc; using System.Collections.Generic; using System.Threading.Tasks; using Dfe.PrepareTransfers.Data.TRAMS.ExtensionMethods; +using Dfe.PrepareTransfers.Web.Models.Forms; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements { public class IncomingTrustAgreementModel : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml index d66578655..f857361e0 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml @@ -2,7 +2,7 @@ @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.Academisation.ExtensionMethods -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements.Index +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements.Index @{ ViewBag.Title = "Legal Requirements"; Layout = "_Layout"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml.cs index 69f5bfafa..2b5d3bcdb 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/Index.cshtml.cs @@ -1,12 +1,12 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.LegalRequirements; using System.Threading.Tasks; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Web.Models; using Microsoft.AspNetCore.Mvc; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements { public class Index : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml index 7028b31e9..cb5b2992e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml @@ -2,7 +2,7 @@ @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements.OutgoingTrustConsentModel +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements.OutgoingTrustConsentModel @{ ViewBag.Title = (!ViewData.ModelState.IsValid ? "Error: " : "") + "Outgoing trust resolution"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml.cs index 560250ccd..c3ef3eec5 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/LegalRequirements/OutgoingTrustConsent.cshtml.cs @@ -1,6 +1,6 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; -using Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.LegalRequirements; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Web.Models.Forms; using Dfe.PrepareTransfers.Web.Models; @@ -10,7 +10,7 @@ using Dfe.PrepareTransfers.Data.TRAMS.ExtensionMethods; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.LegalRequirements +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.LegalRequirements { public class OutgoingTrustConsentModel : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml index 667fbb643..52643097f 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml @@ -1,10 +1,10 @@ @page "/project/{urn}/transfer-dates/advisory-board-date" -@using Dfe.PrepareConversions.Areas.Transfers.ExtensionMethods; +@using Dfe.PrepareTransfers.Web.ExtensionMethods; @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Microsoft.Extensions.Configuration @using Dfe.Academisation.ExtensionMethods -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.TransferDates.AdvisoryBoard +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.TransferDates.AdvisoryBoard @inject IConfiguration Configuration diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml.cs index 2dc03df5f..88db207ed 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/AdvisoryBoard.cshtml.cs @@ -1,14 +1,14 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Web.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; -using Dfe.PrepareConversions.Areas.Transfers.Validators.TransferDates; +using Dfe.PrepareTransfers.Web.Models.TransferDates; +using Dfe.PrepareTransfers.Web.Transfers.Validators.TransferDates; using FluentValidation; using FluentValidation.AspNetCore; using Microsoft.AspNetCore.Mvc; using System.Threading.Tasks; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.TransferDates +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.TransferDates { public class AdvisoryBoard : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml index 5c7869801..c3ec7eade 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml @@ -1,7 +1,7 @@ @page "/project/{urn}/transfer-dates" @using Dfe.Academisation.ExtensionMethods @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.TransferDates.Index +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.TransferDates.Index @{ ViewBag.Title = "Expected transfer dates"; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml.cs index 05a619952..b5fbcd461 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Index.cshtml.cs @@ -1,4 +1,4 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Web.Models; using Microsoft.AspNetCore.Mvc; @@ -6,7 +6,7 @@ using dataModels = Dfe.PrepareTransfers.Data.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.TransferDates +namespace Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.TransferDates { public class Index : CommonPageModel { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml index db88b02c1..8d9f906fb 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml @@ -1,5 +1,5 @@ @page "/project/{urn}/transfer-dates/previous-advisory-board-date" -@using Dfe.PrepareConversions.Areas.Transfers.ExtensionMethods; +@using Dfe.PrepareTransfers.Web.ExtensionMethods; @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Dfe.Academisation.ExtensionMethods diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml.cs index 01839d7f5..ca77725cd 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/PreviousAdvisoryBoard.cshtml.cs @@ -1,8 +1,8 @@ using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Web.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; -using Dfe.PrepareConversions.Areas.Transfers.Validators.TransferDates; +using Dfe.PrepareTransfers.Web.Models; +using Dfe.PrepareTransfers.Web.Models.TransferDates; +using Dfe.PrepareTransfers.Web.Transfers.Validators.TransferDates; using FluentValidation; using FluentValidation.AspNetCore; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml index 0c87372d7..2f63956fa 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml @@ -1,6 +1,6 @@ @page "{urn}/transfer-dates/reason" @using Dfe.PrepareTransfers.Helpers -@using Dfe.PrepareConversions.Areas.Transfers.ExtensionMethods; +@using Dfe.PrepareTransfers.Web.ExtensionMethods; @using Dfe.Academisation.ExtensionMethods @model Dfe.PrepareTransfers.Web.Pages.Projects.TransferDates.Reason @{ diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml.cs index 54c5bd9ca..8ee608cdc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Reason.cshtml.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Data.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using Microsoft.AspNetCore.Mvc; using System; using System.Collections.Generic; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml index a4d6cd800..fb393f870 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml @@ -1,7 +1,7 @@ @page "/project/{urn}/transfer-dates/target-date" @using Dfe.PrepareTransfers.Helpers @using Microsoft.AspNetCore.Mvc.TagHelpers -@using Dfe.PrepareConversions.Areas.Transfers.ExtensionMethods; +@using Dfe.PrepareTransfers.Web.ExtensionMethods; @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Dfe.Academisation.ExtensionMethods @model Dfe.PrepareTransfers.Web.Pages.Projects.TransferDates.Target diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml.cs index 0f9b332c8..c2518d3d2 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Projects/TransferDates/Target.cshtml.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Web.Models; -using Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; -using Dfe.PrepareConversions.Areas.Transfers.Validators.TransferDates; +using Dfe.PrepareTransfers.Web.Models.TransferDates; +using Dfe.PrepareTransfers.Web.Transfers.Validators.TransferDates; using FluentValidation; using FluentValidation.AspNetCore; using Microsoft.AspNetCore.Mvc; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_AcademyAndTrustSummary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_AcademyAndTrustSummary.cshtml new file mode 100644 index 000000000..efc34ab73 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_AcademyAndTrustSummary.cshtml @@ -0,0 +1,72 @@ +@using Dfe.PrepareTransfers.Data.Models.Projects +@using Dfe.PrepareTransfers.Helpers +@using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers +@using Microsoft.AspNetCore.Mvc.TagHelpers +@model Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation.Index +
+
+
+ Recommendation +
+
+ @if (Model.Recommendation == TransferAcademyAndTrustInformation.RecommendationResult.Empty) + { + Empty + } + else + { + var displayName = EnumHelpers.GetDisplayValue(Model.Recommendation); + @displayName + } +
+
+ + Change recommendation + +
+
+
+
+ Author +
+
+ @if (string.IsNullOrEmpty(Model.Author)) + { + Empty + } + else + { + @Model.Author + } +
+
+ + Change author + +
+
+
+
+ Incoming trust name +
+
+ @Model.IncomingTrustName +
+ @if (Model.IsFormAMAT) + { +
+ + Change author + +
+ } + else + { +
+ + Change + +
+ } +
+
\ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_AutoComplete.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_AutoComplete.cshtml new file mode 100644 index 000000000..bd5003f09 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_AutoComplete.cshtml @@ -0,0 +1,51 @@ +@using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers +@using NetEscapades.AspNetCore.SecurityHeaders.TagHelpers +@model Dfe.PrepareTransfers.Web.Models.AutoCompleteSearchModel + +

+
+ @Model.Label +
+ + + + \ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_FeaturesSummary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_FeaturesSummary.cshtml index add163a5d..7e993704b 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_FeaturesSummary.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_FeaturesSummary.cshtml @@ -1,7 +1,7 @@ @using Dfe.PrepareTransfers.Data.Models.Projects @using Dfe.PrepareTransfers.Helpers @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features.Index +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features.Index
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_InlineRadioButtons.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_InlineRadioButtons.cshtml index b5bba1bc8..23dcd6b63 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_InlineRadioButtons.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_InlineRadioButtons.cshtml @@ -1,5 +1,5 @@ @using Dfe.PrepareTransfers.Helpers -@model List +@model List
@for (var i = 0; i < Model.Count; i++) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_LegalSummary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_LegalSummary.cshtml index 3ada0b8a1..113194dc6 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_LegalSummary.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_LegalSummary.cshtml @@ -1,8 +1,8 @@ @using Microsoft.AspNetCore.Mvc.TagHelpers @using Dfe.PrepareTransfers.Data.TRAMS.ExtensionMethods @using Dfe.PrepareTransfers.Data.Models -@using Links = Dfe.PrepareConversions.Areas.Transfers.Links -@model Dfe.PrepareConversions.Areas.Transfers.Models.LegalRequirements.LegalRequirementsViewModel +@using Links = Dfe.PrepareTransfers.Web.Transfers.Links +@model Dfe.PrepareTransfers.Web.Models.LegalRequirements.LegalRequirementsViewModel
@{ await LegalAction("Outgoing trust resolution", @Model.OutgoingTrustConsent, "outgoing-trust-consent", Links.LegalRequirements.OutgoingTrustConsent.Home.PageName); diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_MarkSectionCompleted.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_MarkSectionCompleted.cshtml index 5fc1180f9..efb3b24a7 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_MarkSectionCompleted.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_MarkSectionCompleted.cshtml @@ -1,5 +1,5 @@ @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Models.MarkSectionCompletedViewModel +@model Dfe.PrepareTransfers.Web.Models.MarkSectionCompletedViewModel @if (Model.ShowIsCompleted) { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_RadioButtons.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_RadioButtons.cshtml index 3d51aaf6c..dc529c6fa 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_RadioButtons.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_RadioButtons.cshtml @@ -1,5 +1,5 @@ @using Dfe.PrepareTransfers.Helpers -@model List +@model List
@for (var i = 0; i < Model.Count(); i++) diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_SubMenu.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_SubMenu.cshtml index bd4f10c0d..da3bac27f 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_SubMenu.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_SubMenu.cshtml @@ -1,6 +1,6 @@ -@using Dfe.PrepareConversions.Areas.Transfers.Helpers.TagHelpers; -@using Dfe.PrepareConversions.Areas.Transfers.Models; -@using Links = Dfe.PrepareConversions.Areas.Transfers.Models.Links +@using Dfe.PrepareTransfers.Web.Helpers.TagHelpers; +@using Dfe.PrepareTransfers.Web.Models; +@using Links = Dfe.PrepareTransfers.Web.Models.Links @{ var urn = ViewContext.RouteData.Values["urn"]; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_TransferDatesSummary.cshtml b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_TransferDatesSummary.cshtml index 59d6d0fa6..2206fa0e3 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_TransferDatesSummary.cshtml +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Pages/Shared/_TransferDatesSummary.cshtml @@ -1,6 +1,6 @@ @using Dfe.PrepareTransfers.Web.Dfe.PrepareTransfers.Helpers.TagHelpers @using Microsoft.AspNetCore.Mvc.TagHelpers -@model Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.TransferDates.Index +@model Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.TransferDates.Index
diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateRangeValidationService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateRangeValidationService.cs index 5b0614418..d578c0294 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateRangeValidationService.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateRangeValidationService.cs @@ -1,6 +1,6 @@ using System; -namespace Dfe.PrepareConversions.Areas.Transfers.Services; +namespace Dfe.PrepareTransfers.Web.Transfers.Services; public class DateRangeValidationService { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateValidationService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateValidationService.cs index 96508217d..304d22605 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateValidationService.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/DateValidationService.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; -namespace Dfe.PrepareConversions.Areas.Transfers.Services; +namespace Dfe.PrepareTransfers.Web.Transfers.Services; public class DateValidationService { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/GetInformationForProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/GetInformationForProject.cs index f96f2b64c..d8beae381 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/GetInformationForProject.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/GetInformationForProject.cs @@ -1,5 +1,5 @@ -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; -using Dfe.PrepareConversions.Areas.Transfers.Services.Responses; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Responses; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Data.Models.KeyStagePerformance; @@ -7,7 +7,7 @@ using System.Collections.Generic; using System.Threading.Tasks; -namespace Dfe.PrepareConversions.Areas.Transfers.Services +namespace Dfe.PrepareTransfers.Web.Transfers.Services { public class GetInformationForProject : IGetInformationForProject { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/IDateValidationMessageProvider.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/IDateValidationMessageProvider.cs index 0465a7a74..f950ac675 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/IDateValidationMessageProvider.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/IDateValidationMessageProvider.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Dfe.PrepareConversions.Areas.Transfers.Services; +namespace Dfe.PrepareTransfers.Web.Transfers.Services; public interface IDateValidationMessageProvider { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IGetInformationForProject.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IGetInformationForProject.cs index b8c16b7df..b172002fd 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IGetInformationForProject.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IGetInformationForProject.cs @@ -1,7 +1,7 @@ using System.Threading.Tasks; -using Dfe.PrepareConversions.Areas.Transfers.Services.Responses; +using Dfe.PrepareTransfers.Web.Transfers.Services.Responses; -namespace Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces +namespace Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces { public interface IGetInformationForProject { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IReferenceNumberService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IReferenceNumberService.cs index 35f50c605..ed0d952e3 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IReferenceNumberService.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/IReferenceNumberService.cs @@ -1,6 +1,6 @@ using Dfe.PrepareTransfers.Data.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces +namespace Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces { public interface IReferenceNumberService { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/ITaskListService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/ITaskListService.cs index d5801b859..676e0ef33 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/ITaskListService.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Interfaces/ITaskListService.cs @@ -1,7 +1,7 @@ -using Dfe.PrepareConversions.Areas.Transfers.Pages.Projects; +using Dfe.PrepareTransfers.Web.Transfers.Pages.Projects; -namespace Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces +namespace Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces { public interface ITaskListService { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/ReferenceNumberService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/ReferenceNumberService.cs index 0f55bbd37..4af0a0188 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/ReferenceNumberService.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/ReferenceNumberService.cs @@ -1,9 +1,9 @@ -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using System; using Dfe.PrepareTransfers.Data.Models; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; -namespace Dfe.PrepareConversions.Areas.Transfers.Services +namespace Dfe.PrepareTransfers.Web.Transfers.Services { public class ReferenceNumberService : IReferenceNumberService { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/GetInformationForProjectResponse.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/GetInformationForProjectResponse.cs index 1a65dde20..a8bc2879b 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/GetInformationForProjectResponse.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/GetInformationForProjectResponse.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Dfe.PrepareTransfers.Data.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Services.Responses +namespace Dfe.PrepareTransfers.Web.Transfers.Services.Responses { public class GetInformationForProjectResponse { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/ServiceResponseError.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/ServiceResponseError.cs index 113aa6739..56eb8175b 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/ServiceResponseError.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/Responses/ServiceResponseError.cs @@ -1,4 +1,4 @@ -namespace Dfe.PrepareConversions.Areas.Transfers.Services.Responses +namespace Dfe.PrepareTransfers.Web.Transfers.Services.Responses { public class ServiceResponseError diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/TaskListService.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/TaskListService.cs index 92c42c1f5..5d1fed9fa 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/TaskListService.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Services/TaskListService.cs @@ -1,14 +1,13 @@ using Dfe.Academisation.ExtensionMethods; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using Dfe.PrepareTransfers.Data; using Dfe.PrepareTransfers.Data.Models; using Dfe.PrepareTransfers.Data.Models.Projects; -using Dfe.PrepareConversions.Areas; using System; using System.Linq; -using Index = Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Index; +using Index = Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Index; -namespace Dfe.PrepareConversions.Areas.Transfers.Services +namespace Dfe.PrepareTransfers.Web.Transfers.Services { public class TaskListService : ITaskListService { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/EqualitiesImpactValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/EqualitiesImpactValidator.cs index 2b0cef2be..26cb50b2d 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/EqualitiesImpactValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/EqualitiesImpactValidator.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.BenefitsAndRisks +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.BenefitsAndRisks { public class EqualitiesImpactValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/IntendedBenefitsValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/IntendedBenefitsValidator.cs index 525c96ae9..03c64d2be 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/IntendedBenefitsValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/IntendedBenefitsValidator.cs @@ -1,9 +1,9 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; using Dfe.PrepareTransfers.Data.Models.Projects; using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.BenefitsAndRisks +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.BenefitsAndRisks { public class IntendedBenefitsValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/OtherFactorsValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/OtherFactorsValidator.cs index 9c4bc287b..cd48728bb 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/OtherFactorsValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/OtherFactorsValidator.cs @@ -1,8 +1,8 @@ using System.Linq; using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.BenefitsAndRisks +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.BenefitsAndRisks { public class OtherFactorsValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/RisksBenefitValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/RisksBenefitValidator.cs index 4ba3ed756..64e83ce9a 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/RisksBenefitValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/BenefitsAndRisks/RisksBenefitValidator.cs @@ -1,7 +1,7 @@ using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Models.Benefits; +using Dfe.PrepareTransfers.Web.Models.Benefits; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.BenefitsAndRisks +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.BenefitsAndRisks { public class RisksValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesReasonValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesReasonValidator.cs index 5f1c1c05e..befe9585d 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesReasonValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesReasonValidator.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features; +using Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features; using Dfe.PrepareTransfers.Data.Models.Projects; using FluentValidation; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.Features { public class FeaturesReasonValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesSpecificReasonValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesSpecificReasonValidator.cs index 4aef50146..aa633b3ed 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesSpecificReasonValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesSpecificReasonValidator.cs @@ -1,10 +1,10 @@ -using Dfe.PrepareConversions.Areas.Transfers.Pages.Projects.Features; +using Dfe.PrepareTransfers.Web.Transfers.Pages.Projects.Features; using Dfe.PrepareTransfers.Data.Models.Projects; using FluentValidation; using System.Linq; using Microsoft.IdentityModel.Tokens; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.Features { public class FeaturesSpecificReasonValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesTypeValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesTypeValidator.cs index bc99b2539..d1043df5e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesTypeValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Features/FeaturesTypeValidator.cs @@ -1,9 +1,9 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Features; +using Dfe.PrepareTransfers.Web.Models.Features; using Dfe.PrepareTransfers.Data.Models.Projects; using FluentValidation; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.Features +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.Features { public class FeaturesTypeValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/ProjectType/ProjectTypeValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/ProjectType/ProjectTypeValidator.cs index b2c4bbd3b..8daab52bd 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/ProjectType/ProjectTypeValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/ProjectType/ProjectTypeValidator.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Models; +using Dfe.PrepareTransfers.Web.Models; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.ProjectType +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.ProjectType { public class ProjectTypeValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleProjectValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleProjectValidator.cs index dadcd3d25..bbe297ecc 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleProjectValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleProjectValidator.cs @@ -1,8 +1,8 @@ using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Models.Rationale; +using Dfe.PrepareTransfers.Web.Models.Rationale; using Dfe.PrepareTransfers.Web.Models.Rationale; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.Rationale +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.Rationale { public class RationaleProjectValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleTrustOrSponsorValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleTrustOrSponsorValidator.cs index 1c00a3213..b34666abd 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleTrustOrSponsorValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Rationale/RationaleTrustOrSponsorValidator.cs @@ -1,8 +1,8 @@ -using Dfe.PrepareConversions.Areas.Transfers.Models.Rationale; +using Dfe.PrepareTransfers.Web.Models.Rationale; using FluentValidation; -using Dfe.PrepareConversions.Areas.Transfers.Validators.Rationale; +using Dfe.PrepareTransfers.Web.Transfers.Validators.Rationale; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.Rationale +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.Rationale { public class RationaleTrustOrSponsorValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/AdvisoryBoardDateValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/AdvisoryBoardDateValidator.cs index 9746d5968..21c356a9e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/AdvisoryBoardDateValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/AdvisoryBoardDateValidator.cs @@ -1,8 +1,8 @@ using Dfe.PrepareTransfers.Helpers; -using Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; +using Dfe.PrepareTransfers.Web.Models.TransferDates; using FluentValidation; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.TransferDates; +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.TransferDates; public class AdvisoryBoardDateValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/DateValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/DateValidator.cs index bfc302a79..e328435ea 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/DateValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/DateValidator.cs @@ -1,11 +1,11 @@ using System; using System.Globalization; using Dfe.PrepareTransfers.Helpers; -using Dfe.PrepareConversions.Areas.Transfers.Models.Forms; -using Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; +using Dfe.PrepareTransfers.Web.Models.Forms; +using Dfe.PrepareTransfers.Web.Models.TransferDates; using FluentValidation; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.TransferDates; +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.TransferDates; public class DateValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/TargetDateValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/TargetDateValidator.cs index c61c5e28e..fa814c9a5 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/TargetDateValidator.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/TransferDates/TargetDateValidator.cs @@ -1,8 +1,8 @@ using Dfe.PrepareTransfers.Helpers; -using Dfe.PrepareConversions.Areas.Transfers.Models.TransferDates; +using Dfe.PrepareTransfers.Web.Models.TransferDates; using FluentValidation; -namespace Dfe.PrepareConversions.Areas.Transfers.Validators.TransferDates; +namespace Dfe.PrepareTransfers.Web.Transfers.Validators.TransferDates; public class TargetDateValidator : AbstractValidator { diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Transfers/EditIncomingTrustNameValidator.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Transfers/EditIncomingTrustNameValidator.cs new file mode 100644 index 000000000..8fdb33216 --- /dev/null +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Areas/Transfers/Validators/Transfers/EditIncomingTrustNameValidator.cs @@ -0,0 +1,20 @@ +using FluentValidation; +using Dfe.PrepareTransfers.Web.Pages.Projects.AcademyAndTrustInformation; + +namespace Dfe.PrepareTransfers.Web.Validators.Transfers +{ + public class EditIncomingTrustNameValidator : AbstractValidator + { + public EditIncomingTrustNameValidator() + { + RuleFor(x => x.IncomingTrustName) + .NotEmpty() + .WithMessage("Enter the Incoming trust name"); + } + + protected override void EnsureInstanceNotNull(object instanceToValidate) + { + //Allow Null + } + } +} \ No newline at end of file diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj b/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj index 8146b46eb..b25dfa033 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Dfe.PrepareConversions.csproj @@ -88,6 +88,10 @@ + + + + diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs index f780b7aee..f7f1521c9 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Startup.cs @@ -1,6 +1,6 @@ using Dfe.Academisation.CorrelationIdMiddleware; -using Dfe.PrepareConversions.Areas.Transfers.Services; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using Dfe.PrepareConversions.Authorization; using Dfe.PrepareConversions.Configuration; using Dfe.PrepareConversions.Data.Features; @@ -14,7 +14,7 @@ using Dfe.PrepareConversions.Services; using Dfe.PrepareConversions.Utils; using Dfe.PrepareTransfers.Web.BackgroundServices; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Builder; diff --git a/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/TransfersExtensions.cs b/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/TransfersExtensions.cs index eb4f6b8ed..31fd6b32e 100644 --- a/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/TransfersExtensions.cs +++ b/Dfe.PrepareConversions/Dfe.PrepareConversions/Utils/TransfersExtensions.cs @@ -1,8 +1,8 @@ using Dfe.Academies.Contracts.V4.Establishments; using Dfe.Academies.Contracts.V4.Trusts; using Dfe.Academisation.CorrelationIdMiddleware; -using Dfe.PrepareConversions.Areas.Transfers.Services; -using Dfe.PrepareConversions.Areas.Transfers.Services.Interfaces; +using Dfe.PrepareTransfers.Web.Transfers.Services; +using Dfe.PrepareTransfers.Web.Transfers.Services.Interfaces; using Dfe.PrepareConversions.Authorization; using Dfe.PrepareConversions.Data.Services.AzureAd; using Dfe.PrepareConversions.Data.Services.Interfaces; @@ -38,14 +38,14 @@ public static void AddTransfersApplicationServices(this IServiceCollection servi services.AddTransient, AcademiesEstablishmentMapper>(); services.AddTransient, TramsProjectSummariesMapper>(); services.AddTransient, AcademisationProjectMapper>(); - //services.AddTransient, TramsEducationPerformanceMapper>(); + services.AddTransient, TramsEducationPerformanceMapper>(); services.AddTransient, InternalProjectToUpdateMapper>(); services.AddTransient(); services.AddTransient(); - //services.AddTransient(); + services.AddTransient(); services.AddTransient(); //services.AddTransient(); - //services.AddTransient(); + services.AddTransient(); //services.AddTransient(); //services.AddTransient();