diff --git a/edivorce/apps/core/templates/overview.html b/edivorce/apps/core/templates/overview.html index 1d154733..6a19079e 100644 --- a/edivorce/apps/core/templates/overview.html +++ b/edivorce/apps/core/templates/overview.html @@ -48,7 +48,7 @@ {% elif step_status.your_separation == 'Complete' %} Completed {% endif %} - + Step 6
Your children {% if step_status.your_children == 'Started' %} Started diff --git a/edivorce/apps/core/templates/partials/progress.html b/edivorce/apps/core/templates/partials/progress.html index 0feeda22..28089d07 100644 --- a/edivorce/apps/core/templates/partials/progress.html +++ b/edivorce/apps/core/templates/partials/progress.html @@ -39,12 +39,28 @@ {% if step_status.your_separation == 'Started' %} {% elif step_status.your_separation == 'Complete' %} {% endif %} - + + + + + {% if 'Spousal support' in want_which_orders|load_json or 'Spousal support' in which_orders.0.value|load_json %} diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html new file mode 100644 index 00000000..aa7fa02b --- /dev/null +++ b/edivorce/apps/core/templates/question/06_children_what_for.html @@ -0,0 +1,147 @@ +{% extends 'base.html' %} +{% load input_field %} +{% load step_order %} + +{% block title %}{{ block.super }}: Your Children {% endblock %} + +{% block progress %}{% include "partials/progress.html" %}{% endblock %} + +{% block content %} +

Step {% step_order step="children" %}:Children - What are you asking for

+ +
+

Do you have a separation agreement that sets out what you've agreed to around parenting and child support?

+
+ + + +
+ + +
+
+

+ A document that sets out how you and your spouse have agreed to deal with matters like parenting + support and property after you separate (Provincial family law calls it an agreement). There's + no official form to use for drafting up a separation agreement. +

+

+ If you wish to file your separation agreement the parts of the agreement that deal with + parenting and support can be enforced as if they were in a court order. More information on + + how to file your agreement + + can be found on the Family Law website. +

+
+
+ + + +
+ +{% endblock content %} + + +{% block formBack %}{% prev_step step='children' %}{% endblock %} +{% block formNext %}{% next_step step='children' %}{% endblock %} + +{% block sidebarText %} +

What does the law mean by “best interests of the child”?

+

+ The “best interests of the child” is a legal test used to decide what would best + protect your child’s physical, psychological, and emotional safety, security and + well-being. To determine what is in the child’s best interests when making parenting + arrangements, you must consider factors including: +

+ +

+ When you make an agreement about parenting arrangements after a separation, the law says + you must only consider the child’s best interests. And if you go to court, the judge can + only consider the child’s best interests in making parenting orders.. For more information + on the + + best interests of the child + + please refer to the Family Law in B.C. website. +

+

The benefits of using both courts (Provincial Court, Supreme Court)

+

+ In some situations, you may find it best to use both courts. You could get most of your + orders in Provincial Court, and then just apply for your divorce order in Supreme Court. + (You could also choose to make an agreement about parenting, support, and property and + then just apply to the Supreme Court for a divorce.) This approach might save you money + and time, especially if you and your spouse agree on what should be done. +

+

+ On the other hand, it could make things more complicated to have to deal with two + different courts. It can also be a problem if you ask more than one court to deal with + issues about parenting and support. +

+{% endblock %} \ No newline at end of file diff --git a/edivorce/apps/core/templates/question/06_children.html b/edivorce/apps/core/templates/question/06_children_your_children.html similarity index 100% rename from edivorce/apps/core/templates/question/06_children.html rename to edivorce/apps/core/templates/question/06_children_your_children.html diff --git a/edivorce/apps/core/urls.py b/edivorce/apps/core/urls.py index 708dcc66..cea22e21 100644 --- a/edivorce/apps/core/urls.py +++ b/edivorce/apps/core/urls.py @@ -27,6 +27,7 @@ urlpatterns = [ url(r'^pdf-form(?P[0-9]{1,3}(_we|_claimant1|_claimant2)?)$', pdf.form, name="pdf_form"), url(r'^prequalification/step_(?P[0-9]{2})$', main.prequalification, name="prequalification"), + url(r'^question/(?P.*)/(?P.*)/$', main.question, name="question_steps"), url(r'^question/(?P.*)$', main.question, name="question_steps"), url(r'^current', system.current, name="current"), url(r'^$', main.home, name="home"), diff --git a/edivorce/apps/core/views/main.py b/edivorce/apps/core/views/main.py index b367f2b8..89c692f4 100644 --- a/edivorce/apps/core/views/main.py +++ b/edivorce/apps/core/views/main.py @@ -169,11 +169,12 @@ def dashboard_nav(request, nav_step): @bceid_required -def question(request, step): +def question(request, step, sub_step=None): """ View for rendering main divorce questionaire questions """ - template = 'question/%02d_%s.html' % (template_step_order[step], step) + sub_page_template = '_{}'.format(sub_step) if sub_step else '' + template = 'question/%02d_%s%s.html' % (template_step_order[step], step, sub_page_template) responses_dict_by_step = get_responses_from_db_grouped_by_steps(request.user, True) @@ -190,6 +191,8 @@ def question(request, step): if step == "location": responses_dict['registries'] = sorted(list_of_registries) + responses_dict['sub_step'] = sub_step + return render(request, template_name=template, context=responses_dict) diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index 1bca1274..e3c95666 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -806,5 +806,15 @@ }, "model": "core.question", "pk": "claimant_children" +}, +{ + "fields": { + "name": "Do you have a separation agreement that sets out what you've agreed to around parenting and child support?", + "description": "For Step 6, Your children - What are you asking for", + "summary_order": 0, + "required": "Required" + }, + "model": "core.question", + "pk": "have_separation_agreement" } ]