Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
name: "event[medicalInformation][hrt][hrtDuration]",
value: event.medicalInformation.hrt.hrtDuration,
label: {
text: "For how long?"
text: "Approximate date started"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
text: "For example, 18 months"
text: "For example, " ~ (now() | remove(18, "months") | formatDate("MMMM YYYY"))
}
}) }}

Expand All @@ -47,19 +47,19 @@
name: "event[medicalInformation][hrt][hrtDurationSinceStopped]",
value: event.medicalInformation.hrt.hrtDurationSinceStopped,
label: {
text: "Describe when they stopped"
text: "Approximate date stopped"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
text: "For example, two weeks ago"
text: "For example, " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))
}
}) }}

{{ input({
name: "event[medicalInformation][hrt][hrtDurationBeforeStopping]",
value: event.medicalInformation.hrt.hrtDurationBeforeStopping,
label: {
text: "How long had they been taking HRT for?"
text: "Approximate time taken for"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ <h1 class="nhsuk-heading-l">
name: "event[medicalInformation][pregnancyAndBreastfeeding][currentlyPregnantDetails]",
value: event.medicalInformation.pregnancyAndBreastfeeding.currentlyPregnantDetails,
label: {
text: "Provide timeframe"
text: "Approximate due date"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
text: "For example, due in November"
text: "For example, " ~ (now() | add(3, "months") | formatDate("MMMM YYYY"))
}
} ) }}
{% endset %}
Expand All @@ -43,11 +43,11 @@ <h1 class="nhsuk-heading-l">
name: "event[medicalInformation][pregnancyAndBreastfeeding][recentlyPregnantDetails]",
value: event.medicalInformation.pregnancyAndBreastfeeding.recentlyPregnantDetails,
label: {
text: "Describe when"
text: "Approximate date pregnancy ended"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
text: "For example, gave birth two weeks ago"
text: "For example, " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))
}
} ) }}
{% endset %}
Expand All @@ -57,11 +57,11 @@ <h1 class="nhsuk-heading-l">
name: "event[medicalInformation][pregnancyAndBreastfeeding][currentlyBreastfeedingDuration]",
value: event.medicalInformation.pregnancyAndBreastfeeding.currentlyBreastfeedingDuration,
label: {
text: "For how long?"
text: "Approximate date started"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
text: "For example, since January"
text: "For example, since " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))
Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
text: "For example, since " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))
text: "For example, " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
text: "For example, since " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))
text: "For example, " ~ (now() | remove(2, "months") | formatDate("MMMM YYYY"))

}
} ) }}
{% endset %}
Expand All @@ -71,11 +71,11 @@ <h1 class="nhsuk-heading-l">
name: "event[medicalInformation][pregnancyAndBreastfeeding][recentlyBreastfeedingDuration]",
value: event.medicalInformation.pregnancyAndBreastfeeding.recentlyBreastfeedingDuration,
label: {
text: "Describe when"
text: "Approximate date stopped"
},
classes: "nhsuk-u-width-two-thirds",
hint: {
text: "For example, two months ago"
text: "For example, " ~ (now() | remove(3, "months") | formatDate("MMMM YYYY"))
}
} ) }}
{% endset %}
Expand Down
6 changes: 3 additions & 3 deletions app/views/events/medical-information/symptoms/details.html
Original file line number Diff line number Diff line change
Expand Up @@ -477,10 +477,10 @@ <h1 class="nhsuk-heading-l">
{{ input({
name: "event[symptomTemp][approximateDateStopped]",
label: {
text: "Describe when"
text: "Approximate date symptom stopped"
},
hint: {
text: "For example, 3 days ago"
text: "For example, " ~ (now() | remove(1, "months") | formatDate("MMMM YYYY"))
},
value: event.symptomTemp.approximateDateStopped,
classes: "nhsuk-u-width-two-thirds"
Expand Down Expand Up @@ -656,4 +656,4 @@ <h1 class="nhsuk-heading-l">
{% endif %}
{# {% include "screening-cannot-proceed-link.njk" %} #}

{% endblock %}
{% endblock %}
2 changes: 1 addition & 1 deletion app/views/events/previous-mammograms/form.html
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ <h1 class="nhsuk-heading-l">
},
{
value: "moreThanSixMonths",
text: "Not sure (6 months or more ago)",
text: "Not sure (at least 6 months ago)",
conditional: {
html: moreThanSixMonthsHtml
}
Expand Down
Loading