Browse Source

Merge pull request #38 from bcgov/DIV-908

Div multiple updates
pull/160/head
Charles Shin 6 years ago
committed by GitHub
parent
commit
48d1179446
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 96 additions and 48 deletions
  1. +10
    -6
      edivorce/apps/core/templates/pdf/form1.html
  2. +68
    -36
      edivorce/apps/core/templates/question/01_orders.html
  3. +5
    -0
      edivorce/apps/core/templates/question/06_children_facts.html
  4. +1
    -1
      edivorce/apps/core/templates/question/06_children_income_expenses.html
  5. +12
    -5
      edivorce/apps/core/templates/question/06_children_what_for.html

+ 10
- 6
edivorce/apps/core/templates/pdf/form1.html View File

@ -639,7 +639,7 @@
<tr>
<td>
<p>Claimant 1:
{% if responses.address_to_send_official_document_street_you and responses.address_to_send_official_document_city_you and responses.address_to_send_official_document_country_you and responses.address_to_send_official_document_postal_code_you %}
{% if responses.address_to_send_official_document_street_you and responses.address_to_send_official_document_city_you and responses.address_to_send_official_document_country_you %}
{{ responses.address_to_send_official_document_street_you }}, {{ responses.address_to_send_official_document_city_you }},
{% if responses.address_to_send_official_document_prov_you %}
{{ responses.address_to_send_official_document_prov_you }},
@ -648,8 +648,10 @@
{{ responses.address_to_send_official_document_other_country_you }}
{% else %}
{{ responses.address_to_send_official_document_country_you }}
{% endif %},
{{ responses.address_to_send_official_document_postal_code_you }}
{% endif %}
{% if responses.address_to_send_official_document_postal_code_you %}
, {{ responses.address_to_send_official_document_postal_code_you }}
{% endif %}
{% else %}
<span class="form-entry not-complete">&nbsp;</span>
{% endif %}
@ -671,7 +673,7 @@
</td>
<td colname="c2">
<p>Claimant 2:
{% if responses.address_to_send_official_document_street_spouse and responses.address_to_send_official_document_city_spouse and responses.address_to_send_official_document_country_spouse and responses.address_to_send_official_document_postal_code_spouse %}
{% if responses.address_to_send_official_document_street_spouse and responses.address_to_send_official_document_city_spouse and responses.address_to_send_official_document_country_spouse %}
{{ responses.address_to_send_official_document_street_spouse }}, {{ responses.address_to_send_official_document_city_spouse }},
{% if responses.address_to_send_official_document_prov_spouse %}
{{ responses.address_to_send_official_document_prov_spouse }},
@ -679,8 +681,10 @@
{% if responses.address_to_send_official_document_country_spouse == 'Other' %} {{ responses.address_to_send_official_document_other_country_spouse }}
{% else %}
{{ responses.address_to_send_official_document_country_spouse }}
{% endif %},
{{ responses.address_to_send_official_document_postal_code_spouse }}
{% endif %}
{% if responses.address_to_send_official_document_postal_code_spouse %}
, {{ responses.address_to_send_official_document_postal_code_spouse }}
{% endif %}
{% else %}
<span class="form-entry not-complete">&nbsp;</span>
{% endif %}


+ 68
- 36
edivorce/apps/core/templates/question/01_orders.html View File

@ -49,6 +49,7 @@ asked to provide details for each request.</p>
<b>Spousal support</b>
</label>
</div>
<div class="collapse-trigger collapsed" data-toggle="collapse"
aria-expanded="false" data-target="#collapseExample2"
aria-controls="collapseExample">
@ -65,6 +66,7 @@ asked to provide details for each request.</p>
from child support. Unlike child support, spousal support
is not a right in every case. You are entitled to spousal
support in certain situations.
</p>
<p>The objectives of spousal support are to:</p>
<ul>
<li>Deal with any economic advantages or disadvantages a
@ -85,6 +87,20 @@ asked to provide details for each request.</p>
</p>
</div>
</div>
<div class="collapse-trigger collapsed" data-toggle="collapse"
aria-expanded="false" data-target="#collapseSpousalSupport"
aria-controls="collapseSpousalSupport">
<div>
What if I already have a <b>Separation Agreement</b> or <b>Court Order</b> that deals with Spousal Support?
</div>
</div>
<div class="collapse" id="collapseSpousalSupport">
<div>
<p>
If you have a Separation Agreement or court order that deals with Spousal Support that you and your spouse do not wish changed, you may choose <b>NOT</b> to select this option.
</p>
</div>
</div>
<div class="information-message bg-danger" id="spouse_support_alert" hidden>
<p>
If you and your spouse have already agreed on spousal support
@ -141,6 +157,21 @@ asked to provide details for each request.</p>
what has been agreed).
</p>
</div>
<div class="collapse-trigger collapsed" data-toggle="collapse"
aria-expanded="false" data-target="#collapseDivision"
aria-controls="collapseDivision">
<div>
What if I already have a <b>Separation Agreement</b> or <b>Court Order</b> that deals with Division of Property and Debts?
</div>
</div>
<div class="collapse" id="collapseDivision">
<div>
<p>
If you have a Separation Agreement or court order that deals with Division of Property and Debts that you and your spouse do not wish changed, you may choose <b>NOT</b> to select this option.
</p>
</div>
</div>
</div>
<div class="question-well">
@ -152,50 +183,51 @@ asked to provide details for each request.</p>
</div>
<p>This may include
<span class="tooltip-link" data-toggle="tooltip" data-placement="auto"
data-html="true" data-trigger="click"
title="Child support<br>
<p>Parents have a duty under the law to support their children,
even if one parent doesn't see or take care of the children.
The money one parent pays to the other parent to help provide
for the daily needs of the children is called child support or
maintenance.</p>
">child support<i class="fa fa-question-circle" aria-hidden="true"></i>
</span>,
<span class="tooltip-link" data-toggle="tooltip" data-placement="auto"
data-html="true" data-trigger="click"
title="Parental responsibilities<br>
<p>The responsibilities guardians have for the children in their care, including decisions about daily care, education, religious upbringing, extracurricular activities, etc. After separation or divorce, guardians can share parental responsibilities in whatever way that's in the child's best interests, as decided by agreement or court order.</p>
<p>When a child's parents live together, both parents are the child's guardians (have guardianship). When the parents separate, both parents continue to be guardians unless they agree to change this or a court orders a change. A court can give guardianship of a child to a non-parent. Guardians are responsible for making all decisions about their child, including about daily care and supervision, education, health care, cultural or religious upbringing, and where the child will live.</p>
">parental responsibilities<i class="fa fa-question-circle" aria-hidden="true"></i>
</span>(guardianship),
<span class="tooltip-link" data-toggle="tooltip" data-placement="auto"
data-html="true" data-trigger="click"
title="Parenting time<br>
<p>The time that a guardian spends with a child and is responsible for the care and supervision of the child.</p>
">parenting time<i class="fa fa-question-circle" aria-hidden="true"></i>
</span> (access, contact with a child) and
<span class="tooltip-link" data-toggle="tooltip" data-placement="auto"
data-html="true" data-trigger="click"
title="Child support<br>
<p>Parents have a duty under the law to support their children,
even if one parent doesn't see or take care of the children.
The money one parent pays to the other parent to help provide
for the daily needs of the children is called child support or
maintenance.</p>
">child support<i class="fa fa-question-circle" aria-hidden="true"></i>
</span>,
guardianship, parental responsibilities, parenting time, contact with a child, custody and access.
data-html="true" data-trigger="click"
title="Custody<br>
<p>Under the Divorce Act, where and with whom a child lives, and the guardian's rights and responsibilities for the child. Under the BC Child, Family and Community Service Act, custody is similar.</p>
">custody<i class="fa fa-question-circle" aria-hidden="true"></i>
</span>.
</p>
<p>
<b>NOTE:</b> Just because you have children does not mean you have to select this option. Only select if you want a Judge to make an order about these items.
</p>
<div class="collapse-trigger collapsed" data-toggle="collapse"
aria-expanded="false" data-target="#collapseGuardian"
aria-controls="collapseGuardian">
aria-expanded="false" data-target="#collapseOrders"
aria-controls="collapseOrders">
<div>
What does being a guardian mean?
What if I already have a <b>Separation Agreement</b> or <b>Court Order</b> that deals with Orders Pertaining to Children?
</div>
</div>
<div class="collapse" id="collapseGuardian">
<div class="collapse" id="collapseOrders">
<div>
<p>Guardianship = parental responsibilities + parenting time</p>
<p>
Guardians are responsible for the care and upbringing of, and decision making about, their child.
There are two parts to guardianship: parental responsibilities and parenting time.
</p>
<p><strong>What happens when we separate?</strong></p>
<p>
If you and the other parent have lived together with your children, both of you continue to
be guardians after you separate. You'll need to figure out how you you'll care for and make
decisions about your children. That is, how will you divide or share parenting
responsibilities and parenting time?
</p>
<p>
Even though parents share these responsibilities when they're living together, the law does
not assume that any particular arrangement is in the children's best interests after you
split up. The law specifically says that courts can't assume that equal sharing of parenting
time or equal allocation of parental responsibilities are in the children's best interests.
</p>
<p>
More information on <a href="http://www.familylaw.lss.bc.ca/resources/fact_sheets/guardianship.php" target="_blank">
Guardianship: Parenting time and parental responsibilities </a>
can be found on the Family Law in B.C. website
If you have a Separation Agreement or court order that deals with your issues Pertaining to Children that you and your spouse do not wish changed, you may choose <b>NOT</b> to select this option.
</p>
</div>
</div>
@ -311,7 +343,7 @@ asked to provide details for each request.</p>
<h2>Not asking for child support but have children</h2>
<p>Even though you are not asking for an order for child support, you will
still need to answer some questions about your children. If you're asking
still need to answer some questions about your children and your income. If you're asking
for a divorce, the court won't make an order unless they're satisfied that
reasonable arrangements have been made for the children.</p>


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

@ -385,6 +385,11 @@
</span>
?
</h3>
{% if derived.show_fact_sheet_b %}
<p>
If the total in <b>Fact Sheet B</b> is <b>zero dollars ($0.00)</b>, select 'Both' are the payor below.
</p>
{% endif %}
<p>
Please select one
</p>


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

@ -16,7 +16,7 @@
<div class="radio">
<label>
{% input_field type="radio" name="how_will_calculate_income" autocomplete="off" value="using specific rules" data_invert_target="#agreement_entered_message" data_reveal_target="true" %}
Calculate your income using the
Provide your income using the
<a href="http://laws-lois.justice.gc.ca/eng/regulations/SOR-97-175/page-2.html#h-6" target="_blank">
specific rules (sections 15 to 20)
</a> set out in the Federal Guidelines


+ 12
- 5
edivorce/apps/core/templates/question/06_children_what_for.html View File

@ -30,14 +30,21 @@
<label class="radio-with-textbox">
{% input_field type="radio" class="radio-centered radio-with-other radio_with_textbox" name="child_support_in_order" value="MATCH" data_target_id="child_support_in_order_detail" data_reveal_target="false" data_target_class="support-amount-match" data_reveal_class="false" %}
{% comment "Child support guideline value scenarios" %}
If split or shared custody, prepopulate the field with the value from factsheet.
If sole custody, prepopulate the field with the value from "What is the monthly child support amount that is payable".
Assumption: If neither factsheet b (shared) nor factsheet c (split)
shows up, assume it is sole custody as there will be only
three cases, sole, split, or shared custody.
{% endcomment %}
{% if derived.show_fact_sheet_b or derived.show_fact_sheet_c %}
<div class="dollar-prefix">
{% money_input_field name="order_monthly_child_support_amount" value_src="difference_payment_amounts" class="money positive-float form-block response-textbox children-input-block child-support-amount" readonly="" %}
</div>Matches Child Support Guideline (amount calculated from Fact sheet)
{% else %}
<div class="dollar-prefix">
{% money_input_field name="order_monthly_child_support_amount" class="money positive-float form-block response-textbox children-input-block child-support-amount" data_ajax_only_radio_selected="true" %}
</div>Matches Child Support Guideline (amount calculated from Fact sheet)
{% money_input_field name="order_monthly_child_support_amount" value_src="payor_monthly_child_support_amount" class="money positive-float form-block response-textbox children-input-block child-support-amount" data_ajax_only_radio_selected="true" readonly="" %}
</div>Matches Child Support Guideline
{% endif %}
</label>
</div>
@ -178,7 +185,7 @@
</div>
<div class="question-well">
<h3>Do you have an
<h3>Do you already have a child support
<span class="tooltip-link"
data-toggle="tooltip" data-placement="right" data-html="true"
title="
@ -189,7 +196,7 @@
</p>
">
order <i class="fa fa-question-circle" aria-hidden="true"></i>
</span>(Provincial or Supreme Court) about support of the children?</h3>
</span>in Provincial or Supreme Court?</h3>
<div class="btn-radio-group" data-toggle="buttons">
<label class="btn btn-radio">
{% input_field type="radio" name="have_court_order" autocomplete="off" value="YES" data_target_id="court_order_details" data_reveal_target="true" %} Yes
@ -369,7 +376,7 @@
{% endif %}
<div class="question-well">
<h3>Please indicate which act you are asking for support under.</h3>
<h3>Please indicate which act you are asking for child support under.</h3>
<div class="radio">
<label>
{% input_field type="radio" name="child_support_act" class="" autocomplete="off" value="the Divorce Act (Canada) " %} the Divorce Act (Canada) -


Loading…
Cancel
Save