diff --git a/src/Employer/Employer.Web/Views/Part1/Duration/Duration.cshtml b/src/Employer/Employer.Web/Views/Part1/Duration/Duration.cshtml index 14d76e8ed3..8ced427ea1 100644 --- a/src/Employer/Employer.Web/Views/Part1/Duration/Duration.cshtml +++ b/src/Employer/Employer.Web/Views/Part1/Duration/Duration.cshtml @@ -24,15 +24,15 @@ (enter a numeric value and then select Month(s) or Year(s) in the next field) - The apprenticeship must last at least 12 months + The apprenticeship must last for at least 12 months. - For @Model.TrainingTitle, Typical length is @Model.TrainingDurationMonths months + For @Model.TrainingTitle, typical length is @Model.TrainingDurationMonths months. @@ -41,9 +41,10 @@
- For example, Monday to Friday 9am to 5pm, shifts, may work evenings and weekends + For example, Monday to Friday 9am to 5pm, shifts, may work evenings and weekends. + You have 250 characters remaining
diff --git a/src/Employer/Employer.Web/Views/Part1/Part1Complete/Part1Complete.cshtml b/src/Employer/Employer.Web/Views/Part1/Part1Complete/Part1Complete.cshtml index 8f818b01bb..f99276f305 100644 --- a/src/Employer/Employer.Web/Views/Part1/Part1Complete/Part1Complete.cshtml +++ b/src/Employer/Employer.Web/Views/Part1/Part1Complete/Part1Complete.cshtml @@ -9,16 +9,16 @@
Back -

Preview your vacancy

+

Preview your advert

- Review the details that will appear in your vacancy. Once this is approved it will appear on - find an apprentice service (opens in new tab). + Review the details that will appear in your advert. You can still make changes if you need to.

- You can change any of the details. + Once we've approved your advert, it will appear on ​the + ​Find an apprenticeship service (opens in a new tab or window).

- Preview vacancy + Preview advert
diff --git a/src/Employer/Employer.Web/Views/Part1/Wage/Wage.cshtml b/src/Employer/Employer.Web/Views/Part1/Wage/Wage.cshtml index f1242dc7d5..c4e8d8d36f 100644 --- a/src/Employer/Employer.Web/Views/Part1/Wage/Wage.cshtml +++ b/src/Employer/Employer.Web/Views/Part1/Wage/Wage.cshtml @@ -23,8 +23,9 @@
-
Pay will show as a yearly figure on your vacancy. - National Minimum Wage for apprentices. +
+ Pay will show as a yearly figure on your advert. + View the​ ​National MinimumWage for apprentices (opens in a new tab or window)​.
@@ -36,8 +37,11 @@

- From @Model.MinimumWageStartFrom, National Minimum Wage is between @Model.NationalMinimumWageLowerBoundHourly and @Model.NationalMinimumWageUpperBoundHourly an hour, depending on the candidate's age.

- On the vacancy, this will be displayed as a yearly wage of @Model.NationalMinimumWageYearly + + From @Model.MinimumWageStartFrom, the National Minimum Wage is between @Model.NationalMinimumWageLowerBoundHourly and @Model.NationalMinimumWageUpperBoundHourly an hour, depending on the candidate's age. +

+ On the advert, this will be displayed as a yearly wage of @Model.NationalMinimumWageYearly. +

@@ -51,7 +55,7 @@

From @Model.MinimumWageStartFrom, the National Minimum Wage for apprentices is @Model.ApprenticeshipMinimumWageHourly an hour.

- On the vacancy, this will be displayed as a yearly wage of @Model.ApprenticeshipMinimumWageYearly + On the advert, this will be displayed as a yearly wage of @Model.ApprenticeshipMinimumWageYearly.

@@ -66,11 +70,11 @@

- This must be more than the National Minimum Wage for apprentices. + This must be more than the National Minimum Wage for apprentices (opens in a new tab or window)​.

From @Model.MinimumWageStartFrom, the National Minimum Wage for apprentices is @Model.ApprenticeshipMinimumWageHourly an hour.

- Based on @Model.WeeklyHours working hours a week, you'll need to pay a yearly wage of at least @Model.ApprenticeshipMinimumWageYearly. + Based on @Model.WeeklyHours working hours a week, you'll need to pay a yearly wage of at least @Model.ApprenticeshipMinimumWageYearly.

@@ -85,9 +89,10 @@
- For example bonus schemes, performance increases or benefits + For example, bonus schemes, performance increases or benefits + You have 250 characters remaining
diff --git a/src/Shared/Recruit.Shared.Web/Recruit.Shared.Web.csproj b/src/Shared/Recruit.Shared.Web/Recruit.Shared.Web.csproj index 2414098b2e..28920856f9 100644 --- a/src/Shared/Recruit.Shared.Web/Recruit.Shared.Web.csproj +++ b/src/Shared/Recruit.Shared.Web/Recruit.Shared.Web.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Shared/Recruit.Vacancies.Client/Application/Validation/Fluent/FluentVacancyValidator.cs b/src/Shared/Recruit.Vacancies.Client/Application/Validation/Fluent/FluentVacancyValidator.cs index 4d248986d3..25015403b4 100644 --- a/src/Shared/Recruit.Vacancies.Client/Application/Validation/Fluent/FluentVacancyValidator.cs +++ b/src/Shared/Recruit.Vacancies.Client/Application/Validation/Fluent/FluentVacancyValidator.cs @@ -286,10 +286,10 @@ private void ValidateDuration() { RuleFor(x => x.Wage.DurationUnit) .NotEmpty() - .WithMessage("You must state the expected duration") + .WithMessage("Enter how long the whole apprenticeship is, including work and training") .WithErrorCode("34") .IsInEnum() - .WithMessage("You must state the expected duration") + .WithMessage("Enter how long the whole apprenticeship is, including work and training") .WithErrorCode("34") .RunCondition(VacancyRuleSet.Duration) .WithRuleId(VacancyRuleSet.Duration); @@ -297,10 +297,10 @@ private void ValidateDuration() RuleFor(x => x.Wage.Duration) .Cascade(CascadeMode.StopOnFirstFailure) .NotEmpty() - .WithMessage("You must state the expected duration") + .WithMessage("Enter how long the whole apprenticeship is, including work and training") .WithErrorCode("34") .GreaterThan(0) - .WithMessage("You must state the expected duration") + .WithMessage("Enter how long the whole apprenticeship is, including work and training") .WithErrorCode("34") .Must((vacancy, value) => { @@ -325,7 +325,7 @@ private void ValidateWorkingWeek() RuleFor(x => x.Wage.WorkingWeekDescription) .Cascade(CascadeMode.StopOnFirstFailure) .NotEmpty() - .WithMessage("You must include details of the working week") + .WithMessage("Enter details about the working week") .WithErrorCode("37") .ValidFreeTextCharacters() .WithMessage("Working week details contains some invalid characters") @@ -347,7 +347,7 @@ private void ValidateWeeklyHours() { RuleFor(x => x.Wage.WeeklyHours) .NotEmpty() - .WithMessage("You must state the total working hours per week") + .WithMessage("Enter how many hours the apprentice will work each week, including training") .WithErrorCode("40") .GreaterThanOrEqualTo(16) .WithMessage("The total hours a week must be at least {ComparisonValue}") @@ -364,7 +364,7 @@ private void ValidateWage() { RuleFor(x => x.Wage) .NotNull() - .WithMessage("You must select a wage") + .WithMessage("Select how much you'd like to pay the apprentice") .WithErrorCode("46") .RunCondition(VacancyRuleSet.Wage) .WithRuleId(VacancyRuleSet.Wage); @@ -373,10 +373,10 @@ private void ValidateWage() { RuleFor(x => x.Wage.WageType) .NotEmpty() - .WithMessage("You must select a wage") + .WithMessage("Select how much you'd like to pay the apprentice") .WithErrorCode("46") .IsInEnum() - .WithMessage("You must select a wage") + .WithMessage("Select how much you'd like to pay the apprentice") .WithErrorCode("46") .RunCondition(VacancyRuleSet.Wage) .WithRuleId(VacancyRuleSet.Wage); diff --git a/src/Shared/Recruit.Vacancies.Client/Recruit.Vacancies.Client.csproj b/src/Shared/Recruit.Vacancies.Client/Recruit.Vacancies.Client.csproj index 5b9315d200..349d671bfc 100644 --- a/src/Shared/Recruit.Vacancies.Client/Recruit.Vacancies.Client.csproj +++ b/src/Shared/Recruit.Vacancies.Client/Recruit.Vacancies.Client.csproj @@ -37,7 +37,7 @@ - + diff --git a/src/Shared/UnitTests/Shared.Web/Extensions/WageExtensionsTests.cs b/src/Shared/UnitTests/Shared.Web/Extensions/WageExtensionsTests.cs index 10ea3adb9c..7c329cf4a3 100644 --- a/src/Shared/UnitTests/Shared.Web/Extensions/WageExtensionsTests.cs +++ b/src/Shared/UnitTests/Shared.Web/Extensions/WageExtensionsTests.cs @@ -33,7 +33,7 @@ public void ShouldFormatNationalMinimumWageCorrectly() var actual = wage.ToText(new DateTime(2018, 5, 1)); - actual.Should().Be("£8,202.01 - £15,290.89"); + actual.Should().Be("£8,202.01 to £15,290.89"); } [Fact]