diff --git a/edivorce/apps/core/static/js/functions.js b/edivorce/apps/core/static/js/functions.js index 8b0f20e2..3b0c9a03 100644 --- a/edivorce/apps/core/static/js/functions.js +++ b/edivorce/apps/core/static/js/functions.js @@ -91,6 +91,10 @@ var showHideTargetId = function(el, id, relatedId, revealControlGroup) { if (id === "#has_children") { reveal($("input[name=number_children_over_19]")); } + // Special case of hide child support description. + if (id === "#child_support_in_order_detail") { + $("#child_support_description").hide(); + } // reveal nested question as well if (id === "#marriage_certificate") { @@ -115,6 +119,11 @@ var showHideTargetId = function(el, id, relatedId, revealControlGroup) { $(el.data("reveal_force_hide_group")).find(':radio').prop('checked', false); } + // Special case of show child support description. + if (id === "#child_support_in_order_detail") { + $("#child_support_description").show(); + } + if (relatedId !== undefined){ $('#' + relatedId).show(); } diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index 0d23a383..315ca524 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -437,13 +437,18 @@ - B. {% checkbox responses.order_for_child_support children_of_marriage='YES' want_which_orders='Child support' %} + B. + {% if responses.child_support_in_order == 'NO' %} + {% checkbox false %} + {% else %} + {% checkbox responses.order_for_child_support children_of_marriage='YES' want_which_orders='Child support' %} + {% endif %}
Claimant 1 and Claimant 2 are asking for an order for child support as follows: - {% if responses.children_of_marriage == 'YES' and responses.order_for_child_support and 'Child support' in responses.want_which_orders %} + {% if responses.children_of_marriage == 'YES' and responses.order_for_child_support and 'Child support' in responses.want_which_orders and responses.child_support_in_order != 'NO' %} {% endif %} diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index 16c1dd63..8df6f339 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -112,10 +112,11 @@ {% for order in derived.pursuant_parenting_arrangement %}
  • {{ order }}
  • {% endfor %} - - {% for order in derived.pursuant_child_support %} -
  • {{ order }}
  • - {% endfor %} + {% if responses.child_support_in_order != 'NO' %} + {% for order in derived.pursuant_child_support %} +
  • {{ order }}
  • + {% endfor %} + {% endif %} {% endif %} {% if responses.children_of_marriage == 'YES' and responses.special_extraordinary_expenses == 'YES' %} 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 f96a751c..c476b5ec 100644 --- a/edivorce/apps/core/templates/question/06_children_what_for.html +++ b/edivorce/apps/core/templates/question/06_children_what_for.html @@ -310,7 +310,7 @@ {% input_field type="textarea" name="order_respecting_arrangement" class="response-textarea form-control" maxlength="20000" rows="7"%}
    -
    +

    If you are asking for an