DIV-1170: Update Question.json and add management commands to generate it

edivorce/apps/core/management/commands/questions_to_csv.py

@@ -0,0 +1,35 @@
+import csv
+import json
+import os
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Export Questions.json as Questions.csv'
+
+    def handle(self, *args, **options):
+        json_path = os.path.join(settings.PROJECT_ROOT, 'edivorce/fixtures/Question.json')
+        with open(json_path, 'r') as file:
+            all_lines = [line for line in file.readlines()]
+            questions = json.loads('\n'.join(all_lines))
+            print(questions)
+
+        csv_path = os.path.join(settings.PROJECT_ROOT.parent, 'Question.csv')
+        with open(csv_path, 'w') as file:
+            field_names = ['description', 'key', 'name', 'summary_order', 'required', 'conditional_target', 'reveal_response']
+            writer = csv.DictWriter(file, field_names)
+            writer.writeheader()
+            dicts = []
+            for question in questions:
+                dicts.append({
+                    'description': question['fields']['description'],
+                    'key': question['pk'],
+                    'name': question['fields']['name'],
+                    'summary_order': question['fields']['summary_order'],
+                    'required': question['fields'].get('required', ''),
+                    'conditional_target': question['fields'].get('conditional_target', ''),
+                    'reveal_response': question['fields'].get('reveal_response', ''),
+                })
+            writer.writerows(dicts)

edivorce/apps/core/management/commands/questions_to_json.py

@@ -0,0 +1,40 @@
+import csv
+import json
+import os
+
+from django.conf import settings
+from django.core.management.base import BaseCommand
+
+
+class Command(BaseCommand):
+    help = 'Export Questions.csv as Questions.json'
+
+    def handle(self, *args, **options):
+        csv_path = os.path.join(settings.PROJECT_ROOT.parent, 'Question.csv')
+        with open(csv_path, 'r') as file:
+            reader = csv.DictReader(file)
+            dicts = [line for line in reader]
+
+        json_path = os.path.join(settings.PROJECT_ROOT, 'edivorce/fixtures/Question.json')
+        with open(json_path, 'w') as file:
+            json_questions = []
+            for line in dicts:
+                question_dict = {
+                    "fields": {
+                        "name": line['name'],
+                        "description": line['description'],
+                        "summary_order": int(line['summary_order']),
+                        "required": line['required'],
+                    },
+                    "model": "core.question",
+                    "pk": line['key']
+                }
+                if line['conditional_target']:
+                    question_dict["fields"]["conditional_target"] = line['conditional_target']
+                    reveal_response = line['reveal_response']
+                    if reveal_response.lower() == 'true':
+                        reveal_response = reveal_response.capitalize()
+                    question_dict["fields"]["reveal_response"] = reveal_response
+                json_questions.append(question_dict)
+            file.write(json.dumps(json_questions, indent=4))
+            file.write('\n')

edivorce/apps/core/utils/user_response.py

@@ -73,7 +73,7 @@ def _condition_met(target_response, reveal_response):
         if reveal_response.startswith('!'):
             if target_response == "" or target_response.lower() == reveal_response[1:].lower():
                 return False
-        elif str(target_response) != reveal_response:
+        elif str(target_response).lower() != reveal_response.lower():
             return False
     elif numeric_condition_met is False:
         return False

edivorce/fixtures/Question.json

@@ -487,35 +487,11 @@
     "model": "core.question",
     "pk": "no_collusion"
 },
-{
-    "fields": {
-        "name": "You and your spouse are asking for an order for spousal support as follows",
-        "description": "For step 6, Form 1 5. Spousal support",
-        "summary_order": 47,
-        "required": "Conditional",
-        "conditional_target": "determine_spousal_support_orders_wanted",
-        "reveal_response": "True"
-    },
-    "model": "core.question",
-    "pk": "spouse_support_details"
-},
-{
-    "fields": {
-        "name": "Please indicate which act you are asking for support under.",
-        "description": "For step 6, Form 1 5. Spousal support",
-        "summary_order": 48,
-        "required": "Conditional",
-        "conditional_target": "determine_spousal_support_orders_wanted",
-        "reveal_response": "True"
-    },
-    "model": "core.question",
-    "pk": "spouse_support_act"
-},
 {
     "fields": {
         "name": "Your children",
         "description": "For Step 6, Your children - Children details",
-        "summary_order": 49,
+        "summary_order": 47,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -527,7 +503,7 @@
     "fields": {
         "name": "How will you and your spouse be determining your income?",
         "description": "For Step 6, Your children - Income & expenses",
-        "summary_order": 50,
+        "summary_order": 48,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -539,7 +515,7 @@
     "fields": {
         "name": "What is your annual gross income as determined above?",
         "description": "For Step 6, Your children - Income & expenses",
-        "summary_order": 51,
+        "summary_order": 49,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -551,7 +527,7 @@
     "fields": {
         "name": "What is your spouse's annual gross income as determined above?",
         "description": "For Step 6, Your children - Income & expenses",
-        "summary_order": 52,
+        "summary_order": 50,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -563,7 +539,7 @@
     "fields": {
         "name": "What is the monthly child support amount (as per Schedule 1 of the guidelines) that is payable?",
         "description": "For Step 6, Your children - Income & expenses",
-        "summary_order": 53,
+        "summary_order": 51,
         "required": "Conditional",
         "conditional_target": "determine_sole_custody",
         "reveal_response": "True"
@@ -575,7 +551,7 @@
     "fields": {
         "name": "Are you claiming any special and extraordinary expenses?",
         "description": "For Step 6, Your children - Income & expenses",
-        "summary_order": 54,
+        "summary_order": 52,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -587,7 +563,7 @@
     "fields": {
         "name": "Child care expenses for when the recipient works or goes to school",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 55,
+        "summary_order": 53,
         "required": "Conditional",
         "conditional_target": "determine_missing_extraordinary_expenses",
         "reveal_response": "True"
@@ -599,7 +575,7 @@
     "fields": {
         "name": "Annual child care expenses for when the recipient works or goes to school",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 56,
+        "summary_order": 54,
         "required": "Conditional"
     },
     "model": "core.question",
@@ -609,7 +585,7 @@
     "fields": {
         "name": "Any healthcare premiums you pay to your employer or other provider to provide the coverage to your children rather than yourself",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 57,
+        "summary_order": 55,
         "required": "Conditional",
         "conditional_target": "determine_missing_extraordinary_expenses",
         "reveal_response": "True"
@@ -621,7 +597,7 @@
     "fields": {
         "name": "Any annual healthcare premiums you pay to your employer or other provider to provide the coverage to your children rather than yourself",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 58,
+        "summary_order": 56,
         "required": ""
     },
     "model": "core.question",
@@ -631,7 +607,7 @@
     "fields": {
         "name": "Health related expenses that exceed insurance reimbursement by at least $100",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 59,
+        "summary_order": 57,
         "required": "Conditional",
         "conditional_target": "determine_missing_extraordinary_expenses",
         "reveal_response": "True"
@@ -643,7 +619,7 @@
     "fields": {
         "name": "Annual health related expenses that exceed insurance reimbursement by at least $100",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 60,
+        "summary_order": 58,
         "required": ""
     },
     "model": "core.question",
@@ -653,7 +629,7 @@
     "fields": {
         "name": "Extraordinary primary, secondary or other educational expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 61,
+        "summary_order": 59,
         "required": "Conditional",
         "conditional_target": "determine_missing_extraordinary_expenses",
         "reveal_response": "True"
@@ -665,7 +641,7 @@
     "fields": {
         "name": "Annual extraordinary primary, secondary or other educational expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 62,
+        "summary_order": 60,
         "required": ""
     },
     "model": "core.question",
@@ -675,7 +651,7 @@
     "fields": {
         "name": "Post-secondary school expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 63,
+        "summary_order": 61,
         "required": "Conditional",
         "conditional_target": "determine_missing_extraordinary_expenses",
         "reveal_response": "True"
@@ -687,7 +663,7 @@
     "fields": {
         "name": "Annual Post-secondary school expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 64,
+        "summary_order": 62,
         "required": ""
     },
     "model": "core.question",
@@ -697,7 +673,7 @@
     "fields": {
         "name": "Extraordinary extracurricular activities expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 65,
+        "summary_order": 63,
         "required": "Conditional",
         "conditional_target": "determine_missing_extraordinary_expenses",
         "reveal_response": "True"
@@ -709,7 +685,7 @@
     "fields": {
         "name": "Annual extraordinary extracurricular activities expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 66,
+        "summary_order": 64,
         "required": ""
     },
     "model": "core.question",
@@ -719,7 +695,7 @@
     "fields": {
         "name": "Total section 7 expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 67,
+        "summary_order": 65,
         "required": ""
     },
     "model": "core.question",
@@ -729,7 +705,7 @@
     "fields": {
         "name": "Annual total section 7 expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 68,
+        "summary_order": 66,
         "required": ""
     },
     "model": "core.question",
@@ -739,7 +715,7 @@
     "fields": {
         "name": "Your proportionate share",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 69,
+        "summary_order": 67,
         "required": ""
     },
     "model": "core.question",
@@ -749,7 +725,7 @@
     "fields": {
         "name": "Your proportionate share",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 70,
+        "summary_order": 68,
         "required": ""
     },
     "model": "core.question",
@@ -759,7 +735,7 @@
     "fields": {
         "name": "Spouse's proportionate share",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 71,
+        "summary_order": 69,
         "required": ""
     },
     "model": "core.question",
@@ -769,7 +745,7 @@
     "fields": {
         "name": "Spouse's proportionate share",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 72,
+        "summary_order": 70,
         "required": ""
     },
     "model": "core.question",
@@ -779,7 +755,7 @@
     "fields": {
         "name": "Please describe the order you are asking for regarding Special and Extraordinary Expenses",
         "description": "For Step 6, Your children - Income & expenses - Fact Sheet A - Extraordinary Expenses",
-        "summary_order": 73,
+        "summary_order": 71,
         "required": "Conditional",
         "conditional_target": "special_extraordinary_expenses",
         "reveal_response": "YES"
@@ -791,7 +767,7 @@
     "fields": {
         "name": "Who is the payor?",
         "description": "For Step 6, Your children - Payor & fact sheets",
-        "summary_order": 74,
+        "summary_order": 72,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -803,7 +779,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": 75,
+        "summary_order": 73,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -815,7 +791,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": 76,
+        "summary_order": 74,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -827,7 +803,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": 77,
+        "summary_order": 75,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -839,7 +815,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": 76,
         "required": "Conditional",
         "conditional_target": "determine_shared_custody",
         "reveal_response": "True"
@@ -851,7 +827,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": 79,
+        "summary_order": 77,
         "required": ""
     },
     "model": "core.question",
@@ -861,7 +837,7 @@
     "fields": {
         "name": "Difference between Guidelines table amounts",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet B Shared Custody",
-        "summary_order": 80,
+        "summary_order": 78,
         "required": ""
     },
     "model": "core.question",
@@ -871,7 +847,7 @@
     "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": 81,
+        "summary_order": 79,
         "required": "Conditional",
         "conditional_target": "determine_split_custody",
         "reveal_response": "True"
@@ -883,7 +859,7 @@
     "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": 82,
+        "summary_order": 80,
         "required": "Conditional",
         "conditional_target": "determine_split_custody",
         "reveal_response": "True"
@@ -895,7 +871,7 @@
     "fields": {
         "name": "Difference between Guidelines table amounts",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet C Split Custody",
-        "summary_order": 83,
+        "summary_order": 81,
         "required": ""
     },
     "model": "core.question",
@@ -905,7 +881,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": 84,
+        "summary_order": 82,
         "required": "Conditional",
         "conditional_target": "determine_child_over_19_supported",
         "reveal_response": "True"
@@ -917,7 +893,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": 85,
+        "summary_order": 83,
         "required": "Conditional",
         "conditional_target": "determine_child_over_19_supported",
         "reveal_response": "True"
@@ -929,7 +905,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": 86,
+        "summary_order": 84,
         "required": "Conditional",
         "conditional_target": "agree_to_guideline_child_support_amount",
         "reveal_response": "NO"
@@ -941,7 +917,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": 87,
+        "summary_order": 85,
         "required": "Conditional",
         "conditional_target": "agree_to_guideline_child_support_amount",
         "reveal_response": "NO"
@@ -953,7 +929,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": 88,
+        "summary_order": 86,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -965,7 +941,7 @@
     "fields": {
         "name": "Unusual or excessive debts",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 89,
+        "summary_order": 87,
         "required": ""
     },
     "model": "core.question",
@@ -975,7 +951,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": 90,
+        "summary_order": 88,
         "required": ""
     },
     "model": "core.question",
@@ -985,7 +961,7 @@
     "fields": {
         "name": "Supporting another person",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 91,
+        "summary_order": 89,
         "required": ""
     },
     "model": "core.question",
@@ -995,7 +971,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": 92,
+        "summary_order": 90,
         "required": ""
     },
     "model": "core.question",
@@ -1005,7 +981,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": 93,
+        "summary_order": 91,
         "required": ""
     },
     "model": "core.question",
@@ -1015,7 +991,7 @@
     "fields": {
         "name": "Other undue hardship circumstances",
         "description": "For Step 6, Your children - Payor & fact sheets - Fact Sheet E - Undue hardship",
-        "summary_order": 94,
+        "summary_order": 92,
         "required": ""
     },
     "model": "core.question",
@@ -1025,7 +1001,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": 95,
+        "summary_order": 93,
         "required": ""
     },
     "model": "core.question",
@@ -1035,7 +1011,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": 96,
+        "summary_order": 94,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1047,7 +1023,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": 97,
+        "summary_order": 95,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1059,7 +1035,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": 98,
+        "summary_order": 96,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1071,7 +1047,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": 99,
+        "summary_order": 97,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1083,7 +1059,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": 100,
+        "summary_order": 98,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1095,7 +1071,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": 101,
+        "summary_order": 99,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1107,7 +1083,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": 102,
+        "summary_order": 100,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1119,7 +1095,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": 103,
+        "summary_order": 101,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1131,7 +1107,7 @@
     "fields": {
         "name": "Guidelines table amount",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 104,
+        "summary_order": 102,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1143,7 +1119,7 @@
     "fields": {
         "name": "Guidelines table amount",
         "description": "For Step 6, Your children - Payor & fact sheets - Your Fact Sheet F",
-        "summary_order": 105,
+        "summary_order": 103,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1155,7 +1131,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": 106,
+        "summary_order": 104,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_you",
         "reveal_response": "True"
@@ -1167,7 +1143,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": 107,
+        "summary_order": 105,
         "required": "Conditional",
         "conditional_target": "determine_show_fact_sheet_f_spouse",
         "reveal_response": "True"
@@ -1179,7 +1155,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": 108,
+        "summary_order": 106,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_you",
         "reveal_response": "NO"
@@ -1191,7 +1167,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": 109,
+        "summary_order": 107,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_spouse",
         "reveal_response": "NO"
@@ -1203,7 +1179,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": 110,
+        "summary_order": 108,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_you",
         "reveal_response": "NO"
@@ -1215,7 +1191,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": 111,
+        "summary_order": 109,
         "required": "Conditional",
         "conditional_target": "agree_to_child_support_amount_spouse",
         "reveal_response": "NO"
@@ -1227,7 +1203,7 @@
     "fields": {
         "name": "Is medical coverage available for the children?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 112,
+        "summary_order": 110,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -1239,7 +1215,7 @@
     "fields": {
         "name": "Whose plan is the coverage under?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 113,
+        "summary_order": 111,
         "required": "Conditional",
         "conditional_target": "medical_coverage_available",
         "reveal_response": "YES"
@@ -1251,7 +1227,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": 114,
+        "summary_order": 112,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -1263,7 +1239,7 @@
     "fields": {
         "name": "What is the amount as of today's date?",
         "description": "For Step 6, Your children - Payor & medical expenses",
-        "summary_order": 115,
+        "summary_order": 113,
         "required": "Conditional",
         "conditional_target": "child_support_payments_in_arrears",
         "reveal_response": "YES"
@@ -1275,7 +1251,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": 116,
+        "summary_order": 114,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -1287,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": 117,
+        "summary_order": 115,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "DIFF"
@@ -1299,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": 118,
+        "summary_order": 116,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "NO"
@@ -1311,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": 119,
+        "summary_order": 117,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "DIFF"
@@ -1323,7 +1299,7 @@
     "fields": {
         "name": "What special provisions have been made?",
         "description": "For Step 6, Your children - What are you asking for",
-        "summary_order": 120,
+        "summary_order": 118,
         "required": "Conditional",
         "conditional_target": "claimants_agree_to_child_support_amount",
         "reveal_response": "NO"
@@ -1335,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": 121,
+        "summary_order": 119,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -1347,7 +1323,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": 122,
+        "summary_order": 120,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "YES"
@@ -1359,7 +1335,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": 123,
+        "summary_order": 121,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -1371,7 +1347,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": 124,
+        "summary_order": 122,
         "required": "Conditional",
         "conditional_target": "determine_has_children_of_marriage",
         "reveal_response": "True"
@@ -1383,7 +1359,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": 125,
+        "summary_order": 123,
         "required": "Conditional",
         "conditional_target": "want_parenting_arrangements",
         "reveal_response": "YES"
@@ -1395,7 +1371,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": 126,
+        "summary_order": 124,
         "required": "Conditional",
         "conditional_target": "child_support_in_order",
         "reveal_response": "!NO"
@@ -1407,7 +1383,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": 127,
+        "summary_order": 125,
         "required": "Conditional",
         "conditional_target": "determine_child_support_act_requirement",
         "reveal_response": "True"
@@ -1415,10 +1391,34 @@
     "model": "core.question",
     "pk": "child_support_act"
 },
+{
+    "fields": {
+        "name": "You and your spouse are asking for an order for spousal support as follows",
+        "description": "For step 7, Form 1 5. Spousal support",
+        "summary_order": 126,
+        "required": "Conditional",
+        "conditional_target": "determine_spousal_support_orders_wanted",
+        "reveal_response": "True"
+    },
+    "model": "core.question",
+    "pk": "spouse_support_details"
+},
+{
+    "fields": {
+        "name": "Please indicate which act you are asking for support under.",
+        "description": "For step 7, Form 1 5. Spousal support",
+        "summary_order": 127,
+        "required": "Conditional",
+        "conditional_target": "determine_spousal_support_orders_wanted",
+        "reveal_response": "True"
+    },
+    "model": "core.question",
+    "pk": "spouse_support_act"
+},
 {
     "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",
+        "description": "For step 8, Form 1 6. Property and debt",
         "summary_order": 128,
         "required": "Conditional",
         "conditional_target": "determine_property_debt_orders_wanted",
@@ -1430,7 +1430,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",
+        "description": "For step 8, Form 1 6. Property and debt",
         "summary_order": 129,
         "required": "Conditional",
         "conditional_target": "deal_with_property_debt",
@@ -1442,7 +1442,7 @@
 {
     "fields": {
         "name": "Please list any other property claims.",
-        "description": "For step 7, Form 1 6. Property and debt",
+        "description": "For step 8, Form 1 6. Property and debt",
         "summary_order": 130,
         "required": ""
     },
@@ -1452,7 +1452,7 @@
 {
     "fields": {
         "name": "Are you asking for a name change?",
-        "description": "For Step 10, Forms 38 and 52's Orders sections",
+        "description": "For Step 9, Forms 38 and 52's Orders sections",
         "summary_order": 131,
         "required": "Conditional",
         "conditional_target": "determine_other_orders_wanted",
@@ -1464,7 +1464,7 @@
 {
     "fields": {
         "name": "Please enter the full name",
-        "description": "For Step 10, Forms 38 and 52's Orders sections",
+        "description": "For Step 9, Forms 38 and 52's Orders sections",
         "summary_order": 132,
         "required": "Conditional",
         "conditional_target": "name_change_you",
@@ -1476,7 +1476,7 @@
 {
     "fields": {
         "name": "Is your spouse asking for a name change?",
-        "description": "For Step 10, Forms 38 and 52's Orders sections",
+        "description": "For Step 9, Forms 38 and 52's Orders sections",
         "summary_order": 133,
         "required": "Conditional",
         "conditional_target": "determine_other_orders_wanted",
@@ -1488,7 +1488,7 @@
 {
     "fields": {
         "name": "Please enter the full name",
-        "description": "For Step 10, Forms 38 and 52's Orders sections",
+        "description": "For Step 9, Forms 38 and 52's Orders sections",
         "summary_order": 134,
         "required": "Conditional",
         "conditional_target": "name_change_spouse",
@@ -1500,7 +1500,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",
+        "description": "For step 9, other orders, Form 1 7. Other",
         "summary_order": 135,
         "required": ""
     },
@@ -1510,7 +1510,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",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 136,
         "required": "Required"
     },
@@ -1520,7 +1520,7 @@
 {
     "fields": {
         "name": "City",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 137,
         "required": "Required"
     },
@@ -1530,7 +1530,7 @@
 {
     "fields": {
         "name": "Prov",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 138,
         "required": ""
     },
@@ -1540,7 +1540,7 @@
 {
     "fields": {
         "name": "Country",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 139,
         "required": "Required"
     },
@@ -1550,7 +1550,7 @@
 {
     "fields": {
         "name": "Other Country",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 140,
         "required": "Conditional",
         "conditional_target": "address_to_send_official_document_country_you",
@@ -1562,7 +1562,7 @@
 {
     "fields": {
         "name": "Postal code",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 141,
         "required": ""
     },
@@ -1572,7 +1572,7 @@
 {
     "fields": {
         "name": "Fax number",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service",
         "summary_order": 142,
         "required": ""
     },
@@ -1582,7 +1582,7 @@
 {
     "fields": {
         "name": "Email",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service",
         "summary_order": 143,
         "required": ""
     },
@@ -1592,7 +1592,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",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 144,
         "required": "Required"
     },
@@ -1602,7 +1602,7 @@
 {
     "fields": {
         "name": "City",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 145,
         "required": "Required"
     },
@@ -1612,7 +1612,7 @@
 {
     "fields": {
         "name": "Prov",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 146,
         "required": ""
     },
@@ -1622,7 +1622,7 @@
 {
     "fields": {
         "name": "Country",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 147,
         "required": "Required"
     },
@@ -1632,7 +1632,7 @@
 {
     "fields": {
         "name": "Other Country",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 148,
         "required": "Conditional",
         "conditional_target": "address_to_send_official_document_country_spouse",
@@ -1644,7 +1644,7 @@
 {
     "fields": {
         "name": "Postal code",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
         "summary_order": 149,
         "required": ""
     },
@@ -1654,7 +1654,7 @@
 {
     "fields": {
         "name": "Fax number",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service",
         "summary_order": 150,
         "required": ""
     },
@@ -1664,7 +1664,7 @@
 {
     "fields": {
         "name": "Email",
-        "description": "For step 9, Form 1 8. Claimants' addresses for service",
+        "description": "For step 10, Form 1 8. Claimants' addresses for service",
         "summary_order": 151,
         "required": ""
     },
@@ -1674,7 +1674,7 @@
 {
     "fields": {
         "name": "Divorce is to take effect on",
-        "description": "For step 9, Form 52 This Court Orders that",
+        "description": "For step 10, Form 52 This Court Orders that",
         "summary_order": 152,
         "required": "Required"
     },
@@ -1684,7 +1684,7 @@
 {
     "fields": {
         "name": "Divorce is to take effect on specific date",
-        "description": "For step 9 - specific date, Form 52 This Court Orders that",
+        "description": "For step 10 - specific date, Form 52 This Court Orders that",
         "summary_order": 153,
         "required": "Conditional",
         "conditional_target": "divorce_take_effect_on",
@@ -1696,7 +1696,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",
+        "description": "For step 11, 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": 154,
         "required": "Required"
     },