ONSdigital · kacperpONS · Aug 14, 2024 · Aug 5, 2024 · Aug 5, 2024 · Aug 5, 2024
diff --git a/config.py b/config.py
@@ -12,6 +12,7 @@ class BaseConfig:
 
     SECRET_KEY = os.getenv("SECRET_KEY")
     SESSION_COOKIE_SECURE = bool(strtobool(os.getenv('SESSION_COOKIE_SECURE', 'True')))
+    GOOGLE_TAG_ID = os.getenv("GOOGLE_TAG_ID")
 
     # Account service url is a link back to our service that we send to eq as part of the token
     ACCOUNT_SERVICE_URL = f"{DOMAIN_URL_PROTOCOL}{DOMAIN_URL}"

diff --git a/rh_ui/templates/base.html b/rh_ui/templates/base.html
@@ -4,8 +4,28 @@
 {%- block preHeader -%}
 {%- autoescape false -%}
 
-{% set cookiesPageURL = url_for('i18n.info_pages_bp.cookies') %}
+{% set g_tag_id = config.GOOGLE_TAG_ID %}
+
+
+{% block head %}
+    {% if g_tag_id %}
+        {% set script_src_url = "https://www.googletagmanager.com/gtag/js?id=" + g_tag_id %}
+        <!-- Google tag (gtag.js) -->
+        <script async src=sript_src_url></script>
+        <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', g_tag_id);
+        </script>
+    {% endif %}
+{% endblock%}
 
+
+
+
+{% set cookiesPageURL = url_for('i18n.info_pages_bp.cookies') %}
 {%- from 'components/cookies-banner/_macro.njk' import onsCookiesBanner -%}
 {{ onsCookiesBanner({
         'lang': g.lang_code,

diff --git a/rh_ui/templates/error_pages/404.html b/rh_ui/templates/error_pages/404.html
@@ -4,15 +4,21 @@
 
 {%- block main -%}
 
-<h1>{{ _('Page not found') }}</h1>
+        <h1
+        data-ga= "error", 
+        data-ga-category= "server-error", 
+        data-ga-label= "404_page_not_pound" 
+        >
+        {{ _('Page not found') }}
+        </h1>
 
-<p>{{ _('If you entered a web address, check it is correct.') }}</p>
-<p>{{ _('If you pasted the web address, check you copied the whole address.') }}</p>
+        <p>{{ _('If you entered a web address, check it is correct.') }}</p>
+        <p>{{ _('If you pasted the web address, check you copied the whole address.') }}</p>
 
-{%- autoescape false -%}
-{% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
-<p>{{ _('If the web address is correct or you selected a link or button, %(open)scontact us%(close)s for more help.', open='<a href="%s">'
-        % contact_us_link, close='</a>')|safe }}</p>
-{%- endautoescape -%}
+        {%- autoescape false -%}
+                {% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
+                <p>{{ _('If the web address is correct or you selected a link or button, %(open)scontact us%(close)s for more help.', open='<a href="%s">'
+                        % contact_us_link, close='</a>')|safe }}</p>
+        {%- endautoescape -%}
 
 {%- endblock -%}
diff --git a/rh_ui/templates/error_pages/error.html b/rh_ui/templates/error_pages/error.html
@@ -3,16 +3,21 @@
 {% set page_title_value = _('ONS Surveys') %}
 
 {%- block main -%}
+
+    <h1
+    data-ga= "error", 
+    data-ga-category= "server-error", 
+    data-ga-label= "500_internal_server_error" 
+    >
+        {{ _('Sorry, something went wrong') }}
+    </h1>
 
-<h1 data-ga="error" data-ga-category="error" data-ga-action="error-message-shown" data-ga-label="system-error">
-    {{ _('Sorry, something went wrong') }}
-</h1>
+    <p>{{ _('We are experiencing some technical problems.') }}</p>
 
-<p>{{ _('We are experiencing some technical problems.') }}</p>
-
-{%- autoescape false -%}
-{% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
-<p>{{ _('Please try again later, or %(open)scontact us%(close)s if the problem continues.', open='<a href="%s">' % contact_us_link, close='</a>')|safe }}</p>
-{%- endautoescape -%}
+    {%- autoescape false -%}
+        {% set contact_us_link = _('https://www.ons.gov.uk/aboutus/contactus/surveyenquiries') %}
+        <p>{{ _('Please try again later, or %(open)scontact us%(close)s if the problem continues.',
+         open='<a href="%s">' % contact_us_link, close='</a>')|safe }}</p>
+    {%- endautoescape -%}
 
 {%- endblock main -%}
diff --git a/rh_ui/templates/partials/messages.html b/rh_ui/templates/partials/messages.html
diff --git a/rh_ui/templates/partials/uac_error_message_list.html b/rh_ui/templates/partials/uac_error_message_list.html
@@ -0,0 +1,30 @@
+{%- from './components/panel/_macro.njk' import onsPanel -%}
+{%- from './components/list/_macro.njk' import onsList -%}
+
+{% if error_uac %}
+    {%
+    call onsPanel({
+        'title': _('There is a problem with this page'),
+        'variant': 'error'
+    })
+    %}
+
+    {{
+    onsList({
+        'element': 'ol',
+        'itemsList': [ 
+            {
+                'text': error_uac['text'],
+                'url': '#' + error_uac['id'],
+                'variants': 'inPageLink'
+            }
+        ]
+    })
+    }}
+
+    {% endcall %}
+{% endif %}
+
+
+
+
diff --git a/rh_ui/templates/start.html b/rh_ui/templates/start.html
@@ -4,72 +4,96 @@
 {% from "components/button/_macro.njk" import onsButton %}
 {% from "components/details/_macro.njk" import onsDetails %}
 
-{# display uac error msg if exists #}
+{%- set error_uac = None -%}
+{%- set page_title_value = _('Start study - ONS Surveys') -%}
 
 {% set flashed_messages = get_flashed_messages() %}
 
-{%- if 'uac_empty' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_empty', 'text': _('Enter an access code'), 'field': 'uac_empty','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-{%- elif 'uac_invalid_length' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_invalid_length', 'text': _('Enter a 16-character access code'), 'field': 'uac_invalid_length','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-{%- elif 'uac_invalid' in flashed_messages -%}
-    {%- set error_uac = {'id': 'uac_invalid', 'text': _('Access code not recognised. Enter the code again.'), 'field': 'uac_invalid','group': 'ERROR'} -%}
-    {%- set page_title_value = _('Error: Start study - ONS Surveys') -%}
-
-{%- else -%}
-    {%- set error_uac = None -%}
-    {%- set page_title_value = _('Start study - ONS Surveys') -%}
-{%- endif -%}
+{% if flashed_messages %}
+    {% set page_title_value = _('Error: Start study - ONS Surveys') %}
+
+    {% if 'uac_empty' in flashed_messages %}
+        {% set error_uac = {
+        'id': 'uac_empty',
+        'text': _('Enter an access code'),
+        'attributes': {
+            "data-ga": "error", 
+            "data-ga-category": "UAC-error", 
+            "data-ga-label": "uac_empty_error" 
+        } 
+        } %}
+    {% elif 'uac_invalid_length' in flashed_messages %}
+        {% set error_uac = {
+        'id': 'uac_invalid_length',
+        'text': _('Enter a 16-character access code'),
+        'attributes': {
+            "data-ga": "error", 
+            "data-ga-category": "UAC-error", 
+            "data-ga-label": "uac_invalid_length_error" 
+        } 
+        } %}
+    {% elif 'uac_invalid' in flashed_messages %}
+        {% set error_uac = {
+        'id': 'uac_invalid', 
+        'text': _('Access code not recognised. Enter the code again.'),
+        'attributes': {
+            "data-ga": "error", 
+            "data-ga-category": "UAC-error", 
+            "data-ga-label": "uac_invalid_error" 
+        } 
+        } %}
+    {% endif %}
+
+{% endif %}}
+
+
 
 {% block main %}
-  <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
-{% if error_uac %}
-    {% include 'partials/messages.html' with context %}
-{% endif %}
-<h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
+    {% include 'partials/uac_error_message_list.html' with context %}
 
+    <h1 class="ons-u-fs-xxl ons-u-mt-l">{{ _('Start study') }}</h1>
 
-{{ onsAccessCode({
-        "id": "uac",
-        "name": "uac",
-
-        "label": {
-            "text": _("Enter your 16-character access code"),
-            "description": _('Keep this code safe. You will need to enter it every time you access your study')
-        },
+    <form method="POST" action={{  url_for('i18n.start_bp.start_post')}}>
+    {{ onsAccessCode({
+            "id": "uac",
+            "name": "uac",
+
+            "label": {
+                "text": _("Enter your 16-character access code"),
+                "description": _('Keep this code safe. You will need to enter it every time you access your study')
+            },
 
-        "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
+            "securityMessage": _('Your personal information is protected by law and will be kept confidential.'),
 
-        "error": error_uac
+            "error": error_uac
 
     }) }}
 
-{{ onsButton({
-        'id': 'submit_uac_btn',
-        'text': _('Access study'),
-        'classes': 'ons-u-mb-xl',
-        'name': 'action[save_continue]',
-        "variants": 'loader'
+    {{ onsButton({
+            'id': 'submit_uac_btn',
+            'text': _('Access study'),
+            'classes': 'ons-u-mb-xl',
+            'name': 'action[save_continue]',
+            "variants": 'loader'
     }) }}
+    </form>
 
-<h2 class="ons-u-fs-xl ons-u-mt-l" id="find_access_code">{{ _('Where to find your access code') }}</h2>
-<p>{{ _('Your access code can be found in the invitation letter or email you received.
-        Your 16-character access code will be a combination of letters and numbers.') }}</p>
-
-{%- set further_info_content -%}
-<p>{{ _('Telephone: +44 0808 196 1270<br>9am to 4:30pm Monday to Thursday<br>9am to 3pm Friday') }}</p>
-<p>{{ _('Minicom (for the deaf and hearing impaired): 18001 +44 800 085 7376') }}</p>
-<p>{{ _('Email:') }} <a href="mailto: [email protected]">[email protected]</a></p>
-{%- endset -%}
-
-{{ onsDetails({
-        "titleTag": "h3",
-        "id": "details",
-        "title": _('Who can I contact for further information?'),
-        "content": further_info_content
-    }) }}
 
-  </form>
+    <h2 class="ons-u-fs-xl ons-u-mt-l" id="find_access_code">{{ _('Where to find your access code') }}</h2>
+    <p>{{ _('Your access code can be found in the invitation letter or email you received.
+            Your 16-character access code will be a combination of letters and numbers.') }}</p>
+
+    {%- set further_info_content -%}
+    <p>{{ _('Telephone: +44 0808 196 1270<br>9am to 4:30pm Monday to Thursday<br>9am to 3pm Friday') }}</p>
+    <p>{{ _('Minicom (for the deaf and hearing impaired): 18001 +44 800 085 7376') }}</p>
+    <p>{{ _('Email:') }} <a href="mailto: [email protected]">[email protected]</a></p>
+    {%- endset -%}
+
+    {{ onsDetails({
+            "titleTag": "h3",
+            "id": "details",
+            "title": _('Who can I contact for further information?'),
+            "content": further_info_content
+        }) }}
+
 {% endblock %}
diff --git a/rh_ui/templates/uac_error_pages/uac-already-used.html b/rh_ui/templates/uac_error_pages/uac-already-used.html
@@ -18,7 +18,13 @@
 
 {%- block main -%}
 
-    <h1>{{ _('This access code has already been used') }}</h1>
+    <h1
+        data-ga= "error", 
+        data-ga-category= "UAC-error", 
+        data-ga-label= "uac_already_used_error" 
+    >
+    {{ _('This access code has already been used') }}
+    </h1>
 
     <p>{{ _('Someone has already submitted a response using this access code.') }}</p>
 

diff --git a/rh_ui/templates/uac_error_pages/uac-inactive.html b/rh_ui/templates/uac_error_pages/uac-inactive.html
@@ -17,7 +17,12 @@
 {%- endblock -%}
 
 {%- block main -%}
-    <h1>
+    <h1
+        data-ga= "error", 
+        data-ga-category= "UAC-error", 
+        data-ga-label= "uac_questionnaire_closed_error" 
+    >
         {{ _('This questionnaire has now closed') }}
     </h1>
+
 {%- endblock main -%}
diff --git a/whitelist.py b/whitelist.py
@@ -4,20 +4,21 @@
 RH_SVC_URL  # unused variable (config.py:9)
 SECRET_KEY  # unused variable (config.py:13)
 SESSION_COOKIE_SECURE  # unused variable (config.py:14)
-ACCOUNT_SERVICE_URL  # unused variable (config.py:17)
-LANGUAGES  # unused variable (config.py:18)
-EQ_URL  # unused variable (config.py:19)
-DEBUG  # unused variable (config.py:23)
-PORT  # unused variable (config.py:24)
-HOST  # unused variable (config.py:25)
-LOGGING_LEVEL  # unused variable (config.py:26)
-EQ_URL  # unused variable (config.py:27)
-SECRET_KEY  # unused variable (config.py:31)
-SESSION_COOKIE_SECURE  # unused variable (config.py:32)
-ACCOUNT_SERVICE_URL  # unused variable (config.py:34)
-RH_SVC_URL  # unused variable (config.py:35)
-DEBUG  # unused variable (config.py:39)
-RH_SVC_URL  # unused variable (config.py:40)
+GOOGLE_TAG_ID  # unused variable (config.py:15)
+ACCOUNT_SERVICE_URL  # unused variable (config.py:18)
+LANGUAGES  # unused variable (config.py:19)
+EQ_URL  # unused variable (config.py:20)
+DEBUG  # unused variable (config.py:24)
+PORT  # unused variable (config.py:25)
+HOST  # unused variable (config.py:26)
+LOGGING_LEVEL  # unused variable (config.py:27)
+EQ_URL  # unused variable (config.py:28)
+SECRET_KEY  # unused variable (config.py:32)
+SESSION_COOKIE_SECURE  # unused variable (config.py:33)
+ACCOUNT_SERVICE_URL  # unused variable (config.py:35)
+RH_SVC_URL  # unused variable (config.py:36)
+DEBUG  # unused variable (config.py:40)
+RH_SVC_URL  # unused variable (config.py:41)
 wsgi_app  # unused variable (gunicorn.conf.py:9)
 bind  # unused variable (gunicorn.conf.py:12)
 worker_class  # unused variable (gunicorn.conf.py:14)
@@ -28,7 +29,7 @@
 _.secret_key  # unused attribute (rh_ui/app_setup.py:28)
 _.session_cookie_name  # unused attribute (rh_ui/app_setup.py:29)
 _.session_cookie_secure  # unused attribute (rh_ui/app_setup.py:30)
-TestingConfig  # unused class (config.py:38)
+TestingConfig  # unused class (config.py:39)
 add_language_code  # unused function (rh_ui/views/i18n.py:19)
 pull_lang_code  # unused function (rh_ui/views/i18n.py:24)
 cookies  # unused function (rh_ui/views/info_pages.py:11)