+ {% endif %}
- {% call govukFieldset({
- legend: {
- text: translate("drivingLicence.drivingLicenceGivenNames"),
- classes: "govuk-!-margin-0"
- }
- }) %}
+ {% call govukFieldset({
+ legend: {
+ text: translate("drivingLicence.drivingLicenceGivenNames"),
+ classes: "govuk-!-margin-0"
+ }
+ }) %}
{{ hmpoText(ctx, {
id: "firstName",
@@ -113,53 +114,53 @@
{{ translate("drivingLicence.retryMessageHeading") }}
{% endcall %}
- {% if (values.licenceIssuer == "DVLA") %}
+ {% if (values.licenceIssuer == "DVLA") %}
- {{ hmpoDate(ctx, {
- id: "dateOfBirth",
- legend: {
- classes: "govuk-label"
- }
- }) }}
-
- {{ hmpoText(ctx, {
- id: "dvlaDependent",
- type: "hidden",
- legend: "",
- default: "DVLA"
- }) }}
-
- {{ hmpoDate(ctx, {
- id: "issueDate",
- legend: {
- classes: "govuk-label"
- }
- }) }}
+ {{ hmpoDate(ctx, {
+ id: "dateOfBirth",
+ legend: {
+ classes: "govuk-label"
+ }
+ }) }}
- {% else %}
+ {{ hmpoText(ctx, {
+ id: "dvlaDependent",
+ type: "hidden",
+ legend: "",
+ default: "DVLA"
+ }) }}
- {{ hmpoDate(ctx, {
- id: "dvaDateOfBirth",
- legend: {
- classes: "govuk-label"
- }
- }) }}
-
- {{ hmpoText(ctx, {
- id: "dvaDependent",
- type: "hidden",
- legend: "",
- default: "DVA"
- }) }}
-
- {{ hmpoDate(ctx, {
- id: "dateOfIssue",
- legend: {
- classes: "govuk-label"
- }
- }) }}
+ {{ hmpoDate(ctx, {
+ id: "issueDate",
+ legend: {
+ classes: "govuk-label"
+ }
+ }) }}
+
+ {% else %}
+
+ {{ hmpoDate(ctx, {
+ id: "dvaDateOfBirth",
+ legend: {
+ classes: "govuk-label"
+ }
+ }) }}
- {% endif %}
+ {{ hmpoText(ctx, {
+ id: "dvaDependent",
+ type: "hidden",
+ legend: "",
+ default: "DVA"
+ }) }}
+
+ {{ hmpoDate(ctx, {
+ id: "dateOfIssue",
+ legend: {
+ classes: "govuk-label"
+ }
+ }) }}
+
+ {% endif %}
{{ hmpoDate(ctx, {
id: "expiryDate",
@@ -169,31 +170,48 @@
{{ translate("drivingLicence.retryMessageHeading") }}
}) }}
{% if (values.licenceIssuer == "DVLA") %}
- {{ hmpoText(ctx, {
- id: "drivingLicenceNumber",
- label: {
- classes: "govuk-label"
- }
+
+ {{ hmpoCountText(ctx, {
+ id: "drivingLicenceNumber",
+ label: {
+ classes: "govuk-label"
+ },
+ i18n:{
+ charactersUnderLimitTextOther:translate("drivingLicence.charactersUnderLimitTextOther"),
+ charactersUnderLimitTextOne:translate("drivingLicence.charactersUnderLimitTextOne"),
+ charactersAtLimitText:translate("drivingLicence.charactersAtLimitText"),
+ charactersOverLimitTextOne:translate("drivingLicence.charactersOverLimitTextOne"),
+ charactersOverLimitTextOther:translate("drivingLicence.charactersOverLimitTextOther")
+ }
}) }}
- {{ hmpoText(ctx, {
- id: "issueNumber",
- label: {
- classes: "govuk-label"
- }
- }) }}
+ {{ hmpoText(ctx, {
+ id: "issueNumber",
+ classes: "govuk-input--width-3",
+ label: {
+ classes: "govuk-label"
+ }
+ }) }}
{% else %}
- {{ hmpoText(ctx, {
- id: "dvaLicenceNumber",
- label: {
- classes: "govuk-label"
- }
+
+ {{ hmpoCountText(ctx, {
+ id: "dvaLicenceNumber",
+ label: {
+ classes: "govuk-label"
+ },
+ i18n:{
+ charactersUnderLimitTextOther:translate("drivingLicence.charactersUnderLimitTextOther"),
+ charactersUnderLimitTextOne:translate("drivingLicence.charactersUnderLimitTextOne"),
+ charactersAtLimitText:translate("drivingLicence.charactersAtLimitText"),
+ charactersOverLimitTextOne:translate("drivingLicence.charactersOverLimitTextOne"),
+ charactersOverLimitTextOther:translate("drivingLicence.charactersOverLimitTextOther")
+ }
}) }}
{% endif %}
- {{ hmpoText(ctx, {
+ {{ hmpoText(ctx, {
id: "postcode",
label: {
classes: "govuk-label"
@@ -201,54 +219,56 @@
{{ translate("drivingLicence.retryMessageHeading") }}
}) }}
{% if values.showRetryMessage and not (ctx("errors") | length) %}
- {# user is retrying, show warning message they have run out of attempts #}
- {{ govukWarningText({
- text: translate("drivingLicence.retryWarningText"),
- iconFallbackText: translate("drivingLicence.retryWarningTitle")
- }) }}
+ {# user is retrying, show warning message they have run out of attempts #}
+ {{ govukWarningText({
+ text: translate("drivingLicence.retryWarningText"),
+ iconFallbackText: translate("drivingLicence.retryWarningTitle")
+ }) }}
{% endif %}
- {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.next")}) }}
+ {{ hmpoSubmit(ctx, {id: "continue", text: translate("buttons.next")}) }}
{% endcall %}
{% endblock %}
+
{% block scripts %}
-{{ super ()}}
+ {{ super ()}}
-
+
+
{% endblock %}
+
{# generate the specific footer items required for the PYI flows #}
{% set footerNavItems = translate("govuk.footerNavItems") %}
-
{% block footer %}
{{ govukFooter( footerNavItems ) }}
{% endblock %}
diff --git a/src/views/drivingLicence/hmpoCountText.njk b/src/views/drivingLicence/hmpoCountText.njk
new file mode 100644
index 0000000..d8be048
--- /dev/null
+++ b/src/views/drivingLicence/hmpoCountText.njk
@@ -0,0 +1,71 @@
+
+{% macro hmpoCountText(ctx, params, base) %}
+
+ {%- set params = hmpoGetParams(ctx, params, base) %}
+
+ {%- set pageHeading = {
+ isPageHeading: true,
+ classes: "govuk-label--l"
+ } if params.isPageHeading %}
+
+ {%- set args = {
+ id: params.id,
+ name: params.id,
+ label: merge(
+ pageHeading,
+ { attributes: { id: params.id + "-label" } },
+ hmpoGetOptions(ctx, params, "label")
+ ),
+ hint: hmpoGetOptions(ctx, params, "hint", true),
+ value: hmpoGetValue(ctx, params),
+ errorMessage: hmpoGetError(ctx, params),
+ type: params.type,
+ inputmode: params.inputmode,
+ classes: "" + (params.classes if params.classes else "govuk-!-width-one-half") + (" js-nopaste" if params.noPaste),
+ formGroup: params.formGroup,
+ autocomplete: params.autocomplete,
+ rows: params.rows,
+ i18n: params.i18n,
+ attributes: hmpoGetAttributes(ctx, params, {
+ "aria-required": hmpoGetValidatorAttribute(ctx, params, "required", null, false),
+ "min": hmpoGetValidatorAttribute(ctx, params, "min", 0),
+ "max": hmpoGetValidatorAttribute(ctx, params, "max", 0),
+ "maxlength": hmpoGetValidatorAttribute(ctx, params, "maxlength", 0) or hmpoGetValidatorAttribute(ctx, params, "exactlength", 0)
+ } | filter(null))
+ } %}
+
+ {%- if params.type == "textarea" %}
+ {%- from "govuk/components/textarea/macro.njk" import govukTextarea %}
+ {{- govukTextarea(args) }}
+ {%- else %}
+ {%- from "govuk/components/character-count/macro.njk" import govukCharacterCount %}
+ {%- from "govuk/components/input/macro.njk" import govukInput %}
+
+ {# {{- govukInput(args) }} #}
+ {{ govukCharacterCount({
+ name: args.name,
+ id: args.id,
+ maxlength: args.attributes.maxlength,
+ rows:1,
+ value: args.value,
+ label: {
+ id:args.label.id,
+ text: args.label.html,
+ classes: args.label.classes,
+ isPageHeading: false
+ },
+ hint: {
+ text: args.hint.html
+ },
+ charactersUnderLimitText: {
+ other: args.i18n.charactersUnderLimitTextOther,
+ one: args.i18n.charactersUnderLimitTextOne
+ },
+ charactersOverLimitText: {
+ one: args.i18n.charactersOverLimitTextOne,
+ other: args.i18n.charactersOverLimitTextOther
+ },
+ charactersAtLimitText: args.i18n.charactersAtLimitText
+ }) }}
+ {%- endif %}
+{% endmacro %}