Browse Source

DIV-829: fixing how calculate total monthly child support

pull/160/head
Benard Ebinu 7 years ago
parent
commit
98dbd4e9a2
5 changed files with 31 additions and 66 deletions
  1. +0
    -38
      edivorce/apps/core/static/js/main.js
  2. +1
    -1
      edivorce/apps/core/templates/pdf/partials/fact_sheet_a.html
  3. +4
    -4
      edivorce/apps/core/templates/question/06_children_facts.html
  4. +0
    -23
      edivorce/apps/core/templates/question/06_children_what_for.html
  5. +26
    -0
      edivorce/apps/core/utils/derived.py

+ 0
- 38
edivorce/apps/core/static/js/main.js View File

@ -193,44 +193,6 @@ $(function () {
});
// Fact Sheet A
// Dynamically calculate total child support payment for payor
var calcTotalChildSupportPayment = function() {
var payor = $('#child_support_payor').text();
var payorMonthlyChildSupportAmount = parseFloat($('#payor_monthly_child_support_amount').text()) || 0;
var yourShare = parseFloat($('#your_proportionate_share_amount').text()) || 0;
var spouseShare = parseFloat($('#spouse_proportionate_share_amount').text()) || 0;
var factSheet_B_ProposedAmount = parseFloat($('#fact_sheet_b_proposed_amount').text()) || 0;
var factSheet_C_ProposedAmount = parseFloat($('#fact_sheet_c_proposed_amount').text()) || 0;
var payorShare = 0;
if (payor === 'Myself (Claimant 1)') {
payorShare = yourShare;
}
else if (payor === 'My Spouse (Claimant 2)') {
payorShare = spouseShare;
}
else if (payor === 'Both myself and my spouse') {
payorShare = yourShare + spouseShare;
}
if ($('#show_fact_sheet_b').text() === 'False') {
factSheet_B_ProposedAmount = 0;
}
if ($('#show_fact_sheet_c').text() === 'False') {
factSheet_C_ProposedAmount = 0;
}
// This number should include the share paid to individual
return (payorMonthlyChildSupportAmount + payorShare + factSheet_B_ProposedAmount + factSheet_C_ProposedAmount).toFixed(2);
};
$('#total_child_support_payment').val(calcTotalChildSupportPayment()).change();
$('#total_extraordinary_expense_monthly').on('change', function() {
$('#total_child_support_payment').val(calcTotalChildSupportPayment()).change();
});
// If relationship is common law and they want spousal support, update spouse_support_act with hidden input field, spouse_support_act_common_law
if ($("#spouse_support_act_common_law").length) {
var el = $("#spouse_support_act_common_law");


+ 1
- 1
edivorce/apps/core/templates/pdf/partials/fact_sheet_a.html View File

@ -122,7 +122,7 @@
Total monthly child support payable by {{ derived.child_support_payor }},
including the monthly Guidelines table amount under Schedule 1 of the
Guidelines and the section 7 expenses, is
{{ responses.total_child_support_payment|money }}
{{ derived.total_child_support_payment_a|money }}
</p>
</div>
{% endif %}

+ 4
- 4
edivorce/apps/core/templates/question/06_children_facts.html View File

@ -127,12 +127,12 @@
</td>
<td class="fact-sheet-answer">
<div class="dollar-prefix">
{% money_input_field id="fact_b_your_child_support_paid" name="your_child_support_paid" class="fact-sheet-input claimants-child-support-amounts" data_calc_delta="true" data_delta_term_selector=".claimants-child-support-amounts" data_delta_target_selector="input[name=difference_between_claimants]" data_mirror="true" data_mirror_target="#fact_c_your_child_support_paid" placeholder="enter amount" %}
{% money_input_field id="fact_b_your_child_support_paid" name="your_child_support_paid" class="fact-sheet-input claimants-child-support-amounts" data_calc_delta="true" data_delta_term_selector=".claimants-child-support-amounts" data_delta_target_selector="input[name=difference_payment_amounts]" data_mirror="true" data_mirror_target="#fact_c_your_child_support_paid" placeholder="enter amount" %}
</div>
</td>
<td class="fact-sheet-answer">
<div class="dollar-prefix">
{% money_input_field id="fact_b_your_spouse_child_support_paid" name="your_spouse_child_support_paid" class="fact-sheet-input claimants-child-support-amounts" data_calc_delta="true" data_delta_term_selector=".claimants-child-support-amounts" data_delta_target_selector="input[name=difference_between_claimants]" data_mirror="true" data_mirror_target="#fact_c_your_spouse_child_support_paid" placeholder="enter amount" %}
{% money_input_field id="fact_b_your_spouse_child_support_paid" name="your_spouse_child_support_paid" class="fact-sheet-input claimants-child-support-amounts" data_calc_delta="true" data_delta_term_selector=".claimants-child-support-amounts" data_delta_target_selector="input[name=difference_payment_amounts]" data_mirror="true" data_mirror_target="#fact_c_your_spouse_child_support_paid" placeholder="enter amount" %}
</div>
</td>
</tr>
@ -201,7 +201,7 @@
</td>
<td class="fact-sheet-answer" colspan="2" readonly>
<div class="dollar-prefix">
{% money_input_field name="difference_between_claimants" value="" class="money fact-sheet-input" readonly="" %}
{% money_input_field name="difference_payment_amounts" value="" class="money fact-sheet-input" readonly="" %}
</div>
</td>
</tr>
@ -247,7 +247,7 @@
</td>
<td class="fact-sheet-answer" colspan="2" readonly>
<div class="dollar-prefix">
{% money_input_field name="difference_between_claimants" value="" class="money fact-sheet-input" readonly="" %}
{% money_input_field name="difference_payment_amounts" value="" class="money fact-sheet-input" readonly="" %}
</div>
</td>
</tr>


+ 0
- 23
edivorce/apps/core/templates/question/06_children_what_for.html View File

@ -11,29 +11,6 @@
{% block content %}
<h1><small>Step {% step_order step="children" %}:</small>Children - What are you asking for</h1>
<div class="question-well">
<h3>
Total monthly child support payment amount including the monthly Guidelines table amount under Schedule 1 of the Guidelines and the section 7
expenses:
</h3>
<span id="child_support_payor" hidden>{{ child_support_payor }}</span>
<span id="payor_monthly_child_support_amount" hidden>{{ payor_monthly_child_support_amount }}</span>
<span id="your_proportionate_share_amount" hidden>{{ your_proportionate_share_amount }}</span>
<span id="spouse_proportionate_share_amount" hidden>{{ spouse_proportionate_share_amount }}</span>
<span id="fact_sheet_b_proposed_amount" hidden>{{ difference_between_claimants }}</span>
<span id="fact_sheet_c_proposed_amount" hidden>{{ difference_payment_amounts }}</span>
<span id="show_fact_sheet_b" hidden>{{ derived.show_fact_sheet_b }}</span>
<span id="show_fact_sheet_c" hidden>{{ derived.show_fact_sheet_c }}</span>
<h3>
${% input_field type="text" id="total_child_support_payment" name="total_child_support_payment" class="border-less-heading" readonly="" %}
</h3>
<p>
<small>
Please note: The value above is based on the information you entered in <a href="{% url 'question_steps' 'children' 'income_expenses'%}">Fact Sheet A - Special or Extraordinary Expenses</a>.
</small>
</p>
</div>
<div class="question-well">
<h3>What is the monthly child support amount
<span class="tooltip-link"


+ 26
- 0
edivorce/apps/core/utils/derived.py View File

@ -51,6 +51,7 @@ DERIVED_DATA = [
'claimant_2_share',
'payor_section_seven_expenses',
'total_monthly_support_1_and_a',
'total_child_support_payment_a',
'guideline_amounts_difference',
'claimant_debts',
'claimant_expenses',
@ -457,6 +458,31 @@ def guideline_amounts_difference(responses, derived):
return abs(amount_1 - amount_2)
def total_child_support_payment_a(response, derived):
""" Return the total monthly child support payable by the payor for Fact Sheet A """
total = 0
sole_custody = (all([child['child_live_with'] == 'Lives with you' for child in derived['children']]) or
all([child['child_live_with'] == 'Lives with spouse' for child in derived['children']]))
if sole_custody:
total += derived['schedule_1_amount']
else:
if derived['show_fact_sheet_b']:
total += guideline_amounts_difference(response, derived)
if derived['show_fact_sheet_c']:
total += guideline_amounts_difference(response, derived)
if derived['show_fact_sheet_a']:
if derived['child_support_payor'] == 'Claimant 1':
total += derived['claimant_1_share']
elif derived['child_support_payor'] == 'Claimant 2':
total += derived['claimant_2_share']
else:
total += derived['total_section_seven_expenses']
return total
def claimant_debts(responses, derived):
""" Return the parsed array of claimant_debts """


Loading…
Cancel
Save