Merge pull request #105 from bcgov/DIV-1129

DIV-1129: Remove number of children questions from fact sheets B and C

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_b.html

@@ -8,14 +8,15 @@
         existing Court Order.<br>
         <b>This information is needed for the Judge. You will be able to indicate a different child support amount in a following step.</b>
     </p>
-    <div class="question-well {% if number_of_children_error %}error{% endif %}">
-        <h3>Number of children{% if number_of_children_error %}{% include 'partials/required.html' %}{% endif %}</h3>
+    <div class="question-well">
+        <h3>Number of Shared Children</h3>
         <p>
-            This is the number of children for which you and your spouse have a <b>shared parenting arrangement</b>
-            (the child spends at least 40 percent of the time with each of you in a year). If you and your spouse
-            have a split parenting arrangement for any other children, do not include them in this set of questions.
+            This is the number of children, as indicated in the <b>Children details</b> page, that you
+            and your spouse have a <b>shared parenting arrangement</b> (the child spends at least 40 percent of the
+            time with each of you in a year). If you and your spouse have a split parenting arrangement for any other children,
+            they are not included in this set of questions.
         </p>
-        {% input_field type="number" name="number_of_children" class="form-control input-narrow positive-integer" min="0" %}
+        {% input_field type="number" name="number_of_children" value=derived.number_of_children class="form-control input-narrow positive-integer" readonly="" %}
     </div>
     <br/>
 

edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_c.html

@@ -8,24 +8,15 @@
         you must complete Fact Sheet C.
         <b>This information is needed for the Judge. You will be able to indicate a different child support amount in a following step.</b>
     </p>
-    {% if derived.show_fact_sheet_b and derived.show_fact_sheet_c %}
-        <div class="bg-danger" id="fact-sheet-b-and-c-alert">
-            <p>
-                Do not include any children that are <b>SHARED on fact sheet B.</b> You may indicate 0 (zero) children for 1 of the parents in Fact
-                Sheet C and insert 0 (zero) dollars for child support amount.
-            </p>
-        </div>
-    {% endif %}
     <table class="table table-bordered">
         <tbody>
         <tr>
             <td class="fact-sheet-question">
-                How many children spend more than <strong>60 percent of their time</strong> with you and for whom you are asking for support?
+                The number of children that spend at least <strong>60 percent of their time</strong> with you and for whom you are asking for support,
+                as indicated in the <b>Children details</b> page
             </td>
-            <td class="fact-sheet-answer table-bordered">
-                <div class="{% if number_of_children_claimant_error %}table-error{% endif %}">
-                    {% input_field type="number" name="number_of_children_claimant" class="positive-integer fact-sheet-input number-spinner" min="0" placeholder="enter number" ignore_error=True %}
-                </div>
+            <td class="fact-sheet-answer table-bordered" readonly>
+                {% input_field type="number" name="number_of_children_claimant" value=derived.number_of_children_claimant class="positive-integer fact-sheet-input number-spinner" readonly="" %}
             </td>
         </tr>
         <tr>
@@ -77,13 +68,11 @@
         </tr>
         <tr>
             <td class="fact-sheet-question">
-                How many children spend more than <strong>60 percent of their time</strong> with your spouse and for whom you are obliged to pay
-                support?
+                The number of children that spend at least <strong>60 percent of their time</strong> with your spouse and for whom you are asking for
+                support, as indicated in the <b>Children details</b> page
             </td>
-            <td class="fact-sheet-answer table-bordered">
-                <div class="{% if number_of_children_claimant_spouse_error %}table-error{% endif %}">
-                    {% input_field type="number" name="number_of_children_claimant_spouse" class="positive-integer fact-sheet-input number-spinner" min="0" placeholder="enter number" ignore_error=True %}
-                </div>
+            <td class="fact-sheet-answer table-bordered" readonly>
+                {% input_field type="number" name="number_of_children_claimant_spouse" value=derived.number_of_children_claimant_spouse class="positive-integer fact-sheet-input number-spinner" readonly="" %}
             </td>
         </tr>
         <tr>

edivorce/apps/core/templates/pdf/partials/fact_sheet_b.html

@@ -13,7 +13,7 @@
         <th style="width: 15%;">Claimant 1</th>
         <th style="width: 15%;">Claimant 2</th>
       </tr>
-        <td colspan="3">Number of children: {{ responses.number_of_children }}</td>
+        <td colspan="3">Number of children: {{ derived.number_of_children }}</td>
       </tr>
       <tr>
         <td>Approximate percentage of time children spend with each parent</td>

edivorce/apps/core/templates/pdf/partials/fact_sheet_c.html

@@ -17,7 +17,7 @@
         <td class="line-number">A</td>
         <td>Number of children principally resident with Claimant 1 for whom support is claimed</td>
         <td class="amount">
-          <span class="actual">{{ responses.number_of_children_claimant }}</span>
+          <span class="actual">{{ derived.number_of_children_claimant }}</span>
         </td>
       </tr>
       <tr>
@@ -31,7 +31,7 @@
         <td class="line-number">C</td>
         <td>
           Guidelines table amount payable by Claimant 2 for
-          {{ responses.number_of_children_claimant|child_or_children }}
+          {{ derived.number_of_children_claimant|child_or_children }}
         </td>
         <td class="amount">$
           <span class="actual">{{ responses.your_spouse_child_support_paid_c|money:False }}</span>
@@ -41,7 +41,7 @@
         <td class="line-number">D</td>
         <td>Number of children principally resident with Claimant 2 for whom support is claimed</td>
         <td class="amount">
-          <span class="actual">{{ responses.number_of_children_claimant_spouse }}</span>
+          <span class="actual">{{ derived.number_of_children_claimant_spouse }}</span>
         </td>
       </tr>
       <tr>
@@ -55,7 +55,7 @@
         <td class="line-number">F</td>
         <td>
           Guidelines table amount payable by Claimant 1 for
-          {{ responses.number_of_children_claimant|child_or_children }}
+          {{ derived.number_of_children_claimant|child_or_children }}
         </td>
         <td class="amount">$
           <span class="actual">{{ responses.your_child_support_paid_c|money:False }}</span>

edivorce/apps/core/tests/test_logic.py

@@ -1,8 +1,30 @@
+import json
+
 from django.test import TestCase
-from edivorce.apps.core.utils.conditional_logic import get_cleaned_response_value
+
+from edivorce.apps.core.models import BceidUser, UserResponse
+from edivorce.apps.core.utils.conditional_logic import get_cleaned_response_value, get_num_children_living_with
+from edivorce.apps.core.utils.user_response import get_data_for_user
 
 
 class ConditionalLogicTestCase(TestCase):
+    fixtures = ['Question.json']
+
+    def setUp(self):
+        self.user = BceidUser.objects.create(user_guid='1234')
+        self.child_live_with_you = {"child_name": "Child with you", "child_birth_date": "Dec 30, 2018", "child_live_with": "Lives with you", "child_relationship_to_you": "Natural child", "child_relationship_to_spouse": "Natural child", "child_live_with_other_details": ""}
+        self.child_live_with_spouse = {"child_name": "Child with spouse", "child_birth_date": "Jan 4, 2009", "child_live_with": "Lives with spouse", "child_relationship_to_you": "Adopted child", "child_relationship_to_spouse": "Adopted child", "child_live_with_other_details": ""}
+        self.child_live_with_both = {"child_name": "Child with both", "child_birth_date": "Jan 4, 2009", "child_live_with": "Lives with both", "child_relationship_to_you": "Adopted child", "child_relationship_to_spouse": "Adopted child", "child_live_with_other_details": ""}
+
+    def create_response(self, question, value):
+        response, _ = UserResponse.objects.get_or_create(bceid_user=self.user, question_id=question)
+        response.value = value
+        response.save()
+
+    @property
+    def questions_dict(self):
+        return get_data_for_user(self.user)
+
     def test_get_cleaned_response_no_value(self):
         self.assertIsNone(get_cleaned_response_value(None))
         self.assertIsNone(get_cleaned_response_value(''))
@@ -16,3 +38,16 @@ class ConditionalLogicTestCase(TestCase):
         self.assertIsNotNone(get_cleaned_response_value('0'))
         self.assertIsNotNone(get_cleaned_response_value('["hi"]'))
         self.assertIsNotNone(get_cleaned_response_value('[["also known as","a"]]'))
+
+    def test_num_children(self):
+        self.assertEqual(get_num_children_living_with(self.questions_dict, 'Lives with you'), '0')
+        self.assertEqual(get_num_children_living_with(self.questions_dict, 'Lives with spouse'), '0')
+        self.assertEqual(get_num_children_living_with(self.questions_dict, 'Lives with both'), '0')
+
+        children = [self.child_live_with_you, self.child_live_with_spouse, self.child_live_with_spouse,
+                    self.child_live_with_both, self.child_live_with_both, self.child_live_with_both]
+        self.create_response('claimant_children', json.dumps(children))
+
+        self.assertEqual(get_num_children_living_with(self.questions_dict, 'Lives with you'), '1')
+        self.assertEqual(get_num_children_living_with(self.questions_dict, 'Lives with spouse'), '2')
+        self.assertEqual(get_num_children_living_with(self.questions_dict, 'Lives with both'), '3')

edivorce/apps/core/tests/test_step_completeness.py

@@ -520,7 +520,6 @@ class ChildrenStepCompletenessTestCase(TestCase):
         self.assertTrue(self.get_derived_value('fact_sheet_b_error'))
 
         # Basic required fields
-        self.create_response('number_of_children', '1')
         self.create_response('time_spent_with_you', '50')
         self.create_response('time_spent_with_spouse', '50')
         self.create_response('your_child_support_paid_b', '100')
@@ -539,9 +538,7 @@ class ChildrenStepCompletenessTestCase(TestCase):
         self.assertTrue(self.get_derived_value('fact_sheet_c_error'))
 
         # Basic required fields
-        self.create_response('number_of_children_claimant', '1')
         self.create_response('your_spouse_child_support_paid_c', '50')
-        self.create_response('number_of_children_claimant_spouse', '0')
         self.create_response('your_child_support_paid_c', '0')
         self.assertFalse(self.get_derived_value('fact_sheet_c_error'))
 

edivorce/apps/core/utils/conditional_logic.py

@@ -9,6 +9,12 @@ def get_children(questions_dict):
     return json.loads(children_json)
 
 
+def get_num_children_living_with(questions_dict, living_arrangement):
+    assert living_arrangement in ['Lives with you', 'Lives with spouse', 'Lives with both']
+    children = get_children(questions_dict)
+    return str(len([child for child in children if child['child_live_with'] == living_arrangement]))
+
+
 def determine_sole_custody(questions_dict):
     child_list = get_children(questions_dict)
     return (all([child['child_live_with'] == 'Lives with you' for child in child_list]) or

edivorce/apps/core/utils/derived.py

@@ -87,6 +87,9 @@ DERIVED_DATA = [
     'pursuant_parenting_arrangement',
     'pursuant_child_support',
     'sole_custody',
+    'number_of_children',
+    'number_of_children_claimant',
+    'number_of_children_claimant_spouse',
     'any_errors',
 ]
 
@@ -174,12 +177,10 @@ def show_fact_sheet_b(responses, derived):
 
 
 def fact_sheet_b_error(responses, derived):
-    questions = ['number_of_children',
-                 'time_spent_with_you',
+    questions = ['time_spent_with_you',
                  'time_spent_with_spouse',
                  'your_child_support_paid_b',
-                 'your_spouse_child_support_paid_b',
-                 ]
+                 'your_spouse_child_support_paid_b']
     if derived['show_fact_sheet_b']:
         return _any_question_errors(responses, questions)
 
@@ -193,11 +194,7 @@ def show_fact_sheet_c(responses, derived):
 
 
 def fact_sheet_c_error(responses, derived):
-    questions = ['number_of_children_claimant',
-                 'your_spouse_child_support_paid_c',
-                 'number_of_children_claimant_spouse',
-                 'your_child_support_paid_c',
-                 ]
+    questions = ['your_spouse_child_support_paid_c', 'your_child_support_paid_c']
     if derived['show_fact_sheet_c']:
         return _any_question_errors(responses, questions)
 
@@ -750,6 +747,18 @@ def sole_custody(responses, derived):
     return conditional_logic.determine_sole_custody(responses)
 
 
+def number_of_children(responses, derived):
+    return conditional_logic.get_num_children_living_with(responses, 'Lives with both')
+
+
+def number_of_children_claimant(responses, derived):
+    return conditional_logic.get_num_children_living_with(responses, 'Lives with you')
+
+
+def number_of_children_claimant_spouse(responses, derived):
+    return conditional_logic.get_num_children_living_with(responses, 'Lives with spouse')
+
+
 def any_errors(responses, derived):
     for question_key in responses:
         if question_key.endswith('_error'):

edivorce/apps/core/utils/question_step_mapping.py

@@ -60,16 +60,13 @@ children_substep_question_mapping = {
     'facts': {
         'child_support_payor',
         # Fact sheet B
-        'number_of_children',
         'time_spent_with_you',
         'time_spent_with_spouse',
         'your_child_support_paid_b',
         'your_spouse_child_support_paid_b',
         'additional_relevant_spouse_children_info',
         # Fact sheet C
-        'number_of_children_claimant',
         'your_spouse_child_support_paid_c',
-        'number_of_children_claimant_spouse',
         'your_child_support_paid_c',
         # Fact sheet D
         'number_children_over_19_need_support',
@@ -195,16 +192,13 @@ question_step_mapping = {
                       # Payor & Fact Sheets
                       'child_support_payor',
                       # Fact sheet B
-                      'number_of_children',
                       'time_spent_with_you',
                       'time_spent_with_spouse',
                       'your_child_support_paid_b',
                       'your_spouse_child_support_paid_b',
                       'additional_relevant_spouse_children_info',
                       # Fact sheet C
-                      'number_of_children_claimant',
                       'your_spouse_child_support_paid_c',
-                      'number_of_children_claimant_spouse',
                       'your_child_support_paid_c',
                       # Fact sheet D
                       'number_children_over_19_need_support',

edivorce/fixtures/Question.json

@@ -783,23 +783,11 @@
     "model": "core.question",
     "pk": "child_support_payor"
 },
-{
-    "fields": {
-        "name": "Number of children",
-        "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 75,
-        "required": "Conditional",
-        "conditional_target": "determine_shared_custody",
-        "reveal_response": "True"
-    },
-    "model": "core.question",
-    "pk": "number_of_children"
-},
 {
     "fields": {
         "name": "What is the approximate amount of time the children spend with each parent?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 76,
+        "summary_order": 75,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -811,7 +799,7 @@
     "fields": {
         "name": "What is the approximate amount of time the children spend with each parent?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 77,
+        "summary_order": 76,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -823,7 +811,7 @@
     "fields": {
         "name": "What is the 'Guideline' amount for child support?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 78,
+        "summary_order": 77,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -835,7 +823,7 @@
     "fields": {
         "name": "What is the 'Guideline' amount for child support?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 79,
+        "summary_order": 78,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -847,7 +835,7 @@
     "fields": {
         "name": "Any other relevant information regarding the conditions, means, needs and other circumstances of each spouse or of any child for whom support is sought?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 80,
+        "summary_order": 79,
         "required": ""
     },
     "model": "core.question",
@@ -857,29 +845,17 @@
     "fields": {
         "name": "Difference between Guidelines table amounts",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 81,
+        "summary_order": 80,
         "required": ""
     },
     "model": "core.question",
     "pk": "difference_payment_amounts_b"
 },
-{
-    "fields": {
-        "name": "How many children spend more than 60 percent of their time with you and for whom you are asking for support?",
-        "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet C Split Custody",
-        "summary_order": 82,
-        "required": "Conditional",
-        "conditional_target": "determine_split_custody",
-        "reveal_response": "True"
-    },
-    "model": "core.question",
-    "pk": "number_of_children_claimant"
-},
 {
     "fields": {
         "name": "What is the 'Guideline' amount for child support payable by you (as per Federal Child Support Tables)?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet C Split Custody",
-        "summary_order": 83,
+        "summary_order": 81,
         "required": "Conditional",
         "conditional_target": "determine_split_custody",
         "reveal_response": "True"
@@ -887,23 +863,11 @@
     "model": "core.question",
     "pk": "your_child_support_paid_c"
 },
-{
-    "fields": {
-        "name": "How many children spend more than 60 percent of their time with your spouse and for whom you are obliged to pay support?",
-        "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet C Split Custody",
-        "summary_order": 84,
-        "required": "Conditional",
-        "conditional_target": "determine_split_custody",
-        "reveal_response": "True"
-    },
-    "model": "core.question",
-    "pk": "number_of_children_claimant_spouse"
-},
 {
     "fields": {
         "name": "What is the 'Guideline' amount for child support payable by your spouse (as per Federal Child Support Tables)?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet C Split Custody",
-        "summary_order": 85,
+        "summary_order": 82,
         "required": "Conditional",
         "conditional_target": "determine_split_custody",
         "reveal_response": "True"
@@ -915,7 +879,7 @@
     "fields": {
         "name": "Difference between Guidelines table amounts",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet C Split Custody",
-        "summary_order": 86,
+        "summary_order": 83,
         "required": ""
     },
     "model": "core.question",
@@ -925,7 +889,7 @@
     "fields": {
         "name": "How many child(ren) are 19 years or older for whom you are asking for support?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet D Child(ren) 19 Years or Older",
-        "summary_order": 87,
+        "summary_order": 84,
         "required": "Conditional",
         "conditional_target": "determine_child_over_19_supported",
         "reveal_response": "True"
@@ -937,7 +901,7 @@
     "fields": {
         "name": "Do you and your spouse agree that the monthly Guidelines table amount for child support is appropriate?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet D Child(ren) 19 Years or Older",
-        "summary_order": 88,
+        "summary_order": 85,
         "required": "Conditional",
         "conditional_target": "determine_child_over_19_supported",
         "reveal_response": "True"
@@ -949,7 +913,7 @@
     "fields": {
         "name": "What would be the appropriate amount?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet D Child(ren) 19 Years or Older",
-        "summary_order": 89,
+        "summary_order": 86,
         "required": "Conditional",
         "conditional_target": "agree_to_guideline_child_support_amount",
         "reveal_response": "NO"
@@ -961,7 +925,7 @@
     "fields": {
         "name": "Please describe - Why do you think the court should approve your proposed amount?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet D Child(ren) 19 Years or Older",
-        "summary_order": 90,
+        "summary_order": 87,
         "required": "Conditional",
         "conditional_target": "agree_to_guideline_child_support_amount",
         "reveal_response": "NO"
@@ -973,7 +937,7 @@
     "fields": {
         "name": "Are you or your spouse claiming undue hardship?",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 91,
+        "summary_order": 88,
         "required": "Required"
     },
     "model": "core.question",
@@ -983,7 +947,7 @@
     "fields": {
         "name": "Unusual or excessive debts",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 92,
+        "summary_order": 89,
         "required": ""
     },
     "model": "core.question",
@@ -993,7 +957,7 @@
     "fields": {
         "name": "Unusually high expenses for parenting time, contact with, or access to a child.",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 93,
+        "summary_order": 90,
         "required": ""
     },
     "model": "core.question",
@@ -1003,7 +967,7 @@
     "fields": {
         "name": "Supporting another person",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 94,
+        "summary_order": 91,
         "required": ""
     },
     "model": "core.question",
@@ -1013,7 +977,7 @@
     "fields": {
         "name": "Supporting dependent child/children from another relationship.",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 95,
+        "summary_order": 92,
         "required": ""
     },
     "model": "core.question",
@@ -1023,7 +987,7 @@
     "fields": {
         "name": "Support for a disabled or ill person.",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 96,
+        "summary_order": 93,
         "required": ""
     },
     "model": "core.question",
@@ -1033,7 +997,7 @@
     "fields": {
         "name": "Other undue hardship circumstances",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 97,
+        "summary_order": 94,
         "required": ""
     },
     "model": "core.question",
@@ -1043,7 +1007,7 @@
     "fields": {
         "name": "Income of Other Persons in Household",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 98,
+        "summary_order": 95,
         "required": ""
     },
     "model": "core.question",
@@ -1053,7 +1017,7 @@
     "fields": {
         "name": "How many child(ren) are you asking for support?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 99,
+        "summary_order": 96,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1065,7 +1029,7 @@
     "fields": {
         "name": "How many child(ren) are you asking for support?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 100,
+        "summary_order": 97,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1077,7 +1041,7 @@
     "fields": {
         "name": "What is the Child Support Guidelines amount for $150,000?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 101,
+        "summary_order": 98,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1089,7 +1053,7 @@
     "fields": {
         "name": "What is the Child Support Guidelines amount for $150,000?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 102,
+        "summary_order": 99,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1101,7 +1065,7 @@
     "fields": {
         "name": "What is the % of income over $150,000 from the Child Support Guidlines?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 103,
+        "summary_order": 100,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1113,7 +1077,7 @@
     "fields": {
         "name": "What is the % of income over $150,000 from the Child Support Guidlines?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 104,
+        "summary_order": 101,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1125,7 +1089,7 @@
     "fields": {
         "name": "What is the child support amount to be paid on the portion of income over $150,000?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 105,
+        "summary_order": 102,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1137,7 +1101,7 @@
     "fields": {
         "name": "What is the child support amount to be paid on the portion of income over $150,000?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 106,
+        "summary_order": 103,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1149,7 +1113,7 @@
     "fields": {
         "name": "Guidelines table amount",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 107,
+        "summary_order": 104,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1161,7 +1125,7 @@
     "fields": {
         "name": "Guidelines table amount",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 108,
+        "summary_order": 105,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1173,7 +1137,7 @@
     "fields": {
         "name": "Do you and your spouse agree that amount is he child support amount?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 109,
+        "summary_order": 106,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1185,7 +1149,7 @@
     "fields": {
         "name": "Do you and your spouse agree that amount is he child support amount?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 110,
+        "summary_order": 107,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1197,7 +1161,7 @@
     "fields": {
         "name": "What is the amount that you and your spouse have agreed to (that differs from the Child Support Guidelines table amount)?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 111,
+        "summary_order": 108,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_you",
         "reveal_response": "NO"
@@ -1209,7 +1173,7 @@
     "fields": {
         "name": "What is the amount that you and your spouse have agreed to (that differs from the Child Support Guidelines table amount)?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 112,
+        "summary_order": 109,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_spouse",
         "reveal_response": "NO"
@@ -1221,7 +1185,7 @@
     "fields": {
         "name": "Why do you think the court should approve your proposed amount?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 113,
+        "summary_order": 110,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_you",
         "reveal_response": "NO"
@@ -1233,7 +1197,7 @@
     "fields": {
         "name": "Why do you think the court should approve your proposed amount?",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 114,
+        "summary_order": 111,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_spouse",
         "reveal_response": "NO"
@@ -1245,7 +1209,7 @@
     "fields": {
         "name": "Is medical coverage available for the children?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 115,
+        "summary_order": 112,
         "required": "Required"
     },
     "model": "core.question",
@@ -1255,7 +1219,7 @@
     "fields": {
         "name": "Whose plan is the coverage under?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 116,
+        "summary_order": 113,
         "required": "Conditional",
         "conditional_target": "medical_coverage_available",
         "reveal_response": "YES"
@@ -1267,7 +1231,7 @@
     "fields": {
         "name": "Are there any child support payments (in arrears) that have not been paid (as of today's date) under an existing order or written agreement?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 117,
+        "summary_order": 114,
         "required": "Required"
     },
     "model": "core.question",
@@ -1277,7 +1241,7 @@
     "fields": {
         "name": "What is the amount as of today's date?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 118,
+        "summary_order": 115,
         "required": "Conditional",
         "conditional_target": "child_support_payments_in_arrears",
         "reveal_response": "YES"
@@ -1289,7 +1253,7 @@
     "fields": {
         "name": "What is the monthly child support amount proposed in the order to be paid by",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 119,
+        "summary_order": 116,
         "required": "Required"
     },
     "model": "core.question",
@@ -1299,7 +1263,7 @@
     "fields": {
         "name": "What is the monthly child support amount proposed in the order to be paid by",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 120,
+        "summary_order": 117,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "DIFF"
@@ -1311,7 +1275,7 @@
     "fields": {
         "name": "We are not asking for child support to be included in the order",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 121,
+        "summary_order": 118,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "NO"
@@ -1323,7 +1287,7 @@
     "fields": {
         "name": "Do you and the other parent agree (have consented) on the child support amount?",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 122,
+        "summary_order": 119,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "DIFF"
@@ -1335,7 +1299,7 @@
     "fields": {
         "name": "What special provisions have been made?",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 123,
+        "summary_order": 120,
         "required": "Conditional",
         "conditional_target": "claimants_agree_to_child_support_amount",
         "reveal_response": "NO"
@@ -1347,7 +1311,7 @@
     "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": 124,
+        "summary_order": 121,
         "required": "Required"
     },
     "model": "core.question",
@@ -1357,7 +1321,7 @@
     "fields": {
         "name": "Do you have an order about support of the children?",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 125,
+        "summary_order": 122,
         "required": "Required"
     },
     "model": "core.question",
@@ -1367,7 +1331,7 @@
     "fields": {
         "name": "The court needs to know what the current parenting arrangements are for the children of the marriage. Please describe below.",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 126,
+        "summary_order": 123,
         "required": "Required"
     },
     "model": "core.question",
@@ -1377,7 +1341,7 @@
     "fields": {
         "name": "Are you asking the court for an order about parenting arrangements or contact with a child?",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 127,
+        "summary_order": 124,
         "required": "Required"
     },
     "model": "core.question",
@@ -1387,7 +1351,7 @@
     "fields": {
         "name": "Please indicate the parenting arrangements you are asking for below.",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 128,
+        "summary_order": 125,
         "required": "Conditional",
         "conditional_target": "want_parenting_arrangements",
         "reveal_response": "YES"
@@ -1399,7 +1363,7 @@
     "fields": {
         "name": "If you are asking for an order for child support please describe what you are asking for.",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 129,
+        "summary_order": 126,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "!NO"
@@ -1411,7 +1375,7 @@
     "fields": {
         "name": "Please indicate which act you are asking for support under.",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 130,
+        "summary_order": 127,
         "required": "Conditional",
         "conditional_target": "determine_child_support_act_requirement",
         "reveal_response": "True"
@@ -1423,7 +1387,7 @@
     "fields": {
         "name": "How have you and your spouse agreed to deal with your property and debt?",
         "description": "For step 7, Form 1 6. Property and debt",
-        "summary_order": 131,
+        "summary_order": 128,
         "required": "Required"
     },
     "model": "core.question",
@@ -1433,7 +1397,7 @@
     "fields": {
         "name": "Please describe how you and your spouse plan to divide your property, assets and your debts.",
         "description": "For step 7, Form 1 6. Property and debt",
-        "summary_order": 132,
+        "summary_order": 129,
         "required": "Conditional",
         "conditional_target": "deal_with_property_debt",
         "reveal_response": "Unequal division"
@@ -1445,7 +1409,7 @@
     "fields": {
         "name": "Please list any other property claims.",
         "description": "For step 7, Form 1 6. Property and debt",
-        "summary_order": 133,
+        "summary_order": 130,
         "required": ""
     },
     "model": "core.question",
@@ -1455,7 +1419,7 @@
     "fields": {
         "name": "Please enter the details for any other orders that you are asking for.",
         "description": "For step 8 other orders, Form 1 7. Other",
-        "summary_order": 134,
+        "summary_order": 131,
         "required": ""
     },
     "model": "core.question",
@@ -1465,7 +1429,7 @@
     "fields": {
         "name": "What is the best address to send you official court documents?",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 135,
+        "summary_order": 132,
         "required": "Required"
     },
     "model": "core.question",
@@ -1475,7 +1439,7 @@
     "fields": {
         "name": "City",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 136,
+        "summary_order": 133,
         "required": "Required"
     },
     "model": "core.question",
@@ -1485,7 +1449,7 @@
     "fields": {
         "name": "Prov",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 137,
+        "summary_order": 134,
         "required": ""
     },
     "model": "core.question",
@@ -1495,7 +1459,7 @@
     "fields": {
         "name": "Country",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 138,
+        "summary_order": 135,
         "required": "Required"
     },
     "model": "core.question",
@@ -1505,7 +1469,7 @@
     "fields": {
         "name": "Other Country",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 139,
+        "summary_order": 136,
         "required": "Conditional",
         "conditional_target": "address_to_send_official_document_country_you",
         "reveal_response": "Other"
@@ -1517,7 +1481,7 @@
     "fields": {
         "name": "Postal code",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 140,
+        "summary_order": 137,
         "required": ""
     },
     "model": "core.question",
@@ -1527,7 +1491,7 @@
     "fields": {
         "name": "Fax number",
         "description": "For step 9, Form 1 8. Claimants' addresses for service",
-        "summary_order": 141,
+        "summary_order": 138,
         "required": ""
     },
     "model": "core.question",
@@ -1537,7 +1501,7 @@
     "fields": {
         "name": "Email",
         "description": "For step 9, Form 1 8. Claimants' addresses for service",
-        "summary_order": 142,
+        "summary_order": 139,
         "required": ""
     },
     "model": "core.question",
@@ -1547,7 +1511,7 @@
     "fields": {
         "name": "What is the best address to send your spouse official court documents?",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 143,
+        "summary_order": 140,
         "required": "Required"
     },
     "model": "core.question",
@@ -1557,7 +1521,7 @@
     "fields": {
         "name": "City",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 144,
+        "summary_order": 141,
         "required": "Required"
     },
     "model": "core.question",
@@ -1567,7 +1531,7 @@
     "fields": {
         "name": "Prov",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 145,
+        "summary_order": 142,
         "required": ""
     },
     "model": "core.question",
@@ -1577,7 +1541,7 @@
     "fields": {
         "name": "Country",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 146,
+        "summary_order": 143,
         "required": "Required"
     },
     "model": "core.question",
@@ -1587,7 +1551,7 @@
     "fields": {
         "name": "Other Country",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 147,
+        "summary_order": 144,
         "required": "Conditional",
         "conditional_target": "address_to_send_official_document_country_spouse",
         "reveal_response": "Other"
@@ -1599,7 +1563,7 @@
     "fields": {
         "name": "Postal code",
         "description": "For step 9, Form 1 8. Claimants' addresses for service",
-        "summary_order": 148,
+        "summary_order": 145,
         "required": ""
     },
     "model": "core.question",
@@ -1609,7 +1573,7 @@
     "fields": {
         "name": "Fax number",
         "description": "For step 9, Form 1 8. Claimants' addresses for service",
-        "summary_order": 149,
+        "summary_order": 146,
         "required": ""
     },
     "model": "core.question",
@@ -1619,7 +1583,7 @@
     "fields": {
         "name": "Email",
         "description": "For step 9, Form 1 8. Claimants' addresses for service",
-        "summary_order": 150,
+        "summary_order": 147,
         "required": ""
     },
     "model": "core.question",
@@ -1629,7 +1593,7 @@
     "fields": {
         "name": "Divorce is to take effect on",
         "description": "For step 9, Form 52 This Court Orders that",
-        "summary_order": 151,
+        "summary_order": 148,
         "required": "Required"
     },
     "model": "core.question",
@@ -1639,7 +1603,7 @@
     "fields": {
         "name": "Divorce is to take effect on specific date",
         "description": "For step 9 - specific date, Form 52 This Court Orders that",
-        "summary_order": 152,
+        "summary_order": 149,
         "required": "Conditional",
         "conditional_target": "divorce_take_effect_on",
         "reveal_response": "specific date"
@@ -1651,7 +1615,7 @@
     "fields": {
         "name": "Where will you be filing for divorce?",
         "description": "For step 10, Form 1 court registry, Form 35 court registry, Form 36 court registry, Form 38(joint and sole) court registry, Form 52 court registry",
-        "summary_order": 153,
+        "summary_order": 150,
         "required": "Required"
     },
     "model": "core.question",
@@ -1661,7 +1625,7 @@
     "fields": {
         "name": "Are you asking for a name change?",
         "description": "For Step 10, Forms 38 and 52's Orders sections",
-        "summary_order": 154,
+        "summary_order": 151,
         "required": "Required"
     },
     "model": "core.question",
@@ -1671,7 +1635,7 @@
     "fields": {
         "name": "Please enter the full name",
         "description": "For Step 10, Forms 38 and 52's Orders sections",
-        "summary_order": 155,
+        "summary_order": 152,
         "required": "Conditional",
         "conditional_target": "name_change_you",
         "reveal_response": "YES"
@@ -1683,7 +1647,7 @@
     "fields": {
         "name": "Is your spouse asking for a name change?",
         "description": "For Step 10, Forms 38 and 52's Orders sections",
-        "summary_order": 156,
+        "summary_order": 153,
         "required": "Required"
     },
     "model": "core.question",
@@ -1693,7 +1657,7 @@
     "fields": {
         "name": "Please enter the full name",
         "description": "For Step 10, Forms 38 and 52's Orders sections",
-        "summary_order": 157,
+        "summary_order": 154,
         "required": "Conditional",
         "conditional_target": "name_change_spouse",
         "reveal_response": "YES"
@@ -1705,7 +1669,7 @@
     "fields": {
         "name": "Select how you would like to swear/affirm your affidavit(s)?",
         "description": "E-filing prototype",
-        "summary_order": 158,
+        "summary_order": 155,
         "required": ""
     },
     "model": "core.question",
@@ -1715,7 +1679,7 @@
     "fields": {
         "name": "Select how you would like to file your documents",
         "description": "E-filing prototype",
-        "summary_order": 159,
+        "summary_order": 156,
         "required": ""
     },
     "model": "core.question",
@@ -1725,7 +1689,7 @@
     "fields": {
         "name": "Select where you would like to swear/affirm your affidavit(s)",
         "description": "E-filing prototype",
-        "summary_order": 160,
+        "summary_order": 157,
         "required": ""
     },
     "model": "core.question",
@@ -1735,7 +1699,7 @@
     "fields": {
         "name": "Select where you would like to swear/affirm your affidavit(s)",
         "description": "E-filing prototype",
-        "summary_order": 161,
+        "summary_order": 158,
         "required": ""
     },
     "model": "core.question",
@@ -1745,7 +1709,7 @@
     "fields": {
         "name": "Select where your spouse would like to swear/affirm your affidavit(s)",
         "description": "E-filing prototype",
-        "summary_order": 162,
+        "summary_order": 159,
         "required": ""
     },
     "model": "core.question",
@@ -1755,7 +1719,7 @@
     "fields": {
         "name": "E-mail Address for You",
         "description": "E-filing prototype",
-        "summary_order": 163,
+        "summary_order": 160,
         "required": ""
     },
     "model": "core.question",
@@ -1765,7 +1729,7 @@
     "fields": {
         "name": "E-mail Address for Your Spouse",
         "description": "E-filing prototype",
-        "summary_order": 164,
+        "summary_order": 161,
         "required": ""
     },
     "model": "core.question",