diff --git a/edivorce/apps/core/static/js/functions.js b/edivorce/apps/core/static/js/functions.js index 51d60676..462ff509 100644 --- a/edivorce/apps/core/static/js/functions.js +++ b/edivorce/apps/core/static/js/functions.js @@ -117,8 +117,14 @@ var showHideTargetId = function(el, id, relatedId, revealControlGroup) { if (relatedId !== undefined) { $('#' + relatedId).hide(); } + // Special case of pre-qualification step 4 children. if (id === "#has_children") { reveal($("input[name=number_children_over_19]")); + var over_19_children = parseInt($("input[name=number_children_over_19]").val()); + + if (over_19_children >= 0) { + reveal($("input[name=number_children_over_19]:checked")); + } } // Special case of hide child support description. if (id === "#child_support_in_order_detail") { @@ -147,6 +153,12 @@ var showHideTargetId = function(el, id, relatedId, revealControlGroup) { $(el.data("reveal_force_hide_group")).hide(); $(el.data("reveal_force_hide_group")).find(':radio').prop('checked', false); } + // Special case of pre-qualification step 4 children. + if (id === "#has_children") { + if (el.val() === 'NO') { + $('.not-disqualified-other').show(); + } + } // Special case of show child support description. if (id === "#child_support_in_order_detail") { diff --git a/edivorce/apps/core/templates/prequalification/step_04.html b/edivorce/apps/core/templates/prequalification/step_04.html index d1c4e764..93d9533f 100644 --- a/edivorce/apps/core/templates/prequalification/step_04.html +++ b/edivorce/apps/core/templates/prequalification/step_04.html @@ -143,11 +143,11 @@ years or older?

Please check all that apply.

-
-
-
-
-
+
+
+
+
+
+ +
+

Do any of the your children live with someone who is not you or your spouse?

+ +
+ + + +
+ +

For example: you should select 'Yes' if your child lives with an Aunt, Uncle or Grandparent.

+ + +
{% endblock %} diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html index 67569cc6..67edc181 100644 --- a/edivorce/apps/core/templates/question/01_orders.html +++ b/edivorce/apps/core/templates/question/01_orders.html @@ -177,7 +177,7 @@ asked to provide details for each request.

diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py index 39eb99dc..0392f48f 100644 --- a/edivorce/apps/core/templatetags/summary_format.py +++ b/edivorce/apps/core/templatetags/summary_format.py @@ -413,7 +413,7 @@ def prequal_tag(source): marriage_status = lived_in_bc = live_at_least_year = separation_date = try_reconcile = reconciliation_period = None children_of_marriage = number_children_under_19 = number_children_over_19 = financial_support = certificate = provide_later = None - provide_later_reason = not_provide_later_reason = in_english = divorce_reason = None + provide_later_reason = not_provide_later_reason = in_english = divorce_reason = children_live_with_others = None for item in source: q_id = item['question_id'] @@ -437,6 +437,8 @@ def prequal_tag(source): number_children_over_19 = item elif q_id == 'children_financial_support': financial_support = item + elif q_id == 'children_live_with_others': + children_live_with_others = item elif q_id == 'original_marriage_certificate': certificate = item elif q_id == 'provide_certificate_later': @@ -472,6 +474,8 @@ def prequal_tag(source): tags = format_table_data(tags, number_children_over_19['question__name'], number_children_over_19['value']) if children_of_marriage and children_of_marriage['value'] == 'YES' and number_children_over_19 and financial_support and financial_support['value']: tags = format_table_data(tags, financial_support['question__name'], '
'.join(json.loads(financial_support['value']))) + if children_of_marriage and children_of_marriage['value'] == 'YES' and number_children_over_19 and financial_support: + tags = format_table_data(tags, children_live_with_others['question__name'], children_live_with_others['value']) if certificate: tags = format_table_data(tags, certificate['question__name'], certificate['value']) if certificate and certificate['value'] == 'NO' and provide_later: diff --git a/edivorce/apps/core/utils/question_step_mapping.py b/edivorce/apps/core/utils/question_step_mapping.py index 3ef60ead..c9a3a4a6 100644 --- a/edivorce/apps/core/utils/question_step_mapping.py +++ b/edivorce/apps/core/utils/question_step_mapping.py @@ -21,7 +21,8 @@ pre_qual_step_question_mapping = { 'children_of_marriage', 'number_children_under_19', 'number_children_over_19', - 'children_financial_support' + 'children_financial_support', + 'children_live_with_others' }, '05': { 'original_marriage_certificate', @@ -44,6 +45,7 @@ question_step_mapping = { 'number_children_under_19', 'number_children_over_19', 'children_financial_support', + 'children_live_with_others', 'original_marriage_certificate', 'provide_certificate_later', 'provide_certificate_later_reason', diff --git a/edivorce/fixtures/Question.json b/edivorce/fixtures/Question.json index 1a18bc46..88bef3ca 100644 --- a/edivorce/fixtures/Question.json +++ b/edivorce/fixtures/Question.json @@ -75,7 +75,7 @@ "fields": { "name": "Are you financially supporting any of the children that are 19 years or older?", "description": "For pre-qualification step 4, Form 1 3. Info concerning children", - "summary_order": 9, + "summary_order": 8, "required": "Conditional", "conditional_target": "number_children_over_19", "reveal_response": ">0" @@ -83,6 +83,16 @@ "model": "core.question", "pk": "children_financial_support" }, +{ + "fields": { + "name": "Do any of the your children live with someone who is not you or your spouse?", + "description": "For pre-qualification step 4, determines eligibility of using the app", + "summary_order": 9, + "required": "" + }, + "model": "core.question", + "pk": "children_live_with_others" +}, { "fields": { "name": "Will you be able to provide proof of your marriage (in the form of an original or certified marriage certificate or registration of marriage)?",