Merge pull request #122 from bcgov/DIV-1021

DIV-1021: Fill out Stage 5, Wait for court file number page

edivorce/apps/core/static/css/main.scss

@@ -1379,6 +1379,7 @@ textarea {
 	}
 }
 
+/* Specific pages */
 .signing-filing {
     .question-well {
         margin-top: 15px;
@@ -1420,6 +1421,16 @@ textarea {
         }
     }
 }
+
+.wait-for-number {
+    p {
+        margin-bottom: 15px;
+    }
+    ul {
+        margin-bottom: 30px;
+    }
+}
+
 /* Column Grid in flexbox */
 .row-flex {
     display: -webkit-box;
@@ -2166,3 +2177,7 @@ span.hard-stop {
 		margin-right: 0;
 	}
 }
+
+.no-margin-bottom {
+    margin-bottom: 0 !important;
+}

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

@@ -50,9 +50,19 @@
     <!-- no back to dashboard -->
 {% endblock %}
 
-{% block formBack %}{% url 'dashboard_nav' 'print_form' %}{% endblock %}
-{% block formNext %}{% url 'dashboard_nav' 'wait_for_number' %}{% endblock %}
-
+{% block formbuttons %}
+    <div class="form-buttons clearfix">
+        <a class="btn btn-primary" href="{% url 'dashboard_nav' 'print_form' %}"><i class="fa fa-arrow-circle-o-left"></i>&nbsp;&nbsp;&nbsp;Back</a>
+    {% if initial_filing_submitted %}
+        <a class="btn btn-success pull-right" href="{% url 'dashboard_nav' 'wait_for_number' %}">Next&nbsp;&nbsp;&nbsp;<i
+                class="fa fa-arrow-circle-o-right"></i></a>
+    {% else %}
+        <a class="btn btn-success pull-right" href="{% url 'dashboard_nav' 'wait_for_number' %}">Next</a>
+    {% endif %}
+        <a class="btn btn-primary pull-right save-spinner" href="{% url 'submit_initial_files' %}"><i class="fa fa-floppy-o"></i>&nbsp;&nbsp;&nbsp;
+            Submit Documents</a>
+    </div>
+{% endblock %}
 {% block sidebarNav %}
     <!-- no sidebar -->
 {% endblock %}

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

@@ -1,37 +1,56 @@
 {% extends 'base.html' %}
 
-{% block title %}{{ block.super }}: Overview{% endblock %}
+{% block title %}{{ block.super }}: Wait for number{% endblock %}
 
 {% block progress %}{% include "partials/dashnav.html" with active_page=active_page %}{% endblock %}
 
+{% block container_col %}wait-for-number{% endblock %}
 {% block content %}
     <h1>Wait for Court Filing Number</h1>
+    {% if initial_filing_submitted %}
+        <p>
+            You’ve successfully completed your initial filing with the Court Registry.
+        </p>
+        <p>
+            <b>Your {% include "partials/tooltips/online_package_number.html" with with_cso=True %} is {{ initial_filing_package_number }}</b>
+        </p>
+        <p class="no-margin-bottom">
+            You can view the following items at any time:
+        </p>
+        <ul>
+            <li><a href="{{ initial_filing_receipt_link }}" target="_blank">Your eFiling Receipt</a> on the CSO eFiling Hub</li>
+            <li><a href="{{ initial_filing_package_link }}" target="_blank">The package of all documents</a> you have submitted for filing</li>
+        </ul>
+    {% else %}
+        <p>
+            You still have to complete your initial filing with the Court Registry.
+            Go to the <a href="{% url 'dashboard_nav' 'initial_filing' %}">Initial Filing</a> step.
+        </p>
+        <p>
+            <b>Once filed, you will receive a {% include "partials/tooltips/online_package_number.html" with with_cso=True %}</b>
+        </p>
+        <p class="no-margin-bottom">
+            You will be able to view the following items at any time:
+        </p>
+        <ul>
+            <li>Your eFiling Receipt on the CSO eFiling Hub</li>
+            <li>The package of all documents you have submitted for filing</li>
+        </ul>
+    {% endif %}
     <p>
-        You’ve successfully completed your initial filing with the Court Registry.
+        In order to complete your divorce you’ll need to file the final set of documents.
+        To do this you’ll require a {% include "partials/tooltips/court_file_number.html" %}
+        which will be provided from the Court Registry once they have reviewed and approved
+        your initial filing. <b>This review can take up to a week to complete.</b>
+        You'll receive an e-mail with details of your initial filing.
     </p>
     <p>
-        Your CSO Online Package # (?) is 123-456-789
+        If you have any questions or concerns about your initial filing, 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/online_package_number.html" %}.
     </p>
     <p>
-        You can view the following items at any time:
-    </p>
-    <ul>
-        <li>Your eFiling Receipt on the CSO eFiling Hub</li>
-        <li>The package of all documents you have filed at the CSO eFiling Hub</li>
-    </ul>
-    <p>
-        In order to complete your divorce you’ll need to file the final set of documents. To do this you’ll require a Court Filing Number (?) which
-        will
-        be provided from the Court Registry once they have reviewed and approval your initial filing. This review can take up to a week to complete.
-        You’ll receive an e-mail with details of your initial filing.
-    </p>
-    <p>
-        If you have any questions or concerns about your initial filing, please contact CSO Online Support at Courts.CSO@gov.bc.ca and include your
-        Online
-        Package # (?).
-    </p>
-    <p>
-        Once you have received your Court Filing Number via e-mail, click Next to proceed with the remaining steps in the process.
+        <b>Once you have received your Court Filing Number</b> via e-mail, click Next to proceed with the remaining steps in the process.
     </p>
 {% endblock %}
 
@@ -46,5 +65,12 @@
     <!-- no sidebar -->
 {% endblock %}
 {% block sidebarText %}
-    {% include "dashboard/partials/sidebar_help.html" %}
+    <h3>How long does it take to get a file number?</h3>
+    <p>
+        The time depends on how many filings are received at the court registry you are filing with.
+        Normally, you will receive a file number within a week of submitting online.
+        If you do not receive a file number, you can send an email to <a href="mailto:Courts.CSO@gov.bc.ca" target="_blank">CSO Support Helpdesk</a>.
+        Please provide the package number and registry location you submitted your documents to
+        and they will be able to help.
+    </p>
 {% endblock %}

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

@@ -0,0 +1,8 @@
+<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
+      data-html="true"
+      title="
+                <b>Court File Number</b>
+                <br /><br />
+                This is the filing # given by the Court Registry to your spouse when they filed their portion
+                of the documents. If unknown, please check with your spouse before entering your Court File #.">
+          Court File Number<i class="fa fa-question-circle" aria-hidden="true"></i></span>

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

@@ -0,0 +1,8 @@
+<span class="tooltip-link" data-toggle="tooltip" data-placement="right"
+      data-html="true"
+      title="
+                <b>CSO Online Package #</b>
+                <br /><br />
+                This is the filing # given by the Court Registry to your spouse when they filed their portion
+                of the documents. If unknown, please check with your spouse before entering your Court File #.">
+          {% if with_cso %}CSO {% endif %}Online Package #<i class="fa fa-question-circle" aria-hidden="true"></i></span>

edivorce/apps/core/urls.py

@@ -24,6 +24,8 @@ urlpatterns = [
     url(r'^incomplete$', main.incomplete, name="incomplete"),
     url(r'^intercept$', main.intercept_page, name="intercept"),
     url(r'^dashboard/(?P<nav_step>.*)', main.dashboard_nav, name="dashboard_nav"),
+    path('submit/initial', main.submit_initial_files, name="submit_initial_files"),
+    path('submit/final', main.submit_final_files, name="submit_final_files"),
     url(r'^health$', system.health),
     url(r'^legal$', main.legal, name="legal"),
     url(r'^acknowledgements$', main.acknowledgements, name="acknowledgements"),

edivorce/apps/core/utils/cso_filing.py

@@ -0,0 +1,38 @@
+import random
+
+from django.conf import settings
+
+from edivorce.apps.core.models import UserResponse
+
+
+def file_documents(user, initial=False):
+    """ Save dummy data for now. Eventually replace with data from CSO. """
+    prefix = 'initial' if initial else 'final'
+    _save_response(user, f'{prefix}_filing_submitted', True)
+
+    package_number_parts = []
+    for _ in range(3):
+        num = ''
+        for _ in range(3):
+            num += str(random.randint(0, 9))
+        package_number_parts.append(num)
+
+    package_number = '-'.join(package_number_parts)
+    _save_response(user, f'{prefix}_filing_package_number', package_number)
+
+    if settings.DEPLOYMENT_TYPE == 'localdev':
+        base_url = 'https://dev.justice.gov.bc.ca'
+    else:
+        base_url = settings.PROXY_BASE_URL
+
+    receipt_link = base_url + '/cso/payment/viewReceipt.do?packageNumber=' + package_number
+    _save_response(user, f'{prefix}_filing_receipt_link', receipt_link)
+
+    package_link = base_url + '/cso/register.do?packageNumber=' + package_number
+    _save_response(user, f'{prefix}_filing_package_link', package_link)
+
+
+def _save_response(user, question, value):
+    response, _ = UserResponse.objects.get_or_create(bceid_user=user, question_id=question)
+    response.value = value
+    response.save()

edivorce/apps/core/views/main.py

@@ -1,5 +1,4 @@
 import datetime
-from copy import deepcopy
 
 from django.conf import settings
 from django.shortcuts import render, redirect
@@ -8,6 +7,7 @@ from django.utils import timezone
 
 from edivorce.apps.core.utils.derived import get_derived_data
 from ..decorators import bceid_required, intercept, prequal_completed
+from ..utils.cso_filing import file_documents
 from ..utils.question_step_mapping import list_of_registries
 from ..utils.step_completeness import get_error_dict, get_missed_question_keys, get_step_completeness, is_complete, get_formatted_incomplete_list
 from ..utils.template_step_order import template_step_order
@@ -203,6 +203,31 @@ def dashboard_nav(request, nav_step):
     return render(request, template_name=template_name, context=responses_dict)
 
 
+@bceid_required
+@prequal_completed
+def submit_initial_files(request):
+    return _submit_files(request, initial=True)
+
+
+@bceid_required
+@prequal_completed
+def submit_final_files(request):
+    return _submit_files(request, initial=False)
+
+
+def _submit_files(request, initial=False):
+    responses_dict = get_data_for_user(request.user)
+    if initial:
+        nav_step = 'wait_for_number'
+        file_documents(request.user, initial=True)
+    else:
+        nav_step = 'next_steps'
+        file_documents(request.user, initial=False)
+
+    responses_dict['active_page'] = nav_step
+    return redirect(reverse('dashboard_nav', kwargs={'nav_step': nav_step}), context=responses_dict)
+
+
 @bceid_required
 @prequal_completed
 def question(request, step, sub_step=None):

edivorce/fixtures/Question.json

@@ -1706,7 +1706,7 @@
 {
     "fields": {
         "name": "Select how you would like to swear/affirm your affidavit(s)?",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 155,
         "required": ""
     },
@@ -1716,7 +1716,7 @@
 {
     "fields": {
         "name": "Select how you would like to file your documents",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 156,
         "required": ""
     },
@@ -1726,7 +1726,7 @@
 {
     "fields": {
         "name": "Select where you would like to swear/affirm your affidavit(s)",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 157,
         "required": ""
     },
@@ -1736,7 +1736,7 @@
 {
     "fields": {
         "name": "Select where you would like to swear/affirm your affidavit(s)",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 158,
         "required": ""
     },
@@ -1746,7 +1746,7 @@
 {
     "fields": {
         "name": "Select where your spouse would like to swear/affirm your affidavit(s)",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 159,
         "required": ""
     },
@@ -1756,7 +1756,7 @@
 {
     "fields": {
         "name": "E-mail Address for You",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 160,
         "required": ""
     },
@@ -1766,11 +1766,51 @@
 {
     "fields": {
         "name": "E-mail Address for Your Spouse",
-        "description": "E-filing prototype",
+        "description": "For stage 2, Signing and filing options",
         "summary_order": 161,
         "required": ""
     },
     "model": "core.question",
     "pk": "email_spouse"
+},
+{
+    "fields": {
+        "name": "Has the user successfully submitted the initial filing",
+        "description": "For stage 4, Initial filing",
+        "summary_order": 162,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "initial_filing_submitted"
+},
+{
+    "fields": {
+        "name": "Initial Filing CSO Online Package #",
+        "description": "For stage 4, Initial filing",
+        "summary_order": 163,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "initial_filing_package_number"
+},
+{
+    "fields": {
+        "name": "Initial Filing receipt link",
+        "description": "For stage 4, Initial filing",
+        "summary_order": 164,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "initial_filing_receipt_link"
+},
+{
+    "fields": {
+        "name": "Initial Filing download package link",
+        "description": "For stage 4, Initial filing",
+        "summary_order": 165,
+        "required": ""
+    },
+    "model": "core.question",
+    "pk": "initial_filing_package_link"
 }
 ]