Merge pull request #355 from bcgov/release/APR-122t_1

Release/apr 122t 1

python/common/rsi_email.py

@@ -394,6 +394,7 @@ def applicant_evidence_instructions(**args) -> tuple:
         content["subject"],
         config,
         template.render(
+            link_to_rsbc_home_page=config.LINK_TO_RSBC_HOME_PAGE,
             link_to_evidence_form=config.LINK_TO_EVIDENCE_FORM,
             full_name=args.get('applicant_name'),
             prohibition_number=prohibition_number,
@@ -587,12 +588,12 @@ def content_data() -> dict:
             "title": "Send Disclosure",
         },
         "send_evidence_instructions.html": {
-            "raw_subject": "Submit Evidence - Driving Prohibition {} Review",
-            "title": "Submit Evidence",
+            "raw_subject": "Upload Supporting Documents - Driving Prohibition {} Review",
+            "title": "Upload Supporting Documents",
         },
         "evidence_received.html": {
-            "raw_subject": "Evidence Received - Driving Prohibition {} Review",
-            "title": "Evidence Received",
+            "raw_subject": "Documents Received - Driving Prohibition {} Review",
+            "title": "Documents Received",
         },
         "review_type_change.html": {
             "raw_subject": "Review Type Change - Driving Prohibition {} Review",

python/common/templates/evidence_received.html

@@ -2,13 +2,13 @@
 
 {% block primary_text_1 %}
    On {{ today_date or "[ today's date and time ]"}},
-   we received the evidence that will be considered for your review.
+   we received the documents you uploaded that will be considered by the adjudicator for your review.
 {% endblock %}
 
 {% block primary_text_2 %}
    You may visit
-   <a href="{{ link_to_evidence_form }}">Upload Evidence and Statement</a>
-   to provide additional evidence until 2 days before the review.
+   <a href="{{ link_to_evidence_form }}">Upload Supporting Documents</a>
+   to provide additional evidence until 48 hours before the scheduled review time.
 {% endblock %}
 
 {% block timeline %}evidence.png{% endblock %}

python/common/templates/partials/call_appeals_registry.html

@@ -1,3 +1,3 @@
 <strong>Please do not respond to this email.</strong> We've sent it from an account that doesn't
 accept responses. If you need to reach us, call 1-855-387-7747. Select option 5 to reach the
-Appeals Registry.
+Appeals Registry or attend a driver licensing office.

python/common/templates/send_evidence_instructions.html

@@ -2,7 +2,7 @@
 
 {% block primary_text_1 %}
    Visit
-    <a href="{{ link_to_evidence_form }}">Upload Evidence and Statement</a>
+    <a href="{{ link_to_evidence_form }}">Upload Supporting Documents</a>
     to provide statements and evidence for your review. You can use this link more than once.
 {% endblock %}
 
@@ -11,7 +11,8 @@
     <ul>
         <li>The speed of your Internet connection may affect your ability to upload and submit files.</li>
         <li>Each upload can be no more than a single file limit of 25 MB and a combined limit of 50 MB.</li>
-        <li>You can return to the form to upload more files until 2 days before your review.</li>
+        <li>You can return to the form to upload more files until 48 hours before your review.</li>
+        <li>A statement must not exceed 30 pages total, for more information refer to the <a href="{{ link_to_rsbc_home_page }}">RoadSafetyBC website.</a></li>
     </ul>
 {% endblock %}
 
@@ -25,9 +26,9 @@
 {% endblock %}
 
 {% block primary_text_4 %}
-We will <strong>not</strong> accept cloud or Google docs for evidence.
+We will <strong>not</strong> accept links to cloud or Google docs for evidence.
 {% endblock %}
 
-{% block callout %}You must finish providing evidence 2 days before your review.{% endblock %}
+{% block callout %}Supporting documents should be uploaded 48 hours before your review.{% endblock %}
 {% block timeline %}evidence.png{% endblock %}
 {% block email_not_monitored %}{% include 'partials/call_appeals_registry.html' %}{% endblock %}

python/common/test_splunk.py

@@ -5,7 +5,7 @@
 from python.common.config import Config
 from python.common.splunk import log_to_splunk
 from python.common.splunk_application_for_review import paybc_lookup
-from python.prohibition_web_svc.middleware.icbc_middleware import splunk_get_driver, splunk_get_vehicle
+"""from python.prohibition_web_svc.middleware.icbc_middleware import splunk_get_driver, splunk_get_vehicle"""
 
 
 @responses.activate
@@ -30,7 +30,7 @@ def test_splunk_logs_paybc_lookup_event():
     logging.warning(json.dumps(payload))
     assert payload == {"event": {"event": "paybc_lookup", "prohibition_number": "40123456"}, "source": "be78d6"}
 
-
+"""
 @responses.activate
 def test_splunk_logs_icbc_get_driver_event():
     dl_number = '5161222'
@@ -62,8 +62,8 @@ def test_splunk_logs_icbc_get_driver_event():
         "username": username,
         "queried_bcdl": dl_number},
         "source": "be78d6"}
-
-
+"""
+"""
 @responses.activate
 def test_splunk_logs_icbc_get_vehicle_event():
     username = 'someuser@bceid'
@@ -95,3 +95,4 @@ def test_splunk_logs_icbc_get_vehicle_event():
         "username": "someuser@bceid",
         'queried_plate': plate_number
     }, "source": "be78d6"}
+"""

python/form_handler/config.py

@@ -21,6 +21,7 @@ class Config(BaseConfig):
     LINK_TO_SCHEDULE_FORM               = os.getenv('LINK_TO_SCHEDULE_FORM', 'http://localhost')
     LINK_TO_EVIDENCE_FORM               = os.getenv('LINK_TO_EVIDENCE_FORM', 'http://localhost')
     LINK_TO_APPLICATION_FORM            = os.getenv('LINK_TO_APPLICATION_FORM', 'http://localhost')
+    LINK_TO_RSBC_HOME_PAGE              = os.getenv('LINK_TO_RSBC_HOME_PAGE', 'http://localhost')
 
     LINK_TO_ICBC                        = os.getenv('LINK_TO_ICBC', 'http://localhost')
 

python/form_handler/tests/test_document_submission.py

@@ -29,8 +29,8 @@ def mock_send_email(*args, **kwargs):
         print('inside mock_send_email()')
         assert "me@gov.bc.ca" in args[0]
         print("Subject: {}".format(args[1]))
-        assert "Evidence Received - Driving Prohibition 20-123456 Review" in args[3]
-        assert "we received the evidence that will be considered for your review." in args[3]
+        assert "Documents Received - Driving Prohibition 20-123456 Review" in args[3]
+        assert "we received the documents you uploaded that will be considered by the adjudicator for your review." in args[3]
         assert "http://link-to-evidence-form" in args[3]
         return True