From 45fd9b067c8482e99f25d60c1aef4e69a6263eb7 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 22 Jan 2019 17:31:04 -0800
Subject: [PATCH 1/3] DIV-915: Updated the wording of the question.

---
 .../apps/core/templates/question/06_children_what_for.html  | 6 +++---
 edivorce/fixtures/Question.json                             | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html
index 742b5b03..89457995 100644
--- a/edivorce/apps/core/templates/question/06_children_what_for.html
+++ b/edivorce/apps/core/templates/question/06_children_what_for.html
@@ -178,7 +178,7 @@
     </div>
 
     <div class="question-well">
-        <h3>Do you have a
+        <h3>Do you have an
             <span class="tooltip-link"
               data-toggle="tooltip" data-placement="right" data-html="true"
               title="
@@ -188,8 +188,8 @@
                  basis to help cover the costs of supporting the children.
                  </p>
                 ">
-                court order <i class="fa fa-question-circle" aria-hidden="true"></i>
-            </span>(Provincial or Supreme Court) about parenting and support of the children?</h3>
+                 order <i class="fa fa-question-circle" aria-hidden="true"></i>
+            </span>(Provincial or Supreme Court) about support of the children?</h3>
         <div class="btn-radio-group" data-toggle="buttons">
             <label class="btn btn-radio">
                 {% input_field type="radio" name="have_court_order" autocomplete="off" value="YES" data_target_id="court_order_details" data_reveal_target="true" %} Yes
diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json
index e49abcea..3b03bdf5 100644
--- a/edivorce/fixtures/Question.json
+++ b/edivorce/fixtures/Question.json
@@ -827,7 +827,7 @@
 },
 {
     "fields": {
-        "name": "Do you have a court order about parenting and support of the children?",
+        "name": "Do you have an order about support of the children?",
         "description": "For Step 6, Your children - What are you asking for",
         "summary_order": 0,
         "required": "Required"
@@ -1790,7 +1790,8 @@
         "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": 0,
-        "required": "Required"
+        "required": "Conditional",
+        "reveal_response": ""
     },
     "model": "core.question",
     "pk": "payor_monthly_child_support_amount"

From 2f9e88ef0a770897a8682ec8b9c47ec4be756c86 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 22 Jan 2019 18:14:26 -0800
Subject: [PATCH 2/3] DIV-916: Updated logic for incorrect completeness.

---
 .../apps/core/templatetags/summary_format.py  |  6 ++++
 edivorce/apps/core/utils/step_completeness.py | 34 ++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py
index 6b5867d2..a7f4c3f5 100644
--- a/edivorce/apps/core/templatetags/summary_format.py
+++ b/edivorce/apps/core/templatetags/summary_format.py
@@ -210,6 +210,12 @@ def format_children(context, source):
                             value = item['value']
                             if q_id == 'describe_order_special_extra_expenses':
                                 pass
+                            if q_id == 'payor_monthly_child_support_amount':
+                                # Only display this field if it is sole custody
+                                sole_custody = (all([child['child_live_with'] == 'Lives with you' for child in context['derived']['children']]) or
+                                                all([child['child_live_with'] == 'Lives with spouse' for child in context['derived']['children']]))
+                                if not sole_custody:
+                                    continue
 
                             try:
                                 value = json.loads(item['value'])
diff --git a/edivorce/apps/core/utils/step_completeness.py b/edivorce/apps/core/utils/step_completeness.py
index e5a69e66..9fe53380 100644
--- a/edivorce/apps/core/utils/step_completeness.py
+++ b/edivorce/apps/core/utils/step_completeness.py
@@ -1,3 +1,4 @@
+import ast
 from django.urls import reverse
 
 from edivorce.apps.core.models import Question
@@ -66,15 +67,30 @@ def is_complete(step, lst):
             missing_responses += [question_key]
 
     for question in conditional_list:
-        # find the response to the conditional target
-        for target in lst:
-            if target["question_id"] == question.conditional_target:
-                if __condition_met(question.reveal_response, target, lst):
-                    # the condition was met then the question is required.
-                    # ... so check if it has a value
-                    if not __has_value(question.key, lst):
-                        complete = False
-                        missing_responses += [question.key]
+        # check condition for payor_monthly_child_support_amount
+        # which needs sole_custody to be computed separately
+        # payor_monthly_child_support_ammount is required only if sole_custody is True
+        if question.key == "payor_monthly_child_support_amount":
+            for target in lst:
+                if target["question_id"] == "claimant_children":
+                    child_list = ast.literal_eval(target['value'])
+                    sole_custody = (all([child['child_live_with'] == 'Lives with you' for child in child_list]) or
+                                    all([child['child_live_with'] == 'Lives with spouse' for child in child_list]))
+                    if sole_custody:
+                        if not __has_value(question.key, lst):
+                            complete = False
+                            missing_responses += [question.key]
+                    break
+        else:
+            # find the response to the conditional target
+            for target in lst:
+                if target["question_id"] == question.conditional_target:
+                    if __condition_met(question.reveal_response, target, lst):
+                        # the condition was met then the question is required.
+                        # ... so check if it has a value
+                        if not __has_value(question.key, lst):
+                            complete = False
+                            missing_responses += [question.key]
 
     return complete, missing_responses
 

From 38d725f3fcd7e47b23f83bddf3e1f5bb73e37881 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 22 Jan 2019 18:36:16 -0800
Subject: [PATCH 3/3] DIV-922: Fixed the review page shows only one child.

---
 edivorce/apps/core/templatetags/summary_format.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py
index a7f4c3f5..dc76049c 100644
--- a/edivorce/apps/core/templatetags/summary_format.py
+++ b/edivorce/apps/core/templatetags/summary_format.py
@@ -144,7 +144,7 @@ def format_children(context, source):
 
     child_support_orders = {'want_parenting_arrangements', 'order_respecting_arrangement', 'order_for_child_support'}
 
-    tags = '<tbody>'
+    tags = format_html('<tbody>')
     # process mapped questions first
     working_source = source.copy()
     for title, questions in question_to_heading.items():
@@ -198,7 +198,8 @@ def format_children(context, source):
                             child_counter = 1
                             for child in json.loads(item['value']):
                                 tags = format_html(
-                                    '{}{}{}{}{}{}',
+                                    '{}{}{}{}{}{}{}',
+                                    tags,
                                     format_review_row_heading('Child {}'.format(child_counter), 'review-child-heading'),
                                     format_row('Child\'s name', child['child_name']),
                                     format_row('Birth date', child['child_birth_date']),