diff --git a/edivorce/apps/core/templates/question/06_children_facts.html b/edivorce/apps/core/templates/question/06_children_facts.html index 28064916..705fb18e 100644 --- a/edivorce/apps/core/templates/question/06_children_facts.html +++ b/edivorce/apps/core/templates/question/06_children_facts.html @@ -227,7 +227,7 @@
- {% money_input_field name="difference_payment_amounts_b" value="" class="money fact-sheet-input different-payment-amounts" readonly="" data_sum="true" data_sum_class="different-payment-amounts" data_sum_target_id="total_spouse_paid_child_support" %} + {% money_input_field name="difference_payment_amounts_b" value="" class="money fact-sheet-input different-payment-amounts" readonly="" data_mirror="true" data_mirror_target="#total_spouse_paid_child_support_b" data_mirror_broadcast_change="true" data_sum="true" data_sum_class="different-payment-amounts" data_sum_target_id="total_spouse_paid_child_support" %}
@@ -367,7 +367,7 @@
- {% money_input_field name="difference_payment_amounts_c" class="fact-sheet-input different-payment-amounts" readonly="" data_sum="true" data_sum_class="different-payment-amounts" data_sum_target_id="total_spouse_paid_child_support" %} + {% money_input_field id="difference_payment_amounts_c" name="difference_payment_amounts_c" class="fact-sheet-input different-payment-amounts" readonly="" data_mirror="true" data_mirror_target="#total_spouse_paid_child_support_c" data_mirror_broadcast_change="true" data_sum="true" data_sum_class="different-payment-amounts" data_sum_target_id="total_spouse_paid_child_support" %}
@@ -474,10 +474,18 @@ This information is needed for the Judge. You will be able to indicate a different child support amount in a following step.

- {% if derived.show_fact_sheet_b or derived.show_fact_sheet_c %} + {% if derived.show_fact_sheet_b and derived.show_fact_sheet_c %}
{% money_input_field id="total_spouse_paid_child_support" name="total_spouse_paid_child_support" value=derived.guideline_amounts_difference_total class="fact-sheet-input money input-narrow form-block response-textbox" readonly="" %}
+ {% elif derived.show_fact_sheet_b %} +
+ {% money_input_field id="total_spouse_paid_child_support_b" name="total_spouse_paid_child_support" class="fact-sheet-input money input-narrow form-block response-textbox" readonly="" %} +
+ {% elif derived.show_fact_sheet_c %} +
+ {% money_input_field id="total_spouse_paid_child_support_c" name="total_spouse_paid_child_support" class="fact-sheet-input money input-narrow form-block response-textbox" readonly="" %} +
{% else %}
{% money_input_field name="total_spouse_paid_child_support" value_src="payor_monthly_child_support_amount" class="fact-sheet-input money input-narrow form-block response-textbox" readonly="" %} diff --git a/edivorce/apps/core/utils/derived.py b/edivorce/apps/core/utils/derived.py index dac491b1..00be7f3c 100644 --- a/edivorce/apps/core/utils/derived.py +++ b/edivorce/apps/core/utils/derived.py @@ -284,7 +284,10 @@ def guideline_amounts_difference_total(responses, derived): Return the sum of the guideline amounts B and C """ - return derived['guideline_amounts_difference_b'] + derived['guideline_amounts_difference_c'] + amount_b = derived['guideline_amounts_difference_b'] if derived['show_fact_sheet_b'] else 0 + amount_c = derived['guideline_amounts_difference_c'] if derived['show_fact_sheet_c'] else 0 + + return amount_b + amount_c def schedule_1_amount(responses, derived):