diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html index 93c45493..87f2006f 100644 --- a/edivorce/apps/core/templates/pdf/form38.html +++ b/edivorce/apps/core/templates/pdf/form38.html @@ -202,8 +202,8 @@

  • the following arrangements for parenting have been made:

    - {% if responses.order_respecting_arrangement %} - + {% if responses.what_parenting_arrangements %} + {% else %}
    {% endif %} diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html index ad8ab4a8..dd9eea0c 100644 --- a/edivorce/apps/core/templates/question/06_children_what_for.html +++ b/edivorce/apps/core/templates/question/06_children_what_for.html @@ -276,6 +276,47 @@ +
    +

    What parenting arrangements have been made for the children of the marriage?

    + +
    +
    +

    Parenting arrangements

    +

    + If you and your spouse (married or unmarried) have dependent children (usually under age 19), + you need to make arrangements for taking care of the children when you separate. Parenting + arrangements include: +

    +
      +
    • who will make decisions about the children,
      • +
    • where the children are going to live, and
      • +
    • how much time the children will spend with each parent who is a guardian.
      • +
    +
    +
    +

    + Please note - When entering your answer make sure you insert a line break + (click the ENTER/RETURN key on the keyboard) between each arrangement that has been made. +

    +

    For example:

    +
    +

    + Claimant 1 and Claimant 2 share parenting time of the children, Sally Johal and Lawerence Johal equally. +

    +

    + The children spend one week with claimant 1 and then one week with claimant 2. +

    +

    + We each make day-to-day decisions about the children when they're with us. +

    +
    + {% input_field type="textarea" name="what_parenting_arrangements" class="response-textarea form-control" maxlength="20000" rows="7"%} +
    +

    If you are asking the court to include an
    +

    Parenting arrangements

    If you and your spouse (married or unmarried) have dependent children (usually under age 19), you need to make arrangements for taking care of the children when you separate. Parenting @@ -319,6 +361,19 @@

    +

    + Please note - When entering your answer make sure you insert a line break + (click the ENTER/RETURN key on the keyboard) between each arrangement that has been made. +

    +

    For example:

    +
    +

    + Claimant 1 and Claimant 2 will share parenting time equally between them. +

    +

    + Claimant 1 and Claimant 2 will share equally all of the s. 41 parental responsibilities for the children under s.40(2) of the Family Law Act. +

    +
    {% input_field type="textarea" name="order_respecting_arrangement" class="response-textarea form-control" maxlength="20000" rows="7"%}

    diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py index 78ade854..5f2b3ada 100644 --- a/edivorce/apps/core/templatetags/summary_format.py +++ b/edivorce/apps/core/templatetags/summary_format.py @@ -135,6 +135,7 @@ def format_children(context, source): 'agree_to_child_support_amount', 'have_separation_agreement', 'have_court_order', + 'what_parenting_arrangements', 'order_respecting_arrangement', 'order_for_child_support', 'child_support_act' @@ -148,7 +149,7 @@ def format_children(context, source): fact_sheet_mapping['Undue Hardship (Fact Sheet E)'] = reverse('question_steps', args=['children', 'facts']) fact_sheet_mapping['Income over $150,000 (Fact Sheet F)'] = reverse('question_steps', args=['children', 'facts']) - child_support_orders = {'have_court_order', 'order_respecting_arrangement', 'order_for_child_support'} + child_support_orders = {'have_court_order', 'what_parenting_arrangements', 'order_respecting_arrangement', 'order_for_child_support'} tags = [] # process mapped questions first diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py index 36af3c8a..b39ce5bc 100644 --- a/edivorce/apps/core/utils/question_step_mapping.py +++ b/edivorce/apps/core/utils/question_step_mapping.py @@ -96,6 +96,7 @@ question_step_mapping = { 'reason_child_support_amount', 'have_separation_agreement', 'have_court_order', + 'what_parenting_arrangements', 'order_respecting_arrangement', 'order_for_child_support', 'child_support_act', diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index da35fc4a..42ac19b6 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -829,7 +829,17 @@ }, { "fields": { - "name": "If you are asking for an order respecting parenting arrangements or contact please describe what you are asking for.", + "name": "What parenting arrangements have been made for the children of the marriage?", + "description": "For Step 6, Your children - What are you asking for", + "summary_order": 0, + "required": "Required" + }, + "model": "core.question", + "pk": "what_parenting_arrangements" +}, +{ + "fields": { + "name": "If you are asking the court to include an order about parenting arrangements or contact with a child, please indicate the orders you are asking for below.", "description": "For Step 6, Your children - What are you asking for", "summary_order": 0, "required": "Required"