From fcd903b2fb81c64345fbd252ca0dd111960fb7c7 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 26 Mar 2019 10:56:36 -0700
Subject: [PATCH 1/7] DIV-908: Added drop down questions on Step1.

---
 .../core/templates/question/01_orders.html    | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index fe573bea..806539a0 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -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">
@@ -199,6 +230,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="#collapseOrders"
+             aria-controls="collapseOrders">
+            <div>
+                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="collapseOrders">
+            <div>
+                <p>
+                    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>
 
         <div class="information-message bg-danger" id="child_support_alert" hidden>
         <p><strong>Asking for Orders Pertaining to Children in Provincial or Supreme Court.</strong></p>

From 262c34f60ebc01292a5d8c860987a32448001438 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 26 Mar 2019 11:53:47 -0700
Subject: [PATCH 2/7] DIV-909, 910, 930, 931: Updated wording of questions.

---
 edivorce/apps/core/templates/question/01_orders.html        | 2 +-
 .../templates/question/06_children_income_expenses.html     | 2 +-
 .../apps/core/templates/question/06_children_what_for.html  | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index 806539a0..6760131e 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -356,7 +356,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>
 
diff --git a/edivorce/apps/core/templates/question/06_children_income_expenses.html b/edivorce/apps/core/templates/question/06_children_income_expenses.html
index 186b3a5c..201c9185 100644
--- a/edivorce/apps/core/templates/question/06_children_income_expenses.html
+++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html
@@ -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
diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html
index 89457995..0b63649d 100644
--- a/edivorce/apps/core/templates/question/06_children_what_for.html
+++ b/edivorce/apps/core/templates/question/06_children_what_for.html
@@ -178,7 +178,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 +189,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 +369,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) -

From ca76d9e0b0678276b17d07a3929cacb16b4c6094 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 26 Mar 2019 12:06:42 -0700
Subject: [PATCH 3/7] DIV-911: Added support text for who's the payor question.

---
 edivorce/apps/core/templates/question/06_children_facts.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/edivorce/apps/core/templates/question/06_children_facts.html b/edivorce/apps/core/templates/question/06_children_facts.html
index 9cf9c56c..7597d614 100644
--- a/edivorce/apps/core/templates/question/06_children_facts.html
+++ b/edivorce/apps/core/templates/question/06_children_facts.html
@@ -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>

From 439b406c3dbe7f799095dccf2dc8a6917b8ec23f Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 26 Mar 2019 14:45:39 -0700
Subject: [PATCH 4/7] DIV-920: Fixed Form 1 to show address without optional
 postal code.

---
 edivorce/apps/core/templates/pdf/form1.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html
index bd6d3580..a5cb5ea6 100644
--- a/edivorce/apps/core/templates/pdf/form1.html
+++ b/edivorce/apps/core/templates/pdf/form1.html
@@ -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 %}

From 8162674f74c7393190c2206f251076086f653b8d Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 26 Mar 2019 15:49:27 -0700
Subject: [PATCH 5/7] DIV-937: Updated orders pertaining children section of
 step 1.

---
 .../core/templates/question/01_orders.html    | 69 ++++++++++---------
 1 file changed, 38 insertions(+), 31 deletions(-)

diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index 6760131e..9f644534 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -183,50 +183,57 @@ 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="#collapseAgreement"
+             aria-controls="collapseAgreement">
             <div>
-                What does being a guardian mean?
+                What if I have a ‘Separation Agreement’?
             </div>
         </div>
-        <div class="collapse" id="collapseGuardian">
+        <div class="collapse" id="collapseAgreement">
             <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?
+                    A separation agreement is a document that sets out how you and your spouse have agreed to deal with matters like parenting support and property after you separate (Provincial family law calls it an agreement).
                 </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.
+                    It is up to you whether you want to select this option and have the parenting and support terms you and your spouse have in your separation agreement to also be included in a formal Court Order. It is important to know that if you wish to file your separation agreement, the parts of the agreement that deal with parenting and support can be enforced as if they were in a court order. More information on how to file your agreement can be found on the Family Law website. A tool to help you create a separation agreement can be found on the My Law BC website.
                 </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
+                    You will be asked about whether you have a separation agreement later in the application.
                 </p>
             </div>
         </div>

From 2ff15e3d2708a359731f6878374c36ca31f6058b Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Tue, 26 Mar 2019 17:31:39 -0700
Subject: [PATCH 6/7] DIV-926,928: Updated Child support amount value on What
 for step 6.

---
 .../core/templates/question/06_children_what_for.html | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/edivorce/apps/core/templates/question/06_children_what_for.html b/edivorce/apps/core/templates/question/06_children_what_for.html
index 0b63649d..3b966b7b 100644
--- a/edivorce/apps/core/templates/question/06_children_what_for.html
+++ b/edivorce/apps/core/templates/question/06_children_what_for.html
@@ -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>

From 71784ae57045a66247627ea72c14a34bda863f08 Mon Sep 17 00:00:00 2001
From: Charles Shin <charles@openroad.ca>
Date: Wed, 27 Mar 2019 12:08:58 -0700
Subject: [PATCH 7/7] DIV-937: Removed duplicate dropdown help text.

---
 .../core/templates/question/01_orders.html    | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/edivorce/apps/core/templates/question/01_orders.html b/edivorce/apps/core/templates/question/01_orders.html
index 9f644534..50fe2bad 100644
--- a/edivorce/apps/core/templates/question/01_orders.html
+++ b/edivorce/apps/core/templates/question/01_orders.html
@@ -217,26 +217,6 @@ asked to provide details for each request.</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="#collapseAgreement"
-             aria-controls="collapseAgreement">
-            <div>
-                What if I have a ‘Separation Agreement’?
-            </div>
-        </div>
-        <div class="collapse" id="collapseAgreement">
-            <div>
-                <p>
-                    A separation agreement is a document that sets out how you and your spouse have agreed to deal with matters like parenting support and property after you separate (Provincial family law calls it an agreement).
-                </p>
-                <p>
-                    It is up to you whether you want to select this option and have the parenting and support terms you and your spouse have in your separation agreement to also be included in a formal Court Order. It is important to know that if you wish to file your separation agreement, the parts of the agreement that deal with parenting and support can be enforced as if they were in a court order. More information on how to file your agreement can be found on the Family Law website. A tool to help you create a separation agreement can be found on the My Law BC website.
-                </p>
-                <p>
-                    You will be asked about whether you have a separation agreement later in the application.
-                </p>
-            </div>
-        </div>
         <div class="collapse-trigger collapsed" data-toggle="collapse"
              aria-expanded="false" data-target="#collapseOrders"
              aria-controls="collapseOrders">