DIV-1024: Update Next Steps page

edivorce/apps/core/templates/dashboard/final_filing.html

@@ -45,8 +45,15 @@
     <!-- no back to dashboard -->
 {% endblock %}
 
-{% block formBack %}{% url 'dashboard_nav' 'swear_forms' %}{% endblock %}
-{% block formNext %}{% url 'dashboard_nav' 'next_steps' %}{% endblock %}
+{% block formbuttons %}
+    <div class="form-buttons clearfix">
+        <a class="btn btn-primary" href="{% url 'dashboard_nav' 'swear_forms' %}"><i class="fa fa-arrow-circle-o-left"></i>&nbsp;&nbsp;&nbsp;Back</a>
+        <a class="btn btn-success pull-right" href="{% url 'dashboard_nav' 'next_steps' %}">Next&nbsp;&nbsp;&nbsp;<i
+                    class="fa fa-arrow-circle-o-right"></i></a>
+        <a class="btn btn-primary pull-right save-spinner" href="{% url 'submit_final_files' %}"><i class="fa fa-floppy-o"></i>&nbsp;&nbsp;&nbsp;
+            Submit Documents</a>
+    </div>
+{% endblock %}
 
 {% block sidebarNav %}
     <!-- no sidebar -->

edivorce/apps/core/templates/dashboard/next_steps.html

@@ -4,38 +4,62 @@
 
 {% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
+{% block container_col %}dashboard-content{% endblock %}
+
 {% block content %}
     <h1>Filing Completed</h1>
     {% if how_to_file == 'Online' %}
-        <p>
-            You have successfully completed filing online.
-        </p>
-        <p>
-            Your CSO Online Package # (?) is 123-456-789
-        </p>
-        <p>
-            Once your filing has been reviewed by the Court Registry (?), you will receive an e-mail confirmation of your filing. This e-mail will
-            include
-            a Court Filing Number (?), please keep this number for your records and use it if filing any additional documentation.
-        </p>
-        <div class="question-well">
-            <h3>Filing Status</h3>
+        {% if final_filing_submitted %}
             <p>
-                You will receive e-mails from the system as your filing is processed by the Court Registry. You can also check here to see the status
-                of
-                your filing:
+                You’ve successfully completed filing online.
             </p>
             <p>
-                Current Filing Status: Submitted - Your filing has been submitted to the Court Registry and will be reviewed soon.
+                <b>Your {% include "partials/tooltips/online_package_number.html" with with_cso=True %} is {{ final_filing_package_number }}</b>
             </p>
+        {% else %}
             <p>
-                You can view the following items at any time:
+                You still have to complete your filing with the Court Registry.
+                Go to the <a href="{% url 'dashboard_nav' 'final_filing' %}">Final Filing</a> step.
             </p>
-            <ul>
-                <li>Your eFiling Receipt on the CSO eFiling Hub</li>
-                <li>The complete package of all documents you have filed at the CSO eFiling Hub</li>
-            </ul>
-        </div>
+            <p>
+                <b>Once filed, you will receive a {% include "partials/tooltips/online_package_number.html" with with_cso=True %}</b>
+            </p>
+        {% endif %}
+        <p>
+            Once your filing has been reviewed by the {% include "partials/tooltips/court_registry.html" %}, you will receive an e-mail confirmation of your filing.
+            This e-mail will include a {% include "partials/tooltips/court_file_number.html" %}, please keep this number for your records and use it if filing any additional documents.
+        </p>
+        {% if final_filing_submitted %}
+            <div class="question-well">
+                <h3>Filing Status</h3>
+                <p>
+                    You will receive e-mails from the system as your filing is processed by the Court Registry. You can also check here to see the
+                    status
+                    of
+                    your filing:
+                </p>
+                <p class="no-margin-bottom">
+                    Current Filing Status:
+                </p>
+                <ul class="no-bullets">
+                    <li>
+                        <b>{{ final_filing_status }}</b> -
+                        {% if final_filing_status == 'Submitted' %}
+                            Your filing has been submitted to the Court Registry and will be reviewed soon.
+                        {% else %}
+                            No filing status description
+                        {% endif %}
+                    </li>
+                </ul>
+                <p class="no-margin-bottom">
+                    You can view the following items at any time:
+                </p>
+                <ul class="no-margin-bottom">
+                    <li><a href="{{ final_filing_receipt_link }}" target="_blank">Your eFiling Receipt</a> on the CSO eFiling Hub</li>
+                    <li><a href="{{ final_filing_package_link }}" target="_blank">The package of all documents</a> you have submitted for filing</li>
+                </ul>
+            </div>
+        {% endif %}
     {% endif %}
     <div class="question-well">
         <h3>What happens at the registry?</h3>
@@ -48,18 +72,21 @@
             <a href="http://www.familylaw.lss.bc.ca/help/jacSelfHelpAndInfoServices.php" target="_blank">Justice Access Centre</a> Self-Help and
             Information Services.
         </p>
-        <p>If the registry is satisfied that your documents are in order, they will stamp the documents with the date, the court seal, and a file
+        <p>If the court registry is satisfied that your documents are in order, they will stamp the documents with the date, the court seal, and a file
             number.</p>
         <p>You now have a divorce file open in the Supreme Court.</p>
     </div>
     <div class="question-well">
         <h3>Next Steps</h3>
-        <p>Once a judge has reviewed your divorce, you will receive an e-mail from the court registry with information about the next steps. If your
-            divorce is approved, you can move to the next step and order a certificate of divorce.</p>
+        <p>
+            Once your divorce has been reviewed, you will receive an e-mail from the court registry with information about the next steps.
+            If your divorce is approved, you can move to the next step and order a certificate of divorce.
+        </p>
 
-        <h2>Haven’t Heard Back?</h2>
-        <p>If you don’t hear back within 30 days from the court registry. Please contact CSO Online Support at Courts.CSO@gov.bc.ca and include your
-            Court Filing # (?) / Filing Location or Online Package Number (?).</p>
+        <h2 class="add-top-margin">Haven’t Heard Back?</h2>
+        <p>If you don’t hear back within 30 days from the court registry, please contact CSO Online Support at
+            <a href="mailto:Courts.CSO@gov.bc.ca" target="_blank">Courts.CSO@gov.bc.ca</a>
+            and include your {% include "partials/tooltips/court_file_number.html" %} / Filing Location or {% include "partials/tooltips/online_package_number.html" %}.</p>
     </div>
 {% endblock %}
 
@@ -70,9 +97,43 @@
 {% block formBack %}{% url 'dashboard_nav' 'final_filing' %}{% endblock %}
 {% block formNext %}{% url 'dashboard_nav' 'order_certificate' %}{% endblock %}
 
-{% block sidebarNav %}
-    <!-- no sidebar -->
-{% endblock %}
 {% block sidebarText %}
-    {% include "dashboard/partials/sidebar_help.html" %}
+    <h3>What do I have to do next?</h3>
+    <p>
+        <b><i>I have manually submitted all documents</i></b> (except the Certificate of Divorce)
+        at the registry counter:
+    </p>
+    <ul>
+    <li>
+        You will need to wait for the registry to notify you indicating if your documents
+        have been accepted and the divorce order granted, or if corrections are required.
+    </li>
+    <li>
+        If you have received your filed order for divorce and 31 days has passed, you can
+        now submit your request for a Certificate of Divorce.
+    </li>
+    <li>
+        If corrections are required, you will need to make the corrections to the documents
+        noted by the registry and resubmit them.
+    </li>
+    </ul>
+    <p>
+        <b><i>I have submitted all documents online</i></b> (except the Certificate of Divorce):
+    </p>
+    <ul>
+        <li>
+            You will be notified by email when your documents have been reviewed and processed
+            by registry staff. The notification will indicate whether your documents have been
+            filed or if corrections are needed for filing.
+        </li>
+        <li>
+            If the documents have been filed, you will be able to access the filed documents using
+            the link in the email notification. You will want to confirm that the order for divorce
+            is filed and then you can proceed to submit your Certificate of Divorce.
+        </li>
+        <li>
+            If corrections are required, you will need to make the corrections to your document(s)
+            and then resubmit to the registry.
+        </li>
+    </ul>
 {% endblock %}

edivorce/apps/core/templates/partials/tooltips/court_registry.html

@@ -0,0 +1,19 @@
+<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
+      data-html="true"
+      title="
+                <b>Court Registry</b>
+                <br /><br />
+                You have selected to file at the following Ministry of Attorney General Court Registry location:
+                <br />
+                <br />
+                {% if court_registry_for_filing %}
+                    {{ court_registry_for_filing }}
+                    <br />
+                    {{ court_registry_for_filing_address }}
+                    <br />
+                    {{ court_registry_for_filing_postal_code }}
+                {% else %}
+                    No Court Registry was chosen
+                {% endif %}
+                ">
+          Court Registry<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/utils/cso_filing.py

@@ -10,6 +10,9 @@ def file_documents(user, initial=False):
     prefix = 'initial' if initial else 'final'
     _save_response(user, f'{prefix}_filing_submitted', True)
 
+    if not initial:
+        _save_response(user, f'final_filing_status', 'Submitted')
+
     package_number_parts = []
     for _ in range(3):
         num = ''

edivorce/apps/core/views/main.py

@@ -200,6 +200,9 @@ def dashboard_nav(request, nav_step):
     responses_dict = get_data_for_user(request.user)
     responses_dict['active_page'] = nav_step
     template_name = 'dashboard/%s.html' % nav_step
+    if nav_step in ('swear_forms', 'next_steps') and responses_dict.get('court_registry_for_filing'):
+        responses_dict['court_registry_for_filing_address'] = f"123 {responses_dict.get('court_registry_for_filing')} St"
+        responses_dict['court_registry_for_filing_postal_code'] = 'V0A 1A1'
     return render(request, template_name=template_name, context=responses_dict)
 
 

edivorce/fixtures/Question.json

@@ -1872,5 +1872,55 @@
     },
     "model": "core.question",
     "pk": "initial_filing_package_link"
+},
+{
+    "fields": {
+        "name": "Has the user successfully submitted the final filing",
+        "description": "For stage 7, Final filing",
+        "summary_order": 172,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "final_filing_submitted"
+},
+{
+    "fields": {
+        "name": "Final Filing CSO Online Package #",
+        "description": "For stage 7, Final filing",
+        "summary_order": 173,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "final_filing_package_number"
+},
+{
+    "fields": {
+        "name": "Final Filing receipt link",
+        "description": "For stage 7, Final filing",
+        "summary_order": 174,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "final_filing_receipt_link"
+},
+{
+    "fields": {
+        "name": "Final Filing download package link",
+        "description": "For stage 7, Final filing",
+        "summary_order": 175,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "final_filing_package_link"
+},
+{
+    "fields": {
+        "name": "Final filing status",
+        "description": "For stage 8, Next steps",
+        "summary_order": 176,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "final_filing_status"
 }
 ]