DIV-790/827: adding new question about parenting arrangement

edivorce/apps/core/templates/pdf/form38.html

@@ -202,8 +202,8 @@
 
               <li>
                 <p>the following arrangements for parenting have been made:</p>
-        {% if responses.order_respecting_arrangement %}
-                <ul>{{ responses.order_respecting_arrangement|striptags|linebreaksli }}</ul>
+        {% if responses.what_parenting_arrangements %}
+                <ul>{{ responses.what_parenting_arrangements|striptags|linebreaksli }}</ul>
         {% else %}
                 <div style="min-height: 1.5in"></div>
         {% endif %}

edivorce/apps/core/templates/question/06_children_what_for.html

@@ -276,6 +276,47 @@
     </div>
 
 
+    <div class="question-well">
+        <h3>What parenting arrangements have been made for the children of the marriage?</h3>
+        <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_parenting_arrangement" aria-controls="collapse_parenting_arrangement">
+            <div>
+                What should we consider when determining parenting arrangements?
+            </div>
+        </div>
+        <div class="collapse" id="collapse_parenting_arrangement">
+            <div>
+                <p><strong>Parenting arrangements</strong></p>
+                <p>
+                    If you and your <strong>spouse</strong> (married or unmarried) have dependent children (usually under age 19),
+                    you need to make arrangements for taking care of the children when you separate. <strong>Parenting
+                    arrangements</strong> include:
+                </p>
+                <ul>
+                    <li>who will make decisions about the children,</li>
+                    <li>where the children are going to live, and </li>
+                    <li>how much time the children will spend with each parent who is a guardian. </li>
+                </ul>
+            </div>
+        </div>
+        <p>
+            <strong>Please note</strong> - 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.
+        </p>
+        <p>For example:</p>
+        <blockquote>
+            <p>
+                Claimant 1 and Claimant 2 share parenting time of the children, Sally Johal and Lawerence Johal equally.
+            </p>
+            <p>
+                The children spend one week with claimant 1 and then one week with claimant 2.
+            </p>
+            <p>
+                We each make day-to-day decisions about the children when they're with us.
+            </p>
+        </blockquote>
+        {% input_field type="textarea" name="what_parenting_arrangements" class="response-textarea form-control" maxlength="20000" rows="7"%}
+    </div>
+
     <div class="question-well">
         <h3>If you are asking the court to include an
             <span class="tooltip-link"
@@ -302,11 +343,12 @@
         </p>
          <div class="collapse-trigger collapsed" data-toggle="collapse" aria-expanded="false" data-target="#collapse_parenting_arrangement" aria-controls="collapse_parenting_arrangement">
             <div>
-                What should I consider when determining parenting arrangements?
+                What should we consider when determining parenting arrangements?
             </div>
         </div>
         <div class="collapse" id="collapse_parenting_arrangement">
             <div>
+                <p><strong>Parenting arrangements</strong></p>
                 <p>
                     If you and your <strong>spouse</strong> (married or unmarried) have dependent children (usually under age 19),
                     you need to make arrangements for taking care of the children when you separate. <strong>Parenting
@@ -319,6 +361,19 @@
                 </ul>
             </div>
         </div>
+        <p>
+            <strong>Please note</strong> - 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.
+        </p>
+        <p>For example:</p>
+        <blockquote>
+            <p>
+                Claimant 1 and Claimant 2 will share parenting time equally between them.
+            </p>
+            <p>
+                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.
+            </p>
+        </blockquote>
         {% input_field type="textarea" name="order_respecting_arrangement" class="response-textarea form-control" maxlength="20000" rows="7"%}
     </div>
 

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

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',

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"