Browse Source

Fix bugs related to errors for Fact sheet F and special extraordinary expenses. Remove unused questions

pull/160/head
ariannedee 5 years ago
parent
commit
107c2fe0ac
5 changed files with 103 additions and 235 deletions
  1. +36
    -0
      edivorce/apps/core/static/js/main.js
  2. +7
    -10
      edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_f.html
  3. +3
    -3
      edivorce/apps/core/templates/question/06_children_income_expenses.html
  4. +11
    -12
      edivorce/apps/core/utils/question_step_mapping.py
  5. +46
    -210
      edivorce/fixtures/Question.json

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

@ -570,6 +570,42 @@ $(function () {
});
var payorCallback = function() {
var claimant = $(this).val();
var toggleFactSheetTable = function(table_suffix, claimant_name_selector, hide) {
$('#fact_sheet_f').show();
if (hide) {
$('#fact_sheet_f_table_' + table_suffix).hide();
} else {
var fact_sheet_table_element = $('#fact_sheet_f_table_' + table_suffix);
fact_sheet_table_element.show();
fact_sheet_table_element.find('input:radio, input:checkbox').each(reveal_input_elements);
}
if (claimant_name_selector) {
$('#fact_sheet_f_payor_title_' + table_suffix).text($(claimant_name_selector).text());
}
};
if (claimant === 'Myself (Claimant 1)' && parseFloat($('input[name="annual_gross_income"]').val()) > 150000) {
toggleFactSheetTable('1', '#__name_you');
toggleFactSheetTable('2', null, true);
} else if (claimant === 'My Spouse (Claimant 2)' && parseFloat($('input[name="spouse_annual_gross_income"]').val()) > 150000) {
toggleFactSheetTable('2', '#__name_spouse');
toggleFactSheetTable('1', null, true);
} else if (claimant === 'Both myself and my spouse') {
if (parseFloat($('input[name="annual_gross_income"]').val()) > 150000) {
toggleFactSheetTable('1', '#__name_you');
}
if (parseFloat($('input[name="spouse_annual_gross_income"]').val()) > 150000) {
toggleFactSheetTable('2', '#__name_spouse');
}
} else {
$('#fact_sheet_f').hide();
$('#fact_sheet_f_table_1').hide();
$('#fact_sheet_f_table_2').hide();
}
// Update Factsheet B payor label
var amount_b_you = $('#fact_b_your_child_support_paid').val();
var amount_b_spouse = $('#fact_b_your_spouse_child_support_paid').val();


+ 7
- 10
edivorce/apps/core/templates/partials/fact_sheets/fact_sheet_f.html View File

@ -61,14 +61,11 @@
</div>
</div>
{% if derived.show_fact_sheet_f_you %}
<div id="fact_sheet_f_table_1" class="question-well-border-less">
{% include "partials/fact_sheets/fact_sheet_f_table.html" with table_id=1 claimant_id='you' %}
</div>
{% endif %}
{% if derived.show_fact_sheet_f_spouse %}
<div id="fact_sheet_f_table_2" class="question-well-border-less">
{% include "partials/fact_sheets/fact_sheet_f_table.html" with table_id=2 claimant_id='spouse' %}
</div>
{% endif %}
<div id="fact_sheet_f_table_1" class="question-well-border-less" {% if not derived.show_fact_sheet_f_you %}hidden{% endif %}>
{% include "partials/fact_sheets/fact_sheet_f_table.html" with table_id=1 claimant_id='you' %}
</div>
<div id="fact_sheet_f_table_2" class="question-well-border-less" {% if not derived.show_fact_sheet_f_spouse %}hidden{% endif %}>
{% include "partials/fact_sheets/fact_sheet_f_table.html" with table_id=2 claimant_id='spouse' %}
</div>
</div>

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

@ -306,10 +306,10 @@
</div>
<div id="fact_sheet_a" class="fact-sheets" hidden>
<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>
<div class="question-well {% if derived.special_expenses_detail_error %}error{% endif %}">
<h1>Special or Extraordinary Expenses (Fact Sheet A){% if derived.special_expenses_detail_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>
{% if special_extraordinary_expenses_details_error %}<p class="warning">
{% if derived.special_expenses_detail_error %}<p class="warning">
* At least one of these values must be greater than 0
</p>{% endif %}
<table class="table table-bordered">


+ 11
- 12
edivorce/apps/core/utils/question_step_mapping.py View File

@ -76,10 +76,8 @@ question_step_mapping = {
'annual_gross_income',
'spouse_annual_gross_income',
'payor_monthly_child_support_amount',
'special_extraordinary_expenses',
'extra_ordinary_expenses_you',
'extra_ordinary_expenses_spouse',
'difference_between_claimants',
'child_care_expenses',
'children_healthcare_premiums',
'health_related_expenses',
@ -124,11 +122,19 @@ question_step_mapping = {
'whose_plan_is_coverage_under',
'child_support_payments_in_arrears',
'child_support_arrears_amount',
'claimants_agree_to_child_support_amount',
# What are you asking for
'child_support_in_order',
'order_monthly_child_support_amount',
'child_support_in_order_reason',
'claimants_agree_to_child_support_amount',
'have_separation_agreement',
'have_court_order',
'what_parenting_arrangements',
'want_parenting_arrangements',
'order_respecting_arrangement',
'order_for_child_support',
'child_support_act',
'child_support_payment_special_provisions',
'number_children_seeking_support_you',
'child_support_amount_under_high_income_you',
@ -146,13 +152,6 @@ question_step_mapping = {
'agree_to_child_support_amount_spouse',
'agreed_child_support_amount_spouse',
'reason_child_support_amount_spouse',
'have_separation_agreement',
'have_court_order',
'what_parenting_arrangements',
'want_parenting_arrangements',
'order_respecting_arrangement',
'order_for_child_support',
'child_support_act',
],
'spousal_support': ['spouse_support_details', 'spouse_support_act'],
'property_and_debt': ['deal_with_property_debt',


+ 46
- 210
edivorce/fixtures/Question.json View File

@ -509,7 +509,7 @@
"name": "Please list any other property claims.",
"description": "For step 7, Form 1 6. Property and debt",
"summary_order": 50,
"required": "Conditional"
"required": ""
},
"model": "core.question",
"pk": "other_property_claims"
@ -792,16 +792,6 @@
"model": "core.question",
"pk": "claimant_children"
},
{
"fields": {
"name": "Total monthly child support payment amount including the monthly Guidelines table amount under Schedule 1 of the Guidelines and the section 7 expenses",
"description": "For Step 6, Your children - What are you asking for",
"summary_order": 0,
"required": ""
},
"model": "core.question",
"pk": "total_child_support_payment"
},
{
"fields": {
"name": "Do you have a separation agreement that sets out what you've agreed to around parenting and child support?",
@ -871,7 +861,9 @@
"name": "Please indicate which act you are asking for support under.",
"description": "For Step 6, Your children - What are you asking for",
"summary_order": 0,
"required": "Required"
"required": "Conditional",
"conditional_target": "determine_child_support_act_requirement",
"reveal_response": "True"
},
"model": "core.question",
"pk": "child_support_act"
@ -902,8 +894,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_you",
"reveal_response": "True"
},
"model": "core.question",
"pk": "number_children_seeking_support_you"
@ -914,8 +906,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "spouse_annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_spouse",
"reveal_response": "True"
},
"model": "core.question",
"pk": "number_children_seeking_support_spouse"
@ -926,8 +918,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_you",
"reveal_response": "True"
},
"model": "core.question",
"pk": "child_support_amount_under_high_income_you"
@ -938,8 +930,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "spouse_annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_spouse",
"reveal_response": "True"
},
"model": "core.question",
"pk": "child_support_amount_under_high_income_spouse"
@ -950,8 +942,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_you",
"reveal_response": "True"
},
"model": "core.question",
"pk": "percent_income_over_high_income_limit_you"
@ -962,8 +954,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "spouse_annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_spouse",
"reveal_response": "True"
},
"model": "core.question",
"pk": "percent_income_over_high_income_limit_spouse"
@ -974,8 +966,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_you",
"reveal_response": "True"
},
"model": "core.question",
"pk": "amount_income_over_high_income_limit_you"
@ -986,8 +978,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "spouse_annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_spouse",
"reveal_response": "True"
},
"model": "core.question",
"pk": "amount_income_over_high_income_limit_spouse"
@ -998,8 +990,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_you",
"reveal_response": "True"
},
"model": "core.question",
"pk": "total_guideline_amount_you"
@ -1010,8 +1002,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "spouse_annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_spouse",
"reveal_response": "True"
},
"model": "core.question",
"pk": "total_guideline_amount_spouse"
@ -1022,8 +1014,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_you",
"reveal_response": "True"
},
"model": "core.question",
"pk": "agree_to_child_support_amount_you"
@ -1034,8 +1026,8 @@
"description": "For Step 6, Your children - Income & expenses - Your Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "spouse_annual_gross_income",
"reveal_response": ">150000"
"conditional_target": "determine_show_fact_sheet_f_spouse",
"reveal_response": "True"
},
"model": "core.question",
"pk": "agree_to_child_support_amount_spouse"
@ -1205,9 +1197,7 @@
"name": "Child care expenses for when the recipient works or goes to school",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "child_care_expenses"
@ -1227,9 +1217,7 @@
"name": "Any healthcare premiums you pay to your employer or other provider to provide the coverage to your children rather than yourself",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "children_healthcare_premiums"
@ -1239,9 +1227,7 @@
"name": "Any annual healthcare premiums you pay to your employer or other provider to provide the coverage to your children rather than yourself",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "annual_children_healthcare_premiums"
@ -1251,9 +1237,7 @@
"name": "Health related expenses that exceed insurance reimbursement by at least $100",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "health_related_expenses"
@ -1263,9 +1247,7 @@
"name": "Annual health related expenses that exceed insurance reimbursement by at least $100",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "annual_health_related_expenses"
@ -1275,9 +1257,7 @@
"name": "Extraordinary primary, secondary or other educational expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "extraordinary_educational_expenses"
@ -1287,9 +1267,7 @@
"name": "Annual extraordinary primary, secondary or other educational expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "annual_extraordinary_educational_expenses"
@ -1299,9 +1277,7 @@
"name": "Post-secondary school expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "post_secondary_expenses"
@ -1311,9 +1287,7 @@
"name": "Annual Post-secondary school expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "annual_post_secondary_expenses"
@ -1323,9 +1297,7 @@
"name": "Extraordinary extracurricular activities expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "extraordinary_extracurricular_expenses"
@ -1335,9 +1307,7 @@
"name": "Annual extraordinary extracurricular activities expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "annual_extraordinary_extracurricular_expenses"
@ -1347,9 +1317,7 @@
"name": "Total section 7 expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "total_section_seven_expenses"
@ -1359,9 +1327,7 @@
"name": "Annual total section 7 expenses",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "annual_total_section_seven_expenses"
@ -1371,9 +1337,7 @@
"name": "Your proportionate share",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "your_proportionate_share_percent"
@ -1383,9 +1347,7 @@
"name": "Your proportionate share",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "your_proportionate_share_amount"
@ -1395,9 +1357,7 @@
"name": "Spouse's proportionate share",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "spouse_proportionate_share_percent"
@ -1407,9 +1367,7 @@
"name": "Spouse's proportionate share",
"description": "For Step 6, Your children - Income & expenses - Spouse Fact Sheet F",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "special_extraordinary_expenses",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "spouse_proportionate_share_amount"
@ -1486,66 +1444,16 @@
"model": "core.question",
"pk": "your_spouse_child_support_paid_b"
},
{
"fields": {
"name": "Difference between the Guidelines table amount of the claimant and the Guidelines table amount of the respondent",
"description": "For Step 6, Your children - Your children - Fact Sheet B Shared Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "difference_between_claimants"
},
{
"fields": {
"name": "Special or extraordinary expenses (as per Section 7 of the Federal Child Support Guidelines) to be paid annually",
"description": "For Step 6, Your children - Your children - Fact Sheet B Shared Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "extra_ordinary_expenses_you"
},
{
"fields": {
"name": "Special or extraordinary expenses (as per Section 7 of the Federal Child Support Guidelines) to be paid annually",
"description": "For Step 6, Your children - Your children - Fact Sheet B Shared Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "extra_ordinary_expenses_spouse"
},
{
"fields": {
"name": "Any other relevant information regarding the conditions, means, needs and other circumstances of each spouse or of any child for whom support is sought?",
"description": "For Step 6, Your children - Your children - Fact Sheet B Shared Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
"required": ""
},
"model": "core.question",
"pk": "additional_relevant_spouse_children_info"
},
{
"fields": {
"name": "Difference between Guidelines table amounts",
"description": "For Step 6, Your children - Your children - Fact Sheet B Shared Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "difference_payment_amounts_b"
},
{
"fields": {
"name": "What is the 'Guideline' amount for child support payable by you (as per Federal Child Support Tables)?",
@ -1594,78 +1502,6 @@
"model": "core.question",
"pk": "number_of_children_claimant_spouse"
},
{
"fields": {
"name": "How do I calculate annual income?",
"description": "For Step 6, Your children - Your children - Fact Sheet C Split Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "spouse_annual_income"
},
{
"fields": {
"name": "What is the monthly amount for child support payable by your spouse (as per Federal Child Support Tables)?",
"description": "For Step 6, Your children - Your children - Fact Sheet C Split Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "total_spouse_paid_child_support"
},
{
"fields": {
"name": "How do I calculate annual income?",
"description": "For Step 6, Your children - Your children - Fact Sheet C Split Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "claimant_annual_income"
},
{
"fields": {
"name": "What is the monthly amount for child support payable by you (as per Federal Child Support Tables)?",
"description": "For Step 6, Your children - Your children - Fact Sheet C Split Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "total_paid_child_support"
},
{
"fields": {
"name": "Difference between Guidelines table amounts",
"description": "For Step 6, Your children - Your children - Fact Sheet C Split Custody",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "difference_payment_amounts_c"
},
{
"fields": {
"name": "How many child(ren) are 19 years or older for whom you are asking for support?",
"description": "For Step 6, Your children - Income & expenses - Fact Sheet D Child(ren) 19 Years or Older",
"summary_order": 0,
"required": "Conditional",
"conditional_target": "claimant_children",
"reveal_response": ""
},
"model": "core.question",
"pk": "number_children_over_19_need_support"
},
{
"fields": {
"name": "Do you and your spouse agree that the monthly Guidelines table amount for child support is appropriate?",


Loading…
Cancel
Save