From 23f86cd6f085a397ee5c464a94a230a968a63c57 Mon Sep 17 00:00:00 2001 From: Ben Millar Date: Mon, 10 Mar 2025 22:20:33 +0000 Subject: [PATCH 1/2] LGA-3556: Stay safe when you use this website (#192) * Add online safety page * Add Welsh translation to link footer * Add unit tests --- app/main/routes.py | 7 +- app/templates/base.html | 4 + app/templates/main/online-safety.html | 70 ++++++++++ app/translations/cy/LC_MESSAGES/messages.mo | Bin 76114 -> 82962 bytes app/translations/cy/LC_MESSAGES/messages.po | 131 +++++++++++++++++++ app/translations/en/LC_MESSAGES/messages.pot | 128 ++++++++++++++++++ tests/unit_tests/test_pages.py | 16 +++ 7 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 app/templates/main/online-safety.html diff --git a/app/main/routes.py b/app/main/routes.py index d57ad2f68..ab25a9f53 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -153,7 +153,12 @@ def cookies(): @bp.route("/privacy", methods=["GET"]) def privacy(): - return render_template("privacy.html") + return render_template("main/privacy.html") + + +@bp.route("/online-safety") +def online_safety(): + return render_template("main/online-safety.html") @bp.route("/session-expired", methods=["GET"]) diff --git a/app/templates/base.html b/app/templates/base.html index ec353198e..88e966466 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -162,6 +162,10 @@ 'href': language.switch.href, 'text': language.switch.text, 'attributes': {'x-data': 'language-switcher'}, + }, + { + 'href': url_for('main.online_safety'), + 'text': _("Staying safe online") }, { 'href': url_for('main.accessibility'), diff --git a/app/templates/main/online-safety.html b/app/templates/main/online-safety.html new file mode 100644 index 000000000..5168782f7 --- /dev/null +++ b/app/templates/main/online-safety.html @@ -0,0 +1,70 @@ +{% extends "base.html" %} +{%- from 'components/back_link.html' import govukBackLink -%} + +{% block page_title %}{{ _('Staying safe online') }} - {{ super() }}{% endblock %} + +{% block beforeContent %} + {{ super() }} + {{ govukBackLink({ 'text': _('Back') }) }} +{% endblock %} + +{% block content %} +
+
+

{{ _('Stay safe when you use this website') }}

+ +

{{ _('If you need to hide what you’re doing on this website, or protect yourself from someone, it can be safer not to use your home computer or your own mobile phone.') }}

+

{{ _('For example, use a computer at the library, or borrow a phone from someone you trust.') }}

+ + +

{{ _('What this website saves to your device') }}

+

{{ _('When you use this website, and every time you use the internet, your device saves a record of:') }}

+
    +
  • {{ _('the pages you’ve looked at and the files you’ve downloaded - this is called your ‘browsing history’') }}
    • +
  • {{ _('small files called ‘cookies’') }}
    • +
+ +

{{ _('How to delete cookies and your browsing history') }}

+

{{ _('Be careful because:') }}

+
    +
  • {{ _('deleting cookies will also delete stored passwords for online accounts') }}
    • +
  • {{ _('clearing your history could make someone more suspicious') }}
    • +
+

{{ _('Try to only remove information about the websites you want to keep private.') }}

+

{{ _('Find out how to do that on:') }}

+ + + +

{{ _('How the ‘Exit this page’ button works on this website') }}

+

+ {{ _('There is an ‘Exit this page’ button on some pages. If you click this button, all the information you’ve entered will be deleted. This website will close.')}} +

+

+ {{ _('You’ll automatically go to the BBC Weather homepage:') }} {{ _('https://www.bbc.co.uk/weather/') }} +

+ +

{{ _('Cookies and browsing history will still be saved to your device.') }}

+

{{ _('On any page where you see the ‘Exit this page’ button, pressing the ‘Shift’ key 3 times will work the same way.') }}

+

{{ _('To find this website again, search ‘Check if you can get legal aid’.') }}

+ +

{{ _('How to use this website without storing cookies and browser history') }}

+

{{ _('Use the ‘private browsing’ settings. Go to the menu on your browser, click on ‘File’ and turn on:') }}

+
    +
  • {{ _('Incognito on Google Chrome') }}
    • +
  • {{ _('Private Window on Safari') }}
    • +
  • {{ _('InPrivate on Internet Explorer') }}
    • +
  • {{ _('Private Browsing on Mozilla Firefox') }}
    • +
+

{{ _('On Samsung internet, you need to turn on') }} {{ _('Secret mode.') }}

+ +

{{ _('Get help to stay safe online') }}

+

{{ _('There are other ways someone can track you online, for example by using spying or tracking programmes. See the Refuge website') }} {{ _('Secure your tech.') }}

+
+
+{% endblock %} diff --git a/app/translations/cy/LC_MESSAGES/messages.mo b/app/translations/cy/LC_MESSAGES/messages.mo index 1edaf8c71dc8525e3bbc88d89139da9026ffa084..95773f26352f788257d32cbd023bf043988f2127 100644 GIT binary patch delta 16383 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 MOz-K}-^GzX}y{` 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 K`Q?swg8hF(YG6bF diff --git a/app/translations/cy/LC_MESSAGES/messages.po b/app/translations/cy/LC_MESSAGES/messages.po index e94a3240e..61fe63455 100644 --- a/app/translations/cy/LC_MESSAGES/messages.po +++ b/app/translations/cy/LC_MESSAGES/messages.po @@ -1716,6 +1716,9 @@ msgstr "Rhowch 0 os nad oes gennych eitemau gwerthfawr sy’n werth dros £500 y msgid "Exit this page" msgstr "Gadael y dudalen hon" +msgid "Staying safe online" +msgstr "Cadw’n ddiogel ar-lein" + msgid "Sorry, you’re not likely to get legal aid" msgstr "" @@ -2452,6 +2455,134 @@ msgstr "Ymestyn y terfyn amser" msgid "Exit service" msgstr "Gadael y gwasanaeth" +msgid "Stay safe when you use this website" +msgstr "Cadwch yn ddiogel wrth ddefnyddio’r wefan hon" + +msgid "" +"If you need to hide what you’re doing on this website, or protect " +"yourself from someone, it can be safer not to use your home computer or " +"your own mobile phone." +msgstr "Os oes angen i chi guddio’r hyn rydych chi’n ei wneud ar y wefan hon, neu ddiogelu eich hun rhag rhywun, gall fod yn fwy diogel peidio â defnyddio eich cyfrifiadur gartref na’ch ffôn symudol eich hun." + +msgid "" +"For example, use a computer at the library, or borrow a phone from " +"someone you trust." +msgstr "Er enghraifft, defnyddiwch gyfrifiadur yn y llyfrgell, neu fenthyg ffôn gan rywun rydych chi’n ymddiried ynddo." + +msgid "What this website saves to your device" +msgstr "Beth mae'r wefan hon yn ei gadw ar eich dyfais" + +msgid "" +"When you use this website, and every time you use the internet, your " +"device saves a record of:" +msgstr "Pan fyddwch chi’n defnyddio’r wefan hon, a phob tro y byddwch chi’n defnyddio’r rhyngrwyd, bydd eich dyfais yn cadw cofnod o’r canlynol:" + +msgid "" +"the pages you’ve looked at and the files you’ve downloaded - this is " +"called your ‘browsing history’" +msgstr "y tudalennau rydych chi wedi edrych arnyn nhw a'r ffeiliau rydych chi wedi'u llwytho i lawr – gelwir hyn yn 'hanes pori'" + +msgid "small files called ‘cookies’" +msgstr "ffeiliau bach o’r enw ‘cwcis’" + +msgid "How to delete cookies and your browsing history" +msgstr "Sut mae dileu cwcis a'ch hanes pori" + +msgid "Be careful because:" +msgstr "Byddwch yn ofalus oherwydd:" + +msgid "deleting cookies will also delete stored passwords for online accounts" +msgstr "bydd dileu cwcis hefyd yn dileu cyfrineiriau sydd wedi’u storio ar gyfer cyfrifon ar-lein" + +msgid "clearing your history could make someone more suspicious" +msgstr "gallai clirio eich hanes wneud rhywun yn fwy amheus" + +msgid "" +"Try to only remove information about the websites you want to keep " +"private." +msgstr "Ceisiwch ddileu’r wybodaeth am y gwefannau rydych chi am eu cadw'n breifat yn unig." + +msgid "Find out how to do that on:" +msgstr "Dysgwch sut mae gwneud hynny ar:" + +msgid "Google Chrome" +msgstr "" + +msgid "Internet Explorer" +msgstr "" + +msgid "Mozilla Firefox" +msgstr "" + +msgid "Safari" +msgstr "" + +msgid "Samsung internet" +msgstr "" + +msgid "How the ‘Exit this page’ button works on this website" +msgstr "Sut mae’r botwm ‘Gadael y dudalen hon’ yn gweithio ar y wefan hon" + +msgid "" +"There is an ‘Exit this page’ button on some pages. If you click this " +"button, all the information you’ve entered will be deleted. This website " +"will close." +msgstr "Mae botwm ‘Gadael y dudalen hon’ ar rai tudalennau. Os byddwch chi’n clicio’r botwm hwn, bydd yr holl wybodaeth rydych chi wedi’i rhoi yn cael ei dileu. Bydd y wefan hon yn cau." + +msgid "You’ll automatically go to the BBC Weather homepage:" +msgstr "Byddwch yn mynd yn awtomatig i dudalen hafan BBC Weather:" + +msgid "https://www.bbc.co.uk/weather/" +msgstr "" + +msgid "Cookies and browsing history will still be saved to your device." +msgstr "Bydd y cwcis a’r hanes pori yn dal i gael eu cadw ar eich dyfais." + +msgid "" +"On any page where you see the ‘Exit this page’ button, pressing the " +"‘Shift’ key 3 times will work the same way." +msgstr "Ar unrhyw dudalen lle gwelwch y botwm ‘Gadael y dudalen hon’, bydd pwyso’r fysell ‘Shift’ 3 gwaith yn gwneud yr un peth." + +msgid "To find this website again, search ‘Check if you can get legal aid’." +msgstr "I ddod o hyd i’r wefan hon eto, chwiliwch am ‘Gwirio a ydych yn gymwys i gael cymorth cyfreithiol’." + +msgid "How to use this website without storing cookies and browser history" +msgstr "Sut mae defnyddio'r wefan hon heb storio cwcis a hanes pori" + +msgid "" +"Use the ‘private browsing’ settings. Go to the menu on your browser, " +"click on ‘File’ and turn on:" +msgstr "Defnyddiwch y gosodiadau ‘pori’n breifat’. Ewch i’r ddewislen ar eich porwr, cliciwch ‘Ffeil’ a rhoi’r canlynol ar waith:" + +msgid "Incognito on Google Chrome" +msgstr "Incognito ar Google Chrome" + +msgid "Private Window on Safari" +msgstr "Private Window ar Safari" + +msgid "InPrivate on Internet Explorer" +msgstr "InPrivate ar Internet Explorer" + +msgid "Private Browsing on Mozilla Firefox" +msgstr "Private Browsing ar Mozilla Firefox" + +msgid "On Samsung internet, you need to turn on" +msgstr "Ar Samsung Internet, mae angen i chi roi" + +msgid "Secret mode." +msgstr "Secret mode ar waith." + +msgid "Get help to stay safe online" +msgstr "Cael help i gadw’n ddiogel ar-lein" + +msgid "" +"There are other ways someone can track you online, for example by using " +"spying or tracking programmes. See the Refuge website" +msgstr "Mae ffyrdd eraill y gall rhywun eich tracio ar-lein, er enghraifft drwy ddefnyddio rhaglenni tracio neu ysbïo. Ewch i’r dudalen" + +msgid "Secure your tech." +msgstr "Secure your tech ar wefan Refuge." + msgid "Privacy notice" msgstr "Welsh Privacy notice" diff --git a/app/translations/en/LC_MESSAGES/messages.pot b/app/translations/en/LC_MESSAGES/messages.pot index bc4bc046b..3f0d8af67 100644 --- a/app/translations/en/LC_MESSAGES/messages.pot +++ b/app/translations/en/LC_MESSAGES/messages.pot @@ -2153,6 +2153,134 @@ msgstr "" msgid "Exit service" msgstr "" +msgid "Stay safe when you use this website" +msgstr "" + +msgid "" +"If you need to hide what you’re doing on this website, or protect " +"yourself from someone, it can be safer not to use your home computer or " +"your own mobile phone." +msgstr "" + +msgid "" +"For example, use a computer at the library, or borrow a phone from " +"someone you trust." +msgstr "" + +msgid "What this website saves to your device" +msgstr "" + +msgid "" +"When you use this website, and every time you use the internet, your " +"device saves a record of:" +msgstr "" + +msgid "" +"the pages you’ve looked at and the files you’ve downloaded - this is " +"called your ‘browsing history’" +msgstr "" + +msgid "small files called ‘cookies’" +msgstr "" + +msgid "How to delete cookies and your browsing history" +msgstr "" + +msgid "Be careful because:" +msgstr "" + +msgid "deleting cookies will also delete stored passwords for online accounts" +msgstr "" + +msgid "clearing your history could make someone more suspicious" +msgstr "" + +msgid "" +"Try to only remove information about the websites you want to keep " +"private." +msgstr "" + +msgid "Find out how to do that on:" +msgstr "" + +msgid "Google Chrome" +msgstr "" + +msgid "Internet Explorer" +msgstr "" + +msgid "Mozilla Firefox" +msgstr "" + +msgid "Safari" +msgstr "" + +msgid "Samsung internet" +msgstr "" + +msgid "How the ‘Exit this page’ button works on this website" +msgstr "" + +msgid "" +"There is an ‘Exit this page’ button on some pages. If you click this " +"button, all the information you’ve entered will be deleted. This website " +"will close." +msgstr "" + +msgid "You’ll automatically go to the BBC Weather homepage:" +msgstr "" + +msgid "https://www.bbc.co.uk/weather/" +msgstr "" + +msgid "Cookies and browsing history will still be saved to your device." +msgstr "" + +msgid "" +"On any page where you see the ‘Exit this page’ button, pressing the " +"‘Shift’ key 3 times will work the same way." +msgstr "" + +msgid "To find this website again, search ‘Check if you can get legal aid’." +msgstr "" + +msgid "How to use this website without storing cookies and browser history" +msgstr "" + +msgid "" +"Use the ‘private browsing’ settings. Go to the menu on your browser, " +"click on ‘File’ and turn on:" +msgstr "" + +msgid "Incognito on Google Chrome" +msgstr "" + +msgid "Private Window on Safari" +msgstr "" + +msgid "InPrivate on Internet Explorer" +msgstr "" + +msgid "Private Browsing on Mozilla Firefox" +msgstr "" + +msgid "On Samsung internet, you need to turn on" +msgstr "" + +msgid "Secret mode." +msgstr "" + +msgid "Get help to stay safe online" +msgstr "" + +msgid "" +"There are other ways someone can track you online, for example by using " +"spying or tracking programmes. See the Refuge website" +msgstr "" + +msgid "Secure your tech." +msgstr "" + msgid "Privacy notice" msgstr "" diff --git a/tests/unit_tests/test_pages.py b/tests/unit_tests/test_pages.py index db122f8c9..09b23ba27 100644 --- a/tests/unit_tests/test_pages.py +++ b/tests/unit_tests/test_pages.py @@ -1,3 +1,5 @@ +from unittest.mock import patch + import pytest @@ -54,3 +56,17 @@ def test_header_link_clears_session(app, client): with client.session_transaction() as session: assert "test" not in session + + +@patch("app.main.routes.render_template") +def test_privacy_template(mock_render_template, client): + response = client.get("/privacy") + assert response.status_code == 200 + mock_render_template.assert_called_once_with("main/privacy.html") + + +@patch("app.main.routes.render_template") +def test_online_safety_template(mock_render_template, client): + response = client.get("/online-safety") + assert response.status_code == 200 + mock_render_template.assert_called_once_with("main/online-safety.html") From 5099801673e73da2219916a1f40abd80281f1f74 Mon Sep 17 00:00:00 2001 From: Ben Millar Date: Mon, 10 Mar 2025 23:16:50 +0000 Subject: [PATCH 2/2] LGA-3555: Confirmation page (#188) * Add static confirmation page * Refactor to use View * Add callback and email functionality * Update in-scope page to link to the contact page * Add category specific conditional logic * Remove duplicate list entry * Update tests for new confirmation page * Add unit tests for confirmation view * Add functional tests * Use a non-zero padded number for the day of the month * Update unit tests * Add Welsh translations * Add additional Welsh translations * Add functional test for survey link * Update tests to use a valid category code * Update tests to use a valid category code and timeslot --- app/contact/forms.py | 37 ++-- app/contact/helpers.py | 23 +++ app/contact/notify/api.py | 4 +- app/contact/urls.py | 10 +- app/contact/views.py | 44 +++- app/contact/widgets.py | 10 +- app/means_test/widgets.py | 5 +- app/static/src/scss/confirmation.scss | 27 +++ app/static/src/scss/styles.scss | 1 + app/templates/categories/in-scope.html | 7 +- app/templates/contact/confirmation.html | 174 +++++++++++++++- app/translations/cy/LC_MESSAGES/messages.mo | Bin 82962 -> 89708 bytes app/translations/cy/LC_MESSAGES/messages.po | 188 +++++++++++++++++- app/translations/en/LC_MESSAGES/messages.pot | 163 ++++++++++++++- .../discrimination/test_discrimination.py | 2 +- .../contact/test_confirmation.py | 127 ++++++++++++ .../functional_tests/contact/test_contact.py | 31 ++- tests/unit_tests/contact/test_confirmation.py | 94 +++++++++ tests/unit_tests/contact/test_contact.py | 13 +- tests/unit_tests/contact/test_notify.py | 2 +- 20 files changed, 897 insertions(+), 65 deletions(-) create mode 100644 app/contact/helpers.py create mode 100644 app/static/src/scss/confirmation.scss create mode 100644 tests/functional_tests/contact/test_confirmation.py create mode 100644 tests/unit_tests/contact/test_confirmation.py diff --git a/app/contact/forms.py b/app/contact/forms.py index 048ea6887..c256bc6cd 100644 --- a/app/contact/forms.py +++ b/app/contact/forms.py @@ -20,6 +20,7 @@ ContactRadioInput, ContactCheckboxInput, ContactSelectField, + ContactTextInput, ) from wtforms.fields import SubmitField from app.categories.widgets import CategoryCheckboxInput @@ -560,26 +561,6 @@ def get_callback_time(self) -> datetime | None: return None - @staticmethod - def format_callback_time( - start_time: datetime, callback_duration: timedelta = timedelta(minutes=30) - ) -> str | None: - """Helper function to format the callback time string. - - Returns: - str | None: formatted callback time string in the form of "Friday, 3 January at 09:00 - 09:30" - """ - if not start_time or not isinstance(start_time, datetime): - return None - end_time = start_time + callback_duration - - formatted_start_date = start_time.strftime( - "%A, %d %B at %H:%M" - ) # E.g. Monday, 1 January at 09:00 - formatted_end_time = end_time.strftime("%H:%M") # E.g. 09:30 - - return f"{formatted_start_date} - {formatted_end_time}" - def get_payload(self) -> dict: """Returns the contact payload.""" @@ -635,3 +616,19 @@ def get_payload(self) -> dict: payload["requires_action_at"] = requires_action_at return payload + + +class ConfirmationEmailForm(FlaskForm): + email = StringField( + _("Receive this confirmation by email"), + widget=ContactTextInput( + heading_class="govuk-fieldset__legend--s", + hint_text=_("We will use this to send your reference number."), + ), + validators=[ + Length(max=255, message=_("Your address must be 255 characters or less")), + Email(message=_("Enter a valid email address")), + InputRequired(message=_("Tell us what email address to send to")), + ], + ) + submit = SubmitField(_("Send"), widget=GovSubmitInput()) diff --git a/app/contact/helpers.py b/app/contact/helpers.py new file mode 100644 index 000000000..abd0513a2 --- /dev/null +++ b/app/contact/helpers.py @@ -0,0 +1,23 @@ +from datetime import datetime, timedelta +from app.contact import bp + + +@bp.app_template_filter("format_callback_time") +def format_callback_time( + start_time: datetime, callback_duration: timedelta = timedelta(minutes=30) +) -> str | None: + """Helper function to format the callback time string. + + Returns: + str | None: formatted callback time string in the form of "Friday, 3 January at 09:00 - 09:30" + """ + if not start_time or not isinstance(start_time, datetime): + return None + end_time = start_time + callback_duration + + formatted_start_date = start_time.strftime( + "%A, %-d %B at %H:%M" + ) # E.g. Monday, 1 January at 09:00 + formatted_end_time = end_time.strftime("%H:%M") # E.g. 09:30 + + return f"{formatted_start_date} - {formatted_end_time}" diff --git a/app/contact/notify/api.py b/app/contact/notify/api.py index c6c792176..c66db8975 100644 --- a/app/contact/notify/api.py +++ b/app/contact/notify/api.py @@ -5,7 +5,7 @@ from app import get_locale from app.contact.notify.templates import GOVUK_NOTIFY_TEMPLATES -from app.contact.forms import ContactUsForm +from app.contact.helpers import format_callback_time logger = logging.getLogger(__name__) @@ -92,7 +92,7 @@ def generate_confirmation_email_data( third_party_phone_number: str | None = None, ) -> (str, str): """Generates the data used in the sending of the confirmation Gov Notify emails.""" - formatted_callback_time = ContactUsForm.format_callback_time(callback_time) + formatted_callback_time = format_callback_time(callback_time) callback_requested = callback_time is not None template_id = "" diff --git a/app/contact/urls.py b/app/contact/urls.py index a661dfab2..7e54c02b3 100644 --- a/app/contact/urls.py +++ b/app/contact/urls.py @@ -1,8 +1,9 @@ from app.contact import bp from app.contact.address_finder.widgets import FormattedAddressLookup from app.contact.views import ContactUs, ReasonForContacting -from flask import render_template, jsonify +from flask import jsonify import logging +from app.contact.views import ConfirmationPage logger = logging.getLogger(__name__) @@ -13,11 +14,6 @@ ) -@bp.route("/confirmation", methods=["GET"]) -def confirmation(): - return render_template("contact/confirmation.html") - - @bp.route("/addresses/", methods=["GET"]) def geocode(postcode): """Lookup addresses with the specified postcode""" @@ -39,3 +35,5 @@ def geocode(postcode): "eligible", template="contact/eligible.html", attach_eligiblity_data=True ), ) + +bp.add_url_rule("/confirmation", view_func=ConfirmationPage.as_view("confirmation")) diff --git a/app/contact/views.py b/app/contact/views.py index 178b23b7f..cd0dd623d 100644 --- a/app/contact/views.py +++ b/app/contact/views.py @@ -1,5 +1,9 @@ from flask.views import View -from app.contact.forms import ContactUsForm, ReasonsForContactingForm +from app.contact.forms import ( + ContactUsForm, + ReasonsForContactingForm, + ConfirmationEmailForm, +) import logging from flask import session, render_template, request, redirect, url_for from app.api import cla_backend @@ -79,10 +83,12 @@ def dispatch_request(self): case_ref = session.get("case_reference") callback_time = session.get("callback_time") contact_type = session.get("contact_type") + category = session.get("category") session.clear() session["case_reference"] = case_ref session["callback_time"] = callback_time session["contact_type"] = contact_type + session["category"] = category return redirect(url_for("contact.confirmation")) return render_template(self.template, form=form, form_progress=form_progress) @@ -101,3 +107,39 @@ def _attach_rfc_to_case(case_ref: str, rfc_ref: str): "case": case_ref, }, ) + + +class ConfirmationPage(View): + template = "contact/confirmation.html" + methods = ["GET", "POST"] + + @classmethod + def get_context(cls): + return { + "case_reference": session.get("case_reference"), + "callback_time": session.get("callback_time"), + "contact_type": session.get("contact_type"), + "category": session.get("category", {}), + } + + def dispatch_request(self): + form = ConfirmationEmailForm() + context = self.get_context() + email_sent = False + + if form.validate_on_submit(): + notify.create_and_send_confirmation_email( + email_address=form.email.data, + case_reference=context["case_reference"], + callback_time=context["callback_time"], + contact_type=context["contact_type"], + ) + email_sent = True + + return render_template( + self.template, + form=form, + confirmation_email=form.email.data if email_sent else None, + email_sent=email_sent, + **context, + ) diff --git a/app/contact/widgets.py b/app/contact/widgets.py index 22098bf2d..40e3bc5fc 100644 --- a/app/contact/widgets.py +++ b/app/contact/widgets.py @@ -1,4 +1,8 @@ -from govuk_frontend_wtf.wtforms_widgets import GovRadioInput, GovCheckboxesInput +from govuk_frontend_wtf.wtforms_widgets import ( + GovRadioInput, + GovCheckboxesInput, + GovTextInput, +) from app.means_test.widgets import MeansTestInputField from wtforms import SelectField @@ -15,3 +19,7 @@ class ContactSelectField(SelectField): def pre_validate(self, form): """Override to prevent WTForms' internal choice validation""" pass + + +class ContactTextInput(MeansTestInputField, GovTextInput): + pass diff --git a/app/means_test/widgets.py b/app/means_test/widgets.py index b5b3492a1..fbee425c0 100644 --- a/app/means_test/widgets.py +++ b/app/means_test/widgets.py @@ -45,7 +45,10 @@ def map_gov_params(self, field, **kwargs): item["checked"] = True label_class = self.heading_class - params["fieldset"]["legend"]["classes"] = label_class + if "fieldset" in params: + params["fieldset"]["legend"]["classes"] = label_class + else: + params["label"]["classes"] = label_class return params diff --git a/app/static/src/scss/confirmation.scss b/app/static/src/scss/confirmation.scss new file mode 100644 index 000000000..88d4748a2 --- /dev/null +++ b/app/static/src/scss/confirmation.scss @@ -0,0 +1,27 @@ +.confirmation-inset { + background: govuk-colour("white"); + color: $govuk-text-colour; + padding: 20px; + margin: 20px 0 0; +} + +@media print { + .confirmation-actions, + .confirmation-email-form { + display: none; + } +} + +.confirmation-button-link { + cursor: pointer; + background: none; + border: none; + color: govuk-colour("white"); + text-decoration: underline; + &:hover{ + color: govuk-colour("light-grey"); + &:focus{ + color: $govuk-text-colour; + } + } +} diff --git a/app/static/src/scss/styles.scss b/app/static/src/scss/styles.scss index 42f04f3de..549f110d9 100644 --- a/app/static/src/scss/styles.scss +++ b/app/static/src/scss/styles.scss @@ -12,3 +12,4 @@ @import "./modal-dialog"; @import "./progress_bar"; @import "./back-link"; +@import "./confirmation"; diff --git a/app/templates/categories/in-scope.html b/app/templates/categories/in-scope.html index 048beb364..296574bb0 100644 --- a/app/templates/categories/in-scope.html +++ b/app/templates/categories/in-scope.html @@ -37,7 +37,10 @@

{% trans %}What you need to check if you qualify fin

{% trans %}When you do not need to complete the financial assessment{% endtrans %}

-

{% trans %}You should contact CLA without completing the financial assessment if you are:{% endtrans %}

+ {% set contact_us_link %} + contact CLA + {% endset %} +

{% trans %}You should {{ contact_us_link }} without completing the financial assessment if you are:{% endtrans %}

  • {% trans %}under 18{% endtrans %}
    • @@ -48,7 +51,7 @@

    {% trans %}If you use British Sign Language (BSL){%

    {% trans %}You can choose not to complete the financial assessment online, and instead ask for a call with a BSL interpreter.{% endtrans %}

    -

    {% trans %}Fill in the 'Contact CLA' page. Select 'BSL' under 'Communication needs'.{% endtrans %}

    +

    {% trans %}Fill in the '{{ contact_us_link }}' page. Select 'BSL' under 'Communication needs'.{% endtrans %}

    {{ govukButton(params={ "text": _("Check if you qualify financially"), diff --git a/app/templates/contact/confirmation.html b/app/templates/contact/confirmation.html index 419ff5859..5c5dee7da 100644 --- a/app/templates/contact/confirmation.html +++ b/app/templates/contact/confirmation.html @@ -1,16 +1,170 @@ {% extends "base.html" %} -{%- from 'components/back_link.html' import govukBackLink -%} -{%- from 'categories/components/list-item.html' import list_item, list_item_small -%} -{% block beforeContent%} -{{ super() }} -{{ govukBackLink() }} -{% endblock %} +{%- from 'govuk_frontend_jinja/components/panel/macro.html' import govukPanel %} +{%- from 'govuk_frontend_jinja/components/button/macro.html' import govukButton %} +{%- from 'govuk_frontend_jinja/components/warning-text/macro.html' import govukWarningText %} + +{% block pageTitle %}Confirmation - {{ super() }}{% endblock %} + +{% set panelHtml %} + Your reference number is +
    + {{ case_reference }} + {% if not callback_time %} +

    + {{ _('You can now call CLA on') }} 0345 345 4 345.
    + {% trans %}Please quote your reference number when you call. Find out about + call charges.{% endtrans %} +

    + {% endif %} +
    + + +
    +{% endset %} + {% block content %} -
    -
    -

    Confirmation Page

    +
    +
    + {% set panelTitle = _('We will call you back') if callback_time else _("Your details have been submitted") %} + + {{ govukPanel({ + "titleText":panelTitle, + "html": panelHtml + }) }} + + {% if confirmation_email and not form.errors %} +

    + {{ _('Your reference number was sent to') }} + {{ confirmation_email }}. +

    + {% else %} +
    + {{ form.csrf_token }} + {{ form.email }} + {{ form.submit }} +
    + {% endif %} + + {% if category.code in ['debt', 'housing'] %} + {{ govukWarningText({ + "text": _("If you have a court hearing date it is important that you get advice as soon as possible. You may be able to get last-minute help on the day of the hearing from an adviser in the court building.") + }) }} + {% endif %} + +

    {% trans %}What happens next?{% endtrans %}

    + + {% if callback_time %} +

    + {% if contact_type == "thirdparty" %} + {% trans %}Your details have been submitted and an operator will call + the person you nominated at least once during your chosen time, or as close to the time as possible{% endtrans %} + {% else %} + {% trans %}Your details have been submitted and an operator will call + you at least once during your chosen time, or as close to the time as possible{% endtrans %} + {% endif %} + ({{ callback_time|format_callback_time }}). + {% trans %}When a CLA operator calls, the call will come from an anonymous number.{% endtrans %} +

    + {% endif %} + + {% if category.code == 'domestic_abuse' %} +

    + {% trans %}If you need to urgently protect yourself or your family you should try and get advice as soon as possible.{% endtrans %} +

    + {% endif %} + +
      +
    • + {% if contact_type == "thirdparty" %} + {% trans %}The first person they speak to will be an operator who will ask about your problem and your financial circumstances.{% endtrans %} + {% else %} + {% trans %}The first person you speak to will be an operator who will ask about your problem and your financial circumstances.{% endtrans %} + {% endif %} +
      • +
    • + {% if contact_type == "thirdparty" %} + {% trans %}If it looks like you might qualify for legal aid they’ll + be put through to a specialist adviser, who will make the + final decision on your case.{% endtrans %} + {% else %} + {% trans %}If it looks like you might qualify for legal aid you’ll + be put through to a specialist adviser, who will make the + final decision on your case.{% endtrans %} + {% endif %} + + {% if category.code in ['domestic_abuse','family'] %} +
        + {% if category.code == 'domestic_abuse' %} +
      • + {% trans %}Please be aware that the specialist adviser will need + evidence of the domestic violence before they can make a decision + on your case.{% endtrans %} + + {{ _('Find out what you can use as evidence') }}. +
        • + {% elif category.code == 'family' %} +
      • + {% trans %}If your case involves domestic abuse or violence, + the specialist adviser will need evidence of this + before they can make a decision on your case.{% endtrans %} + + {{ _('Find out what you can use as evidence') }}. +
        • + {% endif %} +
      + {% endif %} +
      • + {% if category.code in ['domestic_abuse', 'family'] %} +
    • + {% trans %}You will also need to provide evidence of your financial + circumstances. Your specialist adviser will explain what is + needed.{% endtrans %} +
      • + {% else %} +
    • + {% trans %}You will need to provide evidence of your financial circumstances + and maybe your problem. Your specialist adviser will explain + what is needed.{% endtrans %} +
      • + {% endif %} + +
    • {% trans %}If your specialist adviser thinks you need to speak to someone in person or have someone represent you in court, they will organise this.{% endtrans %}
      • +
    + +

    + {% trans %}If CLA can’t help you, we’ll always suggest where else you might get help.{% endtrans %} +

    +

    + {% trans %}If we can do anything to make it easier for you to communicate with us, please tell the operator.{% endtrans %} +

    +

    + {% trans privacy_link=url_for('main.privacy') %} + Protecting your personal data and your privacy is important to us. Read the full + Civil Legal Advice Privacy Statement. + {% endtrans %} +

    + + {% if callback_time %} +

    {{ _('What if I miss the operator’s call?') }}

    +

    + {% trans %}If you miss the call or you need advice urgently, you can call us on + 0345 345 4 345. Find out about + call charges.{% endtrans %} +

    + {% endif %} + + {{ govukButton({ + "text": _("Finish"), + "href": "https://www.gov.uk/done/check-if-civil-legal-advice-can-help-you", + }) }} + +
    -
    + {% endblock %} \ No newline at end of file diff --git a/app/translations/cy/LC_MESSAGES/messages.mo b/app/translations/cy/LC_MESSAGES/messages.mo index 95773f26352f788257d32cbd023bf043988f2127..2140fa6e5d25b622cb658265796dcec78e1d1a3b 100644 GIT binary patch delta 17255 zcmc)Q33wDm`uOo~2!tyf;l7)2Lzr-%ArS6x$SDv&pfl5%8JNt3ISAu|BZ7h)9t1>C zkV6p^6gNs%Sya>&Wr5X2WpM>jM3lFqy6UaB zs(OZ9v%JFJe_tVSIyGsX#(xi#)3hd7r>>NK`mb6CO*>671yk|w*au~_SjFKA_d#Z}t;ae2GL)YcWjId^ii|;VUQ+=sR2`@m)BP@?$6sDMuK^ zRFt7iLrKojn2;9F=0K9;W~_=EkWOn4VH5lt%I7LDfYO83C_T!?ΝA;1bNk>LWER zg7a_ao)|^^rQ+HoKmfbpZ*dETa3bsKG<*>yyPJ_9<8U(4ChcMT z2tUIo@h@XpHE}f`%E0e%HFg{?W36dVqeS$59EejU5dWPV+&e+d?`+~$jq*rLmk*$X zZYfHH)?!=SgO%}3l#1U)=}4tXj5D@FW~gSOG~_-cEwn$P%%U2MS4$j};6N(O$1ZpW zw!-I89()ezoc5J-eaK|>x%nvBzY}jlDM$koco6T!=W*IpwNf_DRbxLLP0rtn%wR3? z5eE#L)`~cv!XQddMw8+)b^&|=FQMeb3p1FaSm6fNdHfQ$Vc(gWHV02(eH<}MJ#aQk zhgM)4d>kbrZ{Z(!zE*KIz30RcydAsIyoPuHYvTzVfFC1m&^qR+WLkz2(g#r*@;4lW zE;oBU&O;f(r%@vNAzIkLqjKpc%#r!OkAt~fkgG340HfHARxQV!7{e}JmQ8#ZAHg)A zrtQF^$gpZrzY6)Q_#4VA2nUI-RiyIjI037miD?+X44$vu$$^2-VPialb@6+wim3tB zgJx(@9*2@-^H3u72sXo)usxnd5?o7RDs0ACNFTI|C_`ffRXvL^AuZd?L1o+{C$JQo zW3Q0fB&MKLyb4{o4>Rx_w#K@JEMnLXm*N4GWE?b4bznNyq3p%maUu4^ieVlnE$<&z zEt`Q-VH8{9MwIFGERMjBP!^KT5jD@p;GLBBBW=+}F>Z8H+mGa_)}C=AEwtNkHl9aW zPe#sHOa4Ri>23-q4sk-p_Gz)SP!>gIV{Bv_zX&Y=TI7c z0r{gfS)k6Z#a5KJp$zq*1P3zKXK^(C%W+toaid&}v+)Af#7ShJ^w2_y+;OaiU!bfb zm+)z9O9o1kzK2rps)Z_YCsAhA*C-80R9U1Jnl@OS6FpJJa41g3!zfwa;wDYY!dFmo zAeqP!O|2(3#ogEq594~gh>|1s+^jnIGSWBg9h3-MPr?xKgmxnb(xOdR37=3Gv}dpe z>cQi24CRfOjeo-= zp09PdO+7FJWtxmesnA4;%sS`%E^I;hSxm<>C?QT+rlwhcln&%zXEd=Tu0g41A2!6p zC=vSr6OyeLIFMx0m#e+NKv@swpfn_k-Ek+%15crZG=<6B1N)$y4`CmC0Oi3au@nB_ zT<^F-MQA#<iYwIz`=TV10@2xQ5tj%J7D=$>T@n^ zP5B0t1}(vKEJ3ON49XByS*`BNSWWz;rPDak5pP0y;3Fs@Jc)8+l{?hF-5sT3FSf{2hlXBAC zsv+4Zk%*!^_#SlOL2QGcp+uto8dXn!ln3UbTrWoHaN-#b(m41KrR9~2)%G|LGbk@W zsdy(!15aRA{2seu##%L&ZtO&P71qLMureOOD)<&o!uL?_@43!?UPAM85aq-cj9}e+ zR5IR<11aysX?Px`f+4Ifqi_RC!_FaVlvd|n^(}b~K0x^)oQOj=sHEP2KFViNdOmui zyiGIy3pkLT?n4Rbhd2%^-KSo?a&Zdfoj4k``_=3A7%ZZ=9S39MO=_Wzl6xe!pj?0k-ieY+dv_$%{I2k@%E}DP;X)qX ziM#PAX71FqFjm>6me@ro6|TdkSc;ACO&p7#;dmVQi291Q2HR6kdXyJdbm2Zcp5P#v zgB82g?zILxQhpTA;0crn{BDnG`8)Vq%0D1^r0so7t>xD}uBP7&C`q{zYh(GnYEP+; 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 CfZzuJ diff --git a/app/translations/cy/LC_MESSAGES/messages.po b/app/translations/cy/LC_MESSAGES/messages.po index 61fe63455..2399b1a62 100644 --- a/app/translations/cy/LC_MESSAGES/messages.po +++ b/app/translations/cy/LC_MESSAGES/messages.po @@ -865,6 +865,18 @@ msgstr "" msgid "Submit details" msgstr "Cyflwyno manylion" +msgid "Receive this confirmation by email" +msgstr "Cael copi o’r cadarnhad hwn drwy e-bost" + +msgid "Enter a valid email address" +msgstr "Rhowch gyfeiriad e-bost dilys" + +msgid "Tell us what email address to send to" +msgstr "Dywedwch wrthym pa gyfeiriad e-bost y dylem ei ddefnyddio i anfon" + +msgid "Send" +msgstr "Anfon" + msgid "There is a problem" msgstr "Mae problem" @@ -1772,12 +1784,11 @@ msgstr "" msgid "When you do not need to complete the financial assessment" msgstr "Pan nad oes angen i chi gwblhau’r asesiad ariannol" +#, python-format msgid "" -"You should contact CLA " -"without completing the financial assessment if you are:" +"You should %(contact_us_link)s without completing the financial " +"assessment if you are:" msgstr "" -"Dyma pryd ddylech gysylltu â " -"Chyngor Cyfreithiol Sifil heb gwblhau'r asesiad ariannol:" msgid "under 18" msgstr "os ydych o dan 18 oed" @@ -1799,13 +1810,11 @@ msgstr "" "Gallwch ddewis peidio â chwblhau’r asesiad ariannol ar-lein, a gofyn yn " "hytrach am alwad gyda dehonglydd BSL." +#, python-format msgid "" -"Fill in the 'Contact CLA' " -"page. Select 'BSL' under 'Communication needs'." +"Fill in the '%(contact_us_link)s' page. Select 'BSL' under 'Communication" +" needs'." msgstr "" -"Llenwch y dudalen 'Cysylltu â " -"Chyngor Cyfreithiol Sifil'. Dewiswch 'BSL' o dan 'Anghenion " -"cyfathrebu'." msgid "Check if you qualify financially" msgstr "Gwirio a ydych yn gymwys yn ariannol" @@ -2207,6 +2216,147 @@ msgstr "cael eich cam-drin yn gorfforol, yn rhywiol neu’n emosiynol" msgid "Back" msgstr "Yn ôl" +msgid "You can now call CLA on" +msgstr "Gallwch ffonio CLA yn awr ar" + +msgid "" +"Please quote your reference number when you call. Find out about\n" +" call charges." +msgstr "Dyfynnwch eich cyfeirnod pan fyddwch yn ffonio. I gael rhagor o wybodaeth am gyfraddau galwadau." + +msgid "Print this page" +msgstr "Argraffu’r dudalen hon" + +msgid "We will call you back" +msgstr "Byddwn yn eich ffonio’n ôl" + +msgid "Your details have been submitted" +msgstr "Cyflwynwyd eich manylion" + +msgid "Your reference number was sent to" +msgstr "Anfonwyd eich cyfeirnod i" + +msgid "" +"If you have a court hearing date it is important that you get advice as " +"soon as possible. You may be able to get last-minute help on the day of " +"the hearing from an adviser in the court building." +msgstr "Os oes gennych ddyddiad gwrandawiad llys, mae’n bwysig eich bod yn cael cyngor cyn gynted â phosib. Efallai y cewch gymorth ar fyr rybudd ar ddiwrnod y gwrandawiad gan gynghorydd yn adeilad y llys." + +msgid "What happens next?" +msgstr "Beth sy’n di?" + +msgid "" +"Your details have been submitted and an operator will call\n" +" the person you nominated at least once during your " +"chosen time, or as close to the time as possible" +msgstr "Mae eich manylion wedi cael eu cyflwyno a bydd gweithredwr yn eich ffonio o leiaf unwaith ar yr adeg o’ch dewis, neu mor agos at yr adeg honno ag sy’n bosibl" + +msgid "" +"Your details have been submitted and an operator will call\n" +" you at least once during your chosen time, or as " +"close to the time as possible" +msgstr "Mae eich manylion wedi cael eu cyflwyno a bydd gweithredwr yn eich ffonio o leiaf unwaith ar yr adeg o’ch dewis, neu mor agos at yr adeg honno ag sy’n bosibl" + +msgid "When a CLA operator calls, the call will come from an anonymous number." +msgstr "Pan fydd gweithredwr CLA yn eich ffonio, bydd rhif anhysbys yn ymddangos ar yr alwad." + +msgid "" +"If you need to urgently protect yourself or your family you should try " +"and get advice as soon as possible." +msgstr "Os oes arnoch angen diogelu chi’ch hun neu eich teulu ar frys, dylech geisio cael cymorth cyn gynted â phosib" + +msgid "" +"The first person they speak to will be an operator who will ask about " +"your problem and your financial circumstances." +msgstr "Yr unigolyn cyntaf fydd yn siarad â hwy fydd gweithredwr a fydd yn gofyn cwestiynau am eich problem a’ch amgylchiadau ariannol" + +msgid "" +"The first person you speak to will be an operator who will ask about your" +" problem and your financial circumstances." +msgstr "Yr unigolyn cyntaf fydd yn siarad â chi fydd gweithredwr a fydd yn gofyn cwestiynau i chi am eich problem a’ch amgylchiadau ariannol." + +msgid "" +"If it looks like you might qualify for legal aid they’ll\n" +" be put through to a specialist adviser, who will " +"make the\n" +" final decision on your case." +msgstr "Os yw’n ymddangos y gallech chi fod yn gymwys am gymorth cyfreithiol, fe’ch trosglwyddir i un o gynghorwyr arbenigol a fydd yn gwneud y penderfyniad terfynol ynghylch eich achos." + +msgid "" +"If it looks like you might qualify for legal aid you’ll\n" +" be put through to a specialist adviser, who will " +"make the\n" +" final decision on your case." +msgstr "Os yw’n ymddangos y gallech chi fod yn gymwys am gymorth cyfreithiol, fe’ch trosglwyddir i un o gynghorwyr arbenigol a fydd yn gwneud y penderfyniad terfynol ynghylch eich achos." + +msgid "" +"Please be aware that the specialist adviser will need\n" +" evidence of the domestic violence before they " +"can make a decision\n" +" on your case." +msgstr "Byddwch yn ymwybodol fod y cynghorydd arbenigol angen tystiolaeth o’r trais domestig cyn y gallant wneud penderfyniad ar eich achos." + +msgid "Find out what you can use as evidence" +msgstr "Canfod beth allwch ei ddefnyddio fel tystiolaeth" + +msgid "" +"If your case involves domestic abuse or violence,\n" +" the specialist adviser will need evidence of " +"this\n" +" before they can make a decision on your case." +msgstr "Os yw eich cais yn ymwneud â cham-drin neu drais domestig, bydd y cynghorydd arbenigol angen tystiolaeth o hyn cyn gwneud penderfyniad ynghylch eich achos." + +msgid "" +"You will also need to provide evidence of your financial\n" +" circumstances. Your specialist adviser will explain " +"what is\n" +" needed." +msgstr "Bydd angen i chi ddarparu tystiolaeth o’ch amgylchiadau ariannol hefyd. Bydd eich cynghorydd arbenigol yn egluro beth sydd ei angen." + +msgid "" +"You will need to provide evidence of your financial circumstances\n" +" and maybe your problem. Your specialist adviser will " +"explain\n" +" what is needed." +msgstr "Bydd angen i chi ddarparu tystiolaeth o’ch amgylchiadau ariannol ac efallai eich problem. Bydd eich cynghorydd arbenigol yn esbonio beth fyddwch ei angen." + +msgid "" +"If your specialist adviser thinks you need to speak to someone in person " +"or have someone represent you in court, they will organise this." +msgstr "Os bydd eich cynghorydd arbenigol yn penderfynu bod angen i chi siarad â rhywun eich hun neu os bydd arnoch angen rhywun i’ch cynrychioli yn y llys, fe fydd yn trefnu hyn." + +msgid "If CLA can’t help you, we’ll always suggest where else you might get help." +msgstr "Os nad yw CLA yn gallu eich helpu, byddwn ni bob amser yn awgrymu rhywle arall allai’ch helpu." + +msgid "" +"If we can do anything to make it easier for you to communicate with us, " +"please tell the operator." +msgstr "Os gallwn wneud unrhyw beth i’w gwneud hi’n haws i chi gyfathrebu gyda ni, dywedwch wrth y gweithredwr." + +#, python-format +msgid "" +"\n" +" Protecting your personal data and your privacy is " +"important to us. Read the full\n" +" Civil" +" Legal Advice Privacy Statement.\n" +" " +msgstr "Mae diogelu’ch data personol a phreifatrwydd yn bwysig i ni. Darllennwch y Datganiad Preifatrwydd Cyngor Cyfreithiol yn llawn." + +msgid "What if I miss the operator’s call?" +msgstr "Beth fydd yn digwydd os byddaf yn methu galwad y gweithredwr?" + +msgid "" +"If you miss the call or you need advice urgently, you can call us on\n" +" 0345 345 4 345. Find out about\n" +" call charges." +msgstr "Os byddwch yn methu’r alwad neu angen cyngor ar frys, gallwch ein ffonio ar 0345 345 4 345. Mae gwybodaeth am gostau’r galwadau i’w cael yma." + +msgid "Finish" +msgstr "Gorffen" + msgid "" "We’ll give you the Civil Legal Advice phone number when you submit your " "details." @@ -2767,3 +2917,23 @@ msgstr "Offerynnau cerddorol, oni bai’ch bod yn gerddor proffesiynol" #~ msgid "Enter your email address" #~ msgstr "Rhowch eich cyfeiriad e-bost" +#~ msgid "" +#~ "You should contact CLA without completing" +#~ " the financial assessment if you are:" +#~ msgstr "" +#~ "Dyma pryd ddylech gysylltu â Chyngor " +#~ "Cyfreithiol Sifil heb gwblhau'r asesiad" +#~ " ariannol:" + +#~ msgid "" +#~ "Fill in the 'Contact CLA' page. Select " +#~ "'BSL' under 'Communication needs'." +#~ msgstr "" +#~ "Llenwch y dudalen 'Cysylltu â Chyngor " +#~ "Cyfreithiol Sifil'. Dewiswch 'BSL' o " +#~ "dan 'Anghenion cyfathrebu'." + diff --git a/app/translations/en/LC_MESSAGES/messages.pot b/app/translations/en/LC_MESSAGES/messages.pot index 3f0d8af67..777038e1a 100644 --- a/app/translations/en/LC_MESSAGES/messages.pot +++ b/app/translations/en/LC_MESSAGES/messages.pot @@ -763,6 +763,18 @@ msgstr "" msgid "Submit details" msgstr "" +msgid "Receive this confirmation by email" +msgstr "" + +msgid "Enter a valid email address" +msgstr "" + +msgid "Tell us what email address to send to" +msgstr "" + +msgid "Send" +msgstr "" + msgid "There is a problem" msgstr "" @@ -1561,9 +1573,10 @@ msgstr "" msgid "When you do not need to complete the financial assessment" msgstr "" +#, python-format msgid "" -"You should contact CLA " -"without completing the financial assessment if you are:" +"You should %(contact_us_link)s without completing the financial " +"assessment if you are:" msgstr "" msgid "under 18" @@ -1582,9 +1595,10 @@ msgid "" "instead ask for a call with a BSL interpreter." msgstr "" +#, python-format msgid "" -"Fill in the 'Contact CLA' " -"page. Select 'BSL' under 'Communication needs'." +"Fill in the '%(contact_us_link)s' page. Select 'BSL' under 'Communication" +" needs'." msgstr "" msgid "Check if you qualify financially" @@ -1934,6 +1948,147 @@ msgstr "" msgid "Back" msgstr "" +msgid "You can now call CLA on" +msgstr "" + +msgid "" +"Please quote your reference number when you call. Find out about\n" +" call charges." +msgstr "" + +msgid "Print this page" +msgstr "" + +msgid "We will call you back" +msgstr "" + +msgid "Your details have been submitted" +msgstr "" + +msgid "Your reference number was sent to" +msgstr "" + +msgid "" +"If you have a court hearing date it is important that you get advice as " +"soon as possible. You may be able to get last-minute help on the day of " +"the hearing from an adviser in the court building." +msgstr "" + +msgid "What happens next?" +msgstr "" + +msgid "" +"Your details have been submitted and an operator will call\n" +" the person you nominated at least once during your " +"chosen time, or as close to the time as possible" +msgstr "" + +msgid "" +"Your details have been submitted and an operator will call\n" +" you at least once during your chosen time, or as " +"close to the time as possible" +msgstr "" + +msgid "When a CLA operator calls, the call will come from an anonymous number." +msgstr "" + +msgid "" +"If you need to urgently protect yourself or your family you should try " +"and get advice as soon as possible." +msgstr "" + +msgid "" +"The first person they speak to will be an operator who will ask about " +"your problem and your financial circumstances." +msgstr "" + +msgid "" +"The first person you speak to will be an operator who will ask about your" +" problem and your financial circumstances." +msgstr "" + +msgid "" +"If it looks like you might qualify for legal aid they’ll\n" +" be put through to a specialist adviser, who will " +"make the\n" +" final decision on your case." +msgstr "" + +msgid "" +"If it looks like you might qualify for legal aid you’ll\n" +" be put through to a specialist adviser, who will " +"make the\n" +" final decision on your case." +msgstr "" + +msgid "" +"Please be aware that the specialist adviser will need\n" +" evidence of the domestic violence before they " +"can make a decision\n" +" on your case." +msgstr "" + +msgid "Find out what you can use as evidence" +msgstr "" + +msgid "" +"If your case involves domestic abuse or violence,\n" +" the specialist adviser will need evidence of " +"this\n" +" before they can make a decision on your case." +msgstr "" + +msgid "" +"You will also need to provide evidence of your financial\n" +" circumstances. Your specialist adviser will explain " +"what is\n" +" needed." +msgstr "" + +msgid "" +"You will need to provide evidence of your financial circumstances\n" +" and maybe your problem. Your specialist adviser will " +"explain\n" +" what is needed." +msgstr "" + +msgid "" +"If your specialist adviser thinks you need to speak to someone in person " +"or have someone represent you in court, they will organise this." +msgstr "" + +msgid "If CLA can’t help you, we’ll always suggest where else you might get help." +msgstr "" + +msgid "" +"If we can do anything to make it easier for you to communicate with us, " +"please tell the operator." +msgstr "" + +#, python-format +msgid "" +"\n" +" Protecting your personal data and your privacy is " +"important to us. Read the full\n" +" Civil" +" Legal Advice Privacy Statement.\n" +" " +msgstr "" + +msgid "What if I miss the operator’s call?" +msgstr "" + +msgid "" +"If you miss the call or you need advice urgently, you can call us on\n" +" 0345 345 4 345. Find out about\n" +" call charges." +msgstr "" + +msgid "Finish" +msgstr "" + msgid "" "We’ll give you the Civil Legal Advice phone number when you submit your " "details." diff --git a/tests/functional_tests/categories/discrimination/test_discrimination.py b/tests/functional_tests/categories/discrimination/test_discrimination.py index 53e022eb1..0d99c28bb 100644 --- a/tests/functional_tests/categories/discrimination/test_discrimination.py +++ b/tests/functional_tests/categories/discrimination/test_discrimination.py @@ -114,7 +114,7 @@ def test_are_you_under_18_form_yes(self, page: Page): ).to_be_visible() @pytest.mark.usefixtures("live_server") - def test_are_you_over_18_form_no(self, page: Page): + def test_are_you_under_18_form_no(self, page: Page): self.navigate_to_form(page) page.get_by_label("No").check() page.get_by_role("button", name="Continue").click() diff --git a/tests/functional_tests/contact/test_confirmation.py b/tests/functional_tests/contact/test_confirmation.py new file mode 100644 index 000000000..3227c5741 --- /dev/null +++ b/tests/functional_tests/contact/test_confirmation.py @@ -0,0 +1,127 @@ +import pytest +from playwright.sync_api import Page, expect + + +@pytest.mark.usefixtures("live_server") +def test_confirmation_page_email(page: Page): + page.get_by_role("link", name="Contact us").click() + + page.get_by_role("button", name="Continue to contact CLA").click() + + expect( + page.get_by_role("heading", name="Contact Civil Legal Advice") + ).to_be_visible() + + page.get_by_role("textbox", name="Your full name").fill("Test") + + page.get_by_role("radio", name="I will call you").check() + + page.get_by_role("button", name="Submit details").click() + + expect( + page.get_by_role("heading", name="Your details have been submitted") + ).to_be_visible() + + # This email address is provided by GOV.UK Notify for testing purposes + page.get_by_role("textbox", name="Receive this confirmation by").fill( + "simulate-delivered@notifications.service.gov.uk" + ) + + page.get_by_role("button", name="Send").click() + + expect( + page.get_by_text( + "Your reference number was sent to simulate-delivered@notifications.service.gov.uk." + ) + ).to_be_visible() + + +@pytest.mark.usefixtures("live_server") +def test_family_category(page: Page): + page.get_by_role("link", name="Children, families,").click() + page.get_by_role("link", name="Children and social services").click() + page.get_by_role("textbox", name="Your full name").fill("John Doe") + page.get_by_role("radio", name="I will call you").check() + page.get_by_role("button", name="Submit details").click() + expect( + page.get_by_text( + "If your case involves domestic abuse or violence, the specialist adviser will need evidence of this" + ) + ).to_be_visible() + + +@pytest.mark.usefixtures("live_server") +def test_domestic_abuse_category(page: Page): + page.get_by_role("link", name="Domestic abuse").click() + page.get_by_role("link", name="Help to keep yourself safe").click() + page.get_by_role("radio", name="Yes").check() + page.get_by_role("button", name="Continue").click() + page.get_by_role("textbox", name="Your full name").fill("John Doe") + page.get_by_role("radio", name="I will call you").check() + page.get_by_role("button", name="Submit details").click() + expect( + page.get_by_text( + "Please be aware that the specialist adviser will need evidence of the domestic violence" + ) + ).to_be_visible() + + +@pytest.mark.usefixtures("live_server") +def test_housing_category(page: Page): + page.get_by_role("link", name="Housing, homelessness, losing").click() + page.get_by_role("link", name="Homelessness").click() + page.get_by_role("paragraph").filter( + has_text="Fill in the ' contact CLA '" + ).get_by_role("link").click() + page.get_by_role("textbox", name="Your full name").fill("John Doe") + page.get_by_role("radio", name="I will call you").check() + page.get_by_role("button", name="Submit details").click() + expect( + page.get_by_text( + "Warning If you have a court hearing date it is important that you get advice as soon as possible." + ) + ).to_be_visible() + + +@pytest.mark.usefixtures("live_server") +def test_thirdparty_callback(page: Page): + page.get_by_role("link", name="Contact us").click() + page.get_by_role("button", name="Continue to contact CLA").click() + page.get_by_role("textbox", name="Your full name").fill("John Doe") + page.get_by_role("radio", name="Call someone else instead of").check() + page.get_by_role("textbox", name="Full name of the person to").fill("Jane Doe") + page.get_by_label("Relationship to you").select_option("family_friend") + page.get_by_role("textbox", name="Phone number").fill("12345") + page.get_by_role("radio", name="Call on another day").check() + page.get_by_role("group", name="Select a time for us to call").get_by_label( + "Day", exact=True + ).select_option(index=1) + page.get_by_role("group", name="Select a time for us to call").get_by_label( + "Time" + ).select_option(index=1) + page.get_by_role("button", name="Submit details").click() + expect( + page.get_by_text( + "Your details have been submitted and an operator will call the person you nominated at least once during your chosen time, or as close to the time as possible" + ) + ).to_be_visible() + expect( + page.get_by_text("The first person they speak to will be an operator") + ).to_be_visible() + expect( + page.get_by_text( + "If it looks like you might qualify for legal aid they’ll be put through to a specialist adviser, who will make the final decision on your case." + ) + ).to_be_visible() + + +@pytest.mark.usefixtures("live_server") +def test_survey_link(page: Page): + page.get_by_role("link", name="Contact us").click() + page.get_by_role("button", name="Continue to contact CLA").click() + page.get_by_role("textbox", name="Your full name").fill("John Doe") + page.get_by_role("radio", name="I will call you").check() + page.get_by_role("button", name="Submit details").click() + expect(page.get_by_role("button", name="Finish")).to_have_attribute( + "href", value="https://www.gov.uk/done/check-if-civil-legal-advice-can-help-you" + ) diff --git a/tests/functional_tests/contact/test_contact.py b/tests/functional_tests/contact/test_contact.py index 82edb9752..d4a2631d5 100644 --- a/tests/functional_tests/contact/test_contact.py +++ b/tests/functional_tests/contact/test_contact.py @@ -184,4 +184,33 @@ def test_contact_page_routing(page: Page, contact_answers: dict): page.get_by_role("button", name="Submit details").click() - expect(page.get_by_role("heading", name="Confirmation Page")).to_be_visible() + expected_heading = ( + "We will call you back" + if "Call me back" in contact_answers["Select a contact option"] + else "Your details have been submitted" + ) + expect(page.get_by_role("heading", name=expected_heading)).to_be_visible() + + if "I will call you" in contact_answers["Select a contact option"]: + expect( + page.get_by_text("You can now call CLA on 0345 345 4 345.") + ).to_be_visible() + expect( + page.get_by_text( + "Your details have been submitted and an operator will call you at least once during your chosen time" + ) + ).not_to_be_visible() + if "Call me back" in contact_answers["Select a contact option"]: + expect( + page.get_by_text("You can now call CLA on 0345 345 4 345.") + ).not_to_be_visible() + expect( + page.get_by_text( + "Your details have been submitted and an operator will call you at least once during your chosen time" + ) + ).to_be_visible() + expect( + page.get_by_text( + "When a CLA operator calls, the call will come from an anonymous number." + ) + ).to_be_visible() diff --git a/tests/unit_tests/contact/test_confirmation.py b/tests/unit_tests/contact/test_confirmation.py new file mode 100644 index 000000000..158195a68 --- /dev/null +++ b/tests/unit_tests/contact/test_confirmation.py @@ -0,0 +1,94 @@ +import pytest +from unittest.mock import patch, ANY +from datetime import datetime, timezone +from app.contact.views import ConfirmationPage + + +class TestConfirmationPage: + session_data = { + "case_reference": "AB-1234-5678", + "callback_time": datetime(2025, 3, 10, 10, 30, 0, tzinfo=timezone.utc), + "contact_type": "callback", + "category": {"code": "asylum_and_immigration"}, + } + + @pytest.fixture + def mock_notify(self): + with patch("app.contact.views.notify") as mock_notify: + yield mock_notify + + def test_get_context(self, client): + with client.session_transaction() as session: + session.update(self.session_data) + + with client.application.test_request_context(): + with patch("app.contact.views.session", dict(session)): + context = ConfirmationPage.get_context() + + assert context["case_reference"] == "AB-1234-5678" + assert context["callback_time"] == datetime( + 2025, 3, 10, 10, 30, 0, tzinfo=timezone.utc + ) + assert context["contact_type"] == "callback" + assert context["category"] == {"code": "asylum_and_immigration"} + + def test_get_confirmation_page(self, client): + with client.session_transaction() as session: + session.update(self.session_data) + + with patch("app.contact.views.render_template") as mock_render: + mock_render.return_value = "Rendered Template" + + client.get("/confirmation") + + mock_render.assert_called_once_with( + "contact/confirmation.html", + form=ANY, + case_reference="AB-1234-5678", + callback_time=datetime(2025, 3, 10, 10, 30, 0, tzinfo=timezone.utc), + contact_type="callback", + category={"code": "asylum_and_immigration"}, + confirmation_email=None, + email_sent=False, + ) + + def test_post_confirmation_page_valid_form(self, client, mock_notify): + with client.session_transaction() as session: + session.update(self.session_data) + + test_email = "test@example.com" + + with patch("app.contact.views.render_template") as mock_render: + mock_render.return_value = "Rendered Template" + + client.post( + "/confirmation", data={"email": test_email}, follow_redirects=True + ) + + mock_notify.create_and_send_confirmation_email.assert_called_once_with( + email_address=test_email, + case_reference="AB-1234-5678", + callback_time=datetime(2025, 3, 10, 10, 30, 0, tzinfo=timezone.utc), + contact_type="callback", + ) + + mock_render.assert_called_once_with( + "contact/confirmation.html", + form=ANY, + case_reference="AB-1234-5678", + callback_time=datetime(2025, 3, 10, 10, 30, 0, tzinfo=timezone.utc), + contact_type="callback", + category=ANY, + confirmation_email=test_email, + email_sent=True, + ) + + def test_post_confirmation_page_invalid_form(self, client, mock_notify): + with client.session_transaction() as session: + session.update(self.session_data) + + client.post( + "/confirmation", data={"email": "invalid-email"}, follow_redirects=True + ) + + mock_notify.create_and_send_confirmation_email.assert_not_called() diff --git a/tests/unit_tests/contact/test_contact.py b/tests/unit_tests/contact/test_contact.py index a84d4edcf..9770e0b09 100644 --- a/tests/unit_tests/contact/test_contact.py +++ b/tests/unit_tests/contact/test_contact.py @@ -4,6 +4,7 @@ from wtforms.fields.choices import SelectField from app.api import cla_backend, BackendAPIClient from app.contact.forms import ReasonsForContactingForm, ContactUsForm +from app.contact.helpers import format_callback_time import requests from datetime import datetime from app.contact.address_finder.widgets import AddressLookup, FormattedAddressLookup @@ -421,22 +422,22 @@ def test_get_callback_time_invalid_selection(self, app, client): @patch("app.contact.forms.cla_backend") def test_format_callback_time_none_input(self, app, client): - result = ContactUsForm.format_callback_time(None) + result = format_callback_time(None) assert result is None @patch("app.contact.forms.cla_backend") def test_format_callback_time_invalid_input(self, app, client): - result = ContactUsForm.format_callback_time("not a datetime") + result = format_callback_time("not a datetime") assert result is None @patch("app.contact.forms.cla_backend") def test_format_callback_time_valid(self, app, client): test_time = datetime(2024, 1, 1, 9, 0) - result = ContactUsForm.format_callback_time(test_time) - assert result == "Monday, 01 January at 09:00 - 09:30" + result = format_callback_time(test_time) + assert result == "Monday, 1 January at 09:00 - 09:30" @patch("app.contact.forms.cla_backend") def test_format_callback_time_with_midnight_crossing(self, app, client): test_time = datetime(2024, 1, 1, 23, 45) - result = ContactUsForm.format_callback_time(test_time) - assert result == "Monday, 01 January at 23:45 - 00:15" + result = format_callback_time(test_time) + assert result == "Monday, 1 January at 23:45 - 00:15" diff --git a/tests/unit_tests/contact/test_notify.py b/tests/unit_tests/contact/test_notify.py index a7c22cfe3..33897bee6 100644 --- a/tests/unit_tests/contact/test_notify.py +++ b/tests/unit_tests/contact/test_notify.py @@ -266,7 +266,7 @@ def test_generate_confirmation_email_data( with ( patch("app.contact.notify.api.get_locale") as mock_get_locale, patch( - "app.contact.forms.ContactUsForm.format_callback_time", + "app.contact.notify.api.format_callback_time", return_value="formatted-time", ), patch(