From 9292a3210adb742bea01e2616e43f57a6c1cb091 Mon Sep 17 00:00:00 2001
From: Benard Ebinu <benard.ebinu@openroad.ca>
Date: Thu, 22 Feb 2018 17:35:40 -0800
Subject: [PATCH] DIV-687: Ensure all questions under children section show up
 in review page

---
 .../apps/core/utils/question_step_mapping.py  | 20 +++++++++++++------
 edivorce/fixtures/Question.json               |  8 ++++----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py
index 376ed131..36af3c8a 100644
--- a/edivorce/apps/core/utils/question_step_mapping.py
+++ b/edivorce/apps/core/utils/question_step_mapping.py
@@ -69,19 +69,23 @@ question_step_mapping = {
                       'when_were_you_live_married_like'],
     'your_separation': ['no_reconciliation_possible', 'no_collusion'],
     'your_children': ['claimant_children',
-                      'have_separation_agreement',
-                      'have_court_order',
-                      'order_respecting_arrangement',
-                      'order_for_child_support',
-                      'child_support_act',
                       'how_will_calculate_income',
                       'annual_gross_income',
                       'spouse_annual_gross_income',
+                      'payor_monthly_child_support_amount',
                       'special_extraordinary_expenses',
                       'child_support_payor',
+                      'claiming_undue_hardship',
                       'claimants_agree_to_child_support_amount',
                       'medical_coverage_available',
+                      'whose_plan_is_coverage_under',
                       'child_support_payments_in_arrears',
+                      'child_support_arrears_amount',
+                      'child_support_in_order',
+                      'order_monthly_child_support_amount',
+                      'child_support_in_order_reason',
+                      'does_payour_amount_match_guidelines',
+                      'child_support_payment_special_provisions',
                       'number_children_seeking_support',
                       'child_support_amount_under_high_income',
                       'percent_income_over_high_income_limit',
@@ -90,6 +94,11 @@ question_step_mapping = {
                       'agree_to_child_support_amount',
                       'agreed_child_support_amount',
                       'reason_child_support_amount',
+                      'have_separation_agreement',
+                      'have_court_order',
+                      'order_respecting_arrangement',
+                      'order_for_child_support',
+                      'child_support_act',
                       'spouse_number_children_seeking_support',
                       'spouse_child_support_amount_under_high_income',
                       'spouse_percent_income_over_high_income_limit',
@@ -99,7 +108,6 @@ question_step_mapping = {
                       'spouse_agreed_child_support_amount',
                       'spouse_reason_child_support_amount',
                       'you_spouse_entered_agreement',
-                      'claiming_undue_hardship',
                       'claimant_debts',
                       'claimant_expenses',
                       'supporting_non_dependents',
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index a6c4083a..33419c1f 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -1518,10 +1518,10 @@
 },
 {
     "fields": {
-        "name": "Who is the payor?",
-        "description": "For Step 6, Your children - Payor & medical expenses",
+        "name": "What is the monthly child support amount (as per Schedule 1 of the guidelines) that is payable by claimant?",
+        "description": "For Step 6, Your children - Income & expenses",
         "summary_order": 0,
-        "required": "Conditional"
+        "required": "Required"
     },
     "model": "core.question",
     "pk": "payor_monthly_child_support_amount"
@@ -1606,7 +1606,7 @@
 },
 {
     "fields": {
-        "name": "What special provisions have been made?",
+        "name": "Whose plan is the coverage under?",
         "description": "For Step 6, Your children - Payor & medical expenses",
         "summary_order": 0,
         "required": "Conditional",