Browse Source

Add required fields to income/expenses substep

pull/160/head
ariannedee 5 years ago
parent
commit
5e261f37bb
3 changed files with 32 additions and 33 deletions
  1. +0
    -17
      edivorce/apps/core/static/js/main.js
  2. +20
    -16
      edivorce/apps/core/templates/question/06_children_income_expenses.html
  3. +12
    -0
      edivorce/apps/core/utils/derived.py

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

@ -588,23 +588,6 @@ $(function () {
populateChildrenFactSheets(); populateChildrenFactSheets();
}); });
// check who has sole custody
$('input[name="__claimant_children"]').each(function() {
var children = JSON.parse($(this).val());
var youHaveSoleCustody = children.every(function(child){
return child.child_live_with === 'Lives with you';
});
var spouseHasSoleCustody = children.every(function(child){
return child.child_live_with === 'Lives with spouse';
});
if (youHaveSoleCustody || spouseHasSoleCustody) {
$('#monthly_amount_question').show();
} else {
$('#monthly_amount_question').hide();
}
});
var payorCallback = function() { var payorCallback = function() {
var claimant = $(this).val(); var claimant = $(this).val();


+ 20
- 16
edivorce/apps/core/templates/question/06_children_income_expenses.html View File

@ -9,8 +9,8 @@
{% block content %} {% block content %}
<h1><small>Step {% step_order step="children" %}:</small>Children - Income & expenses</h1> <h1><small>Step {% step_order step="children" %}:</small>Children - Income & expenses</h1>
<div class="question-well">
<h3>How will you and your spouse be determining your income?</h3>
<div class="question-well {% if how_will_calculate_income_error %}error{% endif %}">
<h3>How will you and your spouse be determining your income?{% if how_will_calculate_income_error %}{% include 'partials/required.html' %}{% endif %}</h3>
<p>Under the Federal Guidelines, you can do one of the following:</p> <p>Under the Federal Guidelines, you can do one of the following:</p>
<div class="radio"> <div class="radio">
@ -107,8 +107,8 @@
</div> </div>
<div id="annual_gross_income_question"> <div id="annual_gross_income_question">
<div class="question-well">
<h3>What is your annual gross income as determined above?</h3>
<div class="question-well {% if annual_gross_income_error %}error{% endif %}">
<h3>What is your annual gross income as determined above?{% if annual_gross_income_error %}{% include 'partials/required.html' %}{% endif %}</h3>
<div class="dollar-prefix"> <div class="dollar-prefix">
{% money_input_field name="annual_gross_income" value="" class="money form-block response-textbox positive-float" %} {% money_input_field name="annual_gross_income" value="" class="money form-block response-textbox positive-float" %}
</div> </div>
@ -133,8 +133,8 @@
</div> </div>
</div> </div>
<div class="question-well">
<h3>What is your spouse's annual gross income as determined above?</h3>
<div class="question-well {% if spouse_annual_gross_income_error %}error{% endif %}">
<h3>What is your spouse's annual gross income as determined above?{% if spouse_annual_gross_income_error %}{% include 'partials/required.html' %}{% endif %}</h3>
<div class="dollar-prefix"> <div class="dollar-prefix">
{% money_input_field name="spouse_annual_gross_income" value="" class="money form-block response-textbox positive-float" %} {% money_input_field name="spouse_annual_gross_income" value="" class="money form-block response-textbox positive-float" %}
</div> </div>
@ -161,11 +161,11 @@
</div> </div>
<input type="text" name="__claimant_children" value="{{ claimant_children }}" hidden > <input type="text" name="__claimant_children" value="{{ claimant_children }}" hidden >
<div class="question-well" id="monthly_amount_question" hidden>
{% if derived.sole_custody %}
<div class="question-well {% if payor_monthly_child_support_amount_error %}error{% endif %}" id="monthly_amount_question">
<h3>What is the monthly child support amount (as per <h3>What is the monthly child support amount (as per
<a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-5.html#h-9" target="_blank">Schedule 1</a> <a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-5.html#h-9" target="_blank">Schedule 1</a>
of the guidelines) that is payable?</h3>
of the guidelines) that is payable?{% if payor_monthly_child_support_amount_error %}{% include 'partials/required.html' %}{% endif %}</h3>
<div class="dollar-prefix"> <div class="dollar-prefix">
{% money_input_field name="payor_monthly_child_support_amount" class="money positive-float form-block response-textbox children-input-block" data_mirror="true" data_mirror_target="#child_support_amount_label" %} {% money_input_field name="payor_monthly_child_support_amount" class="money positive-float form-block response-textbox children-input-block" data_mirror="true" data_mirror_target="#child_support_amount_label" %}
</div> </div>
@ -258,8 +258,9 @@
</div> </div>
</div> </div>
</div> </div>
{% endif %}
<div class="question-well">
<div class="question-well {% if special_extraordinary_expenses_error %}error{% endif %}">
<h3> <h3>
Are you claiming any Are you claiming any
<span class="tooltip-link" <span class="tooltip-link"
@ -275,7 +276,7 @@
</p> </p>
"> ">
special and extraordinary expenses<i class="fa fa-question-circle" aria-hidden="true"></i> special and extraordinary expenses<i class="fa fa-question-circle" aria-hidden="true"></i>
</span>?
</span>?{% if special_extraordinary_expenses_error %}{% include 'partials/required.html' %}{% endif %}
</h3> </h3>
<p> <p>
<strong>NOTE: If you have a Separation Agreement or Court Order that deals with special and extraordinary expenses, you may wish NOT to select this option.</strong> <strong>NOTE: If you have a Separation Agreement or Court Order that deals with special and extraordinary expenses, you may wish NOT to select this option.</strong>
@ -305,9 +306,12 @@
</div> </div>
<div id="fact_sheet_a" class="fact-sheets" hidden> <div id="fact_sheet_a" class="fact-sheets" hidden>
<div class="question-well">
<h1>Special or Extraordinary Expenses (Fact Sheet A)</h1>
<div class="question-well {% if special_extraordinary_expenses_details_error %}error{% endif %}">
<h1>Special or Extraordinary Expenses (Fact Sheet A){% if special_extraordinary_expenses_details_error %}{% include 'partials/required.html' %}{% endif %}</h1>
<p>Since you have indicated that there are special or extraordinary expenses, we need you to answer the next set of questions.</p> <p>Since you have indicated that there are special or extraordinary expenses, we need you to answer the next set of questions.</p>
{% if special_extraordinary_expenses_details_error %}<p class="warning">
* At least one of these values must be greater than 0
</p>{% endif %}
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
<tr> <tr>
@ -513,9 +517,9 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="question-well">
<h3>Please describe the order you are asking for regarding Special and Extraordinary Expenses</h3>
<div class="question-well {% if describe_order_special_extra_expenses_error %}error{% endif %}">
<h3>Please describe the order you are asking for regarding Special and Extraordinary Expenses{% if describe_order_special_extra_expenses_error %}
{% include 'partials/required.html' %}{% endif %}</h3>
<p> <p>
If you're not sure how to write what you are asking for, you can refer to section "G" of the If you're not sure how to write what you are asking for, you can refer to section "G" of the
<a href="http://www.courts.gov.bc.ca/supreme_court/practice_and_procedure/family_law_orders/picklist_family_orders.pdf" target="_blank"> <a href="http://www.courts.gov.bc.ca/supreme_court/practice_and_procedure/family_law_orders/picklist_family_orders.pdf" target="_blank">


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

@ -71,6 +71,7 @@ DERIVED_DATA = [
'child_support_acts', 'child_support_acts',
'pursuant_parenting_arrangement', 'pursuant_parenting_arrangement',
'pursuant_child_support', 'pursuant_child_support',
'sole_custody',
] ]
@ -710,3 +711,14 @@ def pursuant_child_support(responses, derived):
if len(arrangement.strip()) > 0] if len(arrangement.strip()) > 0]
except ValueError: except ValueError:
return [] return []
def sole_custody(responses, derived):
"""
Return True if either parent has sole custody of the children
"""
you_have_sole_custody = all([child['child_live_with'] == 'Lives with you'
for child in derived['children']])
spouse_has_sole_custody = all([child['child_live_with'] == 'Lives with spouse'
for child in derived['children']])
return you_have_sole_custody or spouse_has_sole_custody

Loading…
Cancel
Save