From 8fd6925744668b2bf073fac7887583f212058737 Mon Sep 17 00:00:00 2001 From: Benard Ebinu Date: Mon, 16 Apr 2018 08:06:25 -0700 Subject: [PATCH] DIV-865: Adding question 'Please describe the order you are asking for regarding Special and Extraordinary Expenses.' --- edivorce/apps/core/templates/pdf/form1.html | 18 +- edivorce/apps/core/templates/pdf/form52.html | 10 +- .../question/06_children_income_expenses.html | 436 ++++++++++-------- .../apps/core/templatetags/summary_format.py | 1 + .../apps/core/utils/question_step_mapping.py | 3 +- edivorce/fixtures/Question.json | 12 + 6 files changed, 273 insertions(+), 207 deletions(-) diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index d1208f48..19e376c6 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -453,7 +453,23 @@ - C. {% checkbox responses.child_support_act children_of_marriage='YES' want_which_orders='Child support' %} + C. {% checkbox responses.describe_order_special_extra_expenses children_of_marriage='YES' want_which_orders='Child support' special_extraordinary_expenses='YES' %} + +
+ Claimant 1 and Claimant 2 are asking for an order for Special and Extraordinary Expenses as follows:
+ + {% if responses.children_of_marriage == 'YES' and responses.special_extraordinary_expenses == 'YES' and 'Child support' in responses.want_which_orders %} +
    {{ responses.describe_order_special_extra_expenses|striptags|linebreaksli }}
+ {% endif %} + +
+ + + + + + + D. {% checkbox responses.child_support_act children_of_marriage='YES' want_which_orders='Child support' %}
Claimant 1 and Claimant 2 are asking for the orders diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index 51c13e9c..2ee1375b 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -64,7 +64,8 @@ {% if derived.wants_divorce_order %}

THIS COURT ORDERS that

-

+

    +
  1. Subject to section 12 of the Divorce Act (Canada), claimant 1, {% if responses.name_you %}{% include "partials/name_with_alias.html" with name=responses.name_you use_other_name=responses.any_other_name_you other_names=responses.other_name_you %}{% else %}{% endif %}, and claimant 2, @@ -85,9 +86,14 @@ {% else %}{% endif %}, are divorced from each other, the divorce to take effect on {% effective_date %}. -

    +
    2. {% endif %} + {% if responses.children_of_marriage == 'YES' and responses.special_extraordinary_expenses == 'YES' %} + {{ responses.describe_order_special_extra_expenses|striptags|linebreaksli }} + {% endif %} +
+
{% if derived.wants_spousal_support or derived.wants_property_division or derived.wants_child_support or derived.wants_other_orders %} diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html index 78f7137e..ed531e6f 100644 --- a/edivorce/apps/core/templates/question/06_children_income_expenses.html +++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html @@ -334,214 +334,244 @@
- +
+

Please describe the order you are asking for regarding Special and Extraordinary Expenses

+

+ If you're not sure how to write what you are asking for, you can refer to the + + The Supreme Court Family Order Pick List + which sets out standard terms for most of the usual orders made in family cases. +

+

+ Please note - When entering your answer make sure you insert a line break + (click the ENTER/RETURN key on the keyboard) between each item that you are asking for. +

+

+ For example: +

+
+

+ The parties agree that the following expenses shall be considered special or extraordinary expenses for + the child(ren): Happy Day Summer Camp. +

+

+ No other expenses will be considered special or extraordinary unless agreed to by the parties in advance + or by further Court order. +

+
+ {% input_field type="textarea" name="describe_order_special_extra_expenses" class="response-textarea form-control" maxlength="20000" rows="7"%} +
+ {% endblock %} diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py index f7cf791e..b0c8b5d5 100644 --- a/edivorce/apps/core/templatetags/summary_format.py +++ b/edivorce/apps/core/templatetags/summary_format.py @@ -109,6 +109,7 @@ def format_children(context, source): 'payor_monthly_child_support_amount', 'special_extraordinary_expenses', 'Special or Extraordinary Expenses (Fact Sheet A)', + 'describe_order_special_extra_expenses' ] question_to_heading['Payor & Fact Sheets'] = [ 'Shared Living Arrangement (Fact Sheet B)', diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py index b39ce5bc..8c895c3d 100644 --- a/edivorce/apps/core/utils/question_step_mapping.py +++ b/edivorce/apps/core/utils/question_step_mapping.py @@ -138,7 +138,8 @@ question_step_mapping = { 'your_proportionate_share_percent', 'your_proportionate_share_amount', 'spouse_proportionate_share_percent', - 'spouse_proportionate_share_amount' + 'spouse_proportionate_share_amount', + 'describe_order_special_extra_expenses' ], 'spousal_support': ['spouse_support_details', 'spouse_support_act'], 'property_and_debt': ['deal_with_property_debt', diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index 27902187..3aeb1bf8 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -1513,6 +1513,18 @@ "model": "core.question", "pk": "spouse_proportionate_share_amount" }, +{ + "fields": { + "name": "Please describe the order you are asking for regarding Special and Extraordinary Expenses", + "description": "For Step 6, Your children - Income & expenses", + "summary_order": 0, + "required": "Conditional", + "conditional_target": "special_extraordinary_expenses", + "reveal_response": "YES" + }, + "model": "core.question", + "pk": "describe_order_special_extra_expenses" +}, { "fields": { "name": "Number of children",