Skip to content

Commit

Permalink
Merge pull request #893 from SkillsFundingAgency/CON-2026-content-des…
Browse files Browse the repository at this point in the history
…ign-change-description-of-apprenticeship

CON-2026 - Content and design changes to 'Description of the apprenti…
  • Loading branch information
narendranogothu authored Jun 30, 2020
2 parents a0635bb + f3184c7 commit a5bdde7
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,16 @@
<div class="govuk-radios govuk-radios--inline">
<div class="govuk-radios__item">
<input asp-for="Weighting" class="govuk-radios__input" id="WeightingYes" esfa-automation="radio-weighting-yes" type="radio" value="@QualificationWeighting.Essential" data-display="@QualificationWeighting.Essential.GetDisplayName()">
<label class="govuk-label govuk-radios__label" for="WeightingYes">Essential
<span class="govuk-hint">The applicant must have this qualification to be considered</span>
<label class="govuk-label govuk-radios__label" for="WeightingYes">
Essential
<span class="govuk-hint">The applicant must have this qualification to be considered.</span>
</label>
</div>
<div class="govuk-radios__item">
<input asp-for="Weighting" class="govuk-radios__input" id="WeightingNo" esfa-automation="radio-weighting-no" type="radio" value="@QualificationWeighting.Desired" data-display="@QualificationWeighting.Desired.GetDisplayName()">
<label class="govuk-label govuk-radios__label" for="WeightingNo">Desirable
<span class="govuk-hint">This qualification would be nice to have, but is not required</span>
<label class="govuk-label govuk-radios__label" for="WeightingNo">
Desirable
<span class="govuk-hint">This qualification would be nice to have, but is not required.</span>
</label>
</div>
</div>
Expand All @@ -67,8 +69,11 @@

<div class="govuk-form-group">
<button type="submit" esfa-automation="btn-continue" class="govuk-button save-button">Save and continue</button>
<a asp-route="@Model.CancelRoute" esfa-automation="link-cancel" class="govuk-link das-button-link">Cancel</a>
<div>
<a asp-route="@Model.CancelRoute" esfa-automation="link-cancel" class="govuk-link">Cancel</a>
</div>
</div>

</form>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,29 @@
<form asp-route="@RouteNames.VacancyDescription_Index_Post">
<div esfa-validation-marker-for="VacancyDescription" class="govuk-form-group">
<label asp-for="VacancyDescription" class="govuk-label govuk-!-font-weight-bold">What will the apprentice be doing?</label>
<span class="govuk-hint">Describe what an average day or week will be like and what tasks they could be doing.</span>
<span class="govuk-hint">Describe what an average day or week will be like and what tasks the apprentice could be doing.</span>
<span esfa-validation-message-for="VacancyDescription" class="govuk-error-message"></span>
<textarea asp-for="VacancyDescription" class="govuk-textarea html-editor" rows="5" data-val-length-max="500"></textarea>
<span class="govuk-body maxchar-count">500</span>
<span class="govuk-body maxchar-text"> characters remaining</span>
</div>
<div esfa-validation-marker-for="TrainingDescription" class="govuk-form-group">
<label asp-for="TrainingDescription" class="govuk-label govuk-!-font-weight-bold">What training will the apprentice take and what qualification will the apprentice get at the end?</label>
<label asp-for="TrainingDescription" class="govuk-label govuk-!-font-weight-bold govuk-!-margin-bottom-5">What training will the apprentice take and what qualification will the apprentice get at the end?</label>
<p class="govuk-body">You must include information about the following:</p>
<ul class="govuk-list govuk-list--bullet">
<li>
the qualification they will get at the end. You may want to have a look at the <a class="govuk-link" target="_blank" href="https://www.gov.uk/what-different-qualification-levels-mean/list-of-qualification-levels">types of qualifications available (opens in new tab).</a>
the qualification they’ll get at the end - you can <a class="govuk-link" target="_blank" href="https://www.gov.uk/what-different-qualification-levels-mean/list-of-qualification-levels">view the types of qualifications available (opens in a new tab or window)</a>
</li>
<li>where and when the apprentice will do their training. If you can, add detail about the location of the training. It would also be helpful to include if it is a day a week or block release </li>
<li>where and when the apprentice will do their training - if you can, add details about the location of the training </li>
<li>whether the training will be one day a week or block release</li>
</ul>
<span esfa-validation-message-for="TrainingDescription" class="govuk-error-message"></span>
<textarea asp-for="TrainingDescription" class="govuk-textarea html-editor" rows="5" data-val-length-max="500"></textarea>
<span class="govuk-body maxchar-count">500</span>
<span class="govuk-body maxchar-text"> characters remaining</span>
</div>
<div esfa-validation-marker-for="OutcomeDescription" class="govuk-form-group">
<label asp-for="OutcomeDescription" class="govuk-label govuk-!-font-weight-bold">What is the expected career progression after this apprenticeship?</label>
<label asp-for="OutcomeDescription" class="govuk-label govuk-!-font-weight-bold">What's the expected career progression after this apprenticeship?</label>
<span class="govuk-hint">You may want to mention specific routes they could take once qualified</span>
<span esfa-validation-message-for="OutcomeDescription" class="govuk-error-message"></span>
<textarea asp-for="OutcomeDescription" class="govuk-textarea html-editor" rows="5" data-val-length-max="500"></textarea>
Expand All @@ -47,7 +48,9 @@
</div>
<div class="govuk-form-group">
<input type="submit" value="Save and continue" esfa-automation="btn-continue" class="govuk-button save-button" />
<a asp-route="@RouteNames.Vacancy_Preview_Get" esfa-automation="link-cancel" class="govuk-link das-button-link">Cancel</a>
<div>
<a asp-route="@RouteNames.Vacancy_Preview_Get" esfa-automation="link-cancel" class="govuk-link das-button-link">Cancel</a>
</div>
</div>
</form>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ private void ValidateDescription()
{
RuleFor(x => x.Description)
.NotEmpty()
.WithMessage("You must provide information on what the apprenticeship will involve")
.WithMessage("Enter what the apprentice will be doing")
.WithErrorCode("53")
.MaximumLength(1000)
.WithMessage("What the apprenticeship involves must not exceed {MaxLength} characters")
Expand All @@ -466,7 +466,7 @@ private void ValidateTrainingDescription()
{
RuleFor(x => x.TrainingDescription)
.NotEmpty()
.WithMessage("You must provide information on the training to be provided")
.WithMessage("Enter the training the apprentice will take and the qualification the apprentice will get")
.WithErrorCode("54")
.MaximumLength(1000)
.WithMessage("Training to be provided description must not exceed {MaxLength} characters")
Expand All @@ -485,7 +485,7 @@ private void ValidateOutcomeDescription()
{
RuleFor(x => x.OutcomeDescription)
.NotEmpty()
.WithMessage("You must provide information on what to expect at the end of the apprenticeship")
.WithMessage("Enter the expected career progression after this apprenticeship")
.WithErrorCode("55")
.MaximumLength(1000)
.WithMessage("What is the expected career progression after this apprenticeship description must not exceed {MaxLength} characters")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public QualificationValidatorBase(long ruleId, IQualificationsProvider qualifica

RuleFor(x => x.Subject)
.NotEmpty()
.WithMessage("Provide a subject")
.WithMessage("Enter the subject")
.WithErrorCode("54")
.MaximumLength(50)
.WithMessage("The qualification must not exceed {MaxLength} characters")
Expand All @@ -76,7 +76,7 @@ public QualificationValidatorBase(long ruleId, IQualificationsProvider qualifica

RuleFor(x => x.Grade)
.NotEmpty()
.WithMessage("Provide a grade")
.WithMessage("Enter the grade")
.WithErrorCode("55")
.MaximumLength(30)
.WithMessage("The grade should be no longer than {MaxLength} characters")
Expand All @@ -100,7 +100,7 @@ public QualificationValidatorBase(long ruleId, IQualificationsProvider qualifica

RuleFor(x => x.Weighting)
.NotEmpty()
.WithMessage("Select if this is a desired or an essential qualification")
.WithMessage("Select if this qualification is essential or desirable")
.WithErrorCode("56")
.WithRuleId(ruleId);
}
Expand Down

0 comments on commit a5bdde7

Please sign in to comment.