Merge pull request #30 from bcgov/DIV-900

DIV-900, 903, 904, 905, and 907

edivorce/apps/core/static/css/main.scss

@@ -291,6 +291,10 @@ input[type=number]::-webkit-outer-spin-button {
 	}
 }
 
+.child-support-amount[readonly] {
+	background: #f2f2f2;
+}
+
 div.dollar-prefix {
 	position: relative;
 

edivorce/apps/core/templates/dashboard/print_form.html

@@ -484,6 +484,13 @@
           </a> for anyone requesting a name change
         </li>
         {% endif %}
+        {% if how_will_calculate_income == 'entered agreement' %}
+        <li>Completed
+          <a href="https://www2.gov.bc.ca/assets/gov/law-crime-and-justice/courthouse-services/court-files-records/court-forms/supreme-family/f9.pdf?forcedownload=true" target="_blank">
+           Agreement as to Annual Income (F9)
+         </a>
+        </li>
+        {% endif %}
     </ul>
 </div>
 
@@ -508,6 +515,9 @@
             <li>Affidavit — Desk Order Divorce Form (F30)</li>
             {% endcomment %}
         {% endif %}
+        {% if how_will_calculate_income == 'entered agreement' %}
+          <li>Agreement as to Annual Income (F9)</li>
+        {% endif %}
     </ul>
 
     <p>

edivorce/apps/core/templates/question/06_children_what_for.html

@@ -28,30 +28,19 @@
         </h3>
         <div class="radio">
             <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" %}
 
-                {% if how_will_calculate_income != 'entered agreement' %}
-                    {% 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" %}
-
-                    {% if 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
-                    {% 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
-                    {% endif %}
+                {% 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 %}
-                    {% 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" %}
-
                     <div class="dollar-prefix">
-                        {% money_input_field name="order_monthly_child_support_amount" class="money positive-float form-block response-textbox children-input-block" %}
-                    </div>
+                        {% 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
                 {% endif %}
             </label>
         </div>
-
-        {% if how_will_calculate_income != 'entered agreement' %}
         <div class="radio">
             <label class="radio-with-textbox">
                 {% input_field type="radio" class="radio-centered radio-with-other radio_with_textbox" name="child_support_in_order" value="DIFF" data_target_class="support-amount-match" data_reveal_class="true" data_target_id="child_support_in_order_detail" data_reveal_target="false" %}
@@ -62,9 +51,6 @@
                 Different amount (does not match Child Support Guidelines)
             </label>
         </div>
-        {% endif %}
-
-        {% if how_will_calculate_income != 'entered agreement' %}
         <div class="radio">
             <label>
                 {% input_field type="radio" class="radio-with-other radio_with_textbox" name="child_support_in_order" value="NO" data_target_id="child_support_in_order_detail" data_reveal_target="true" data_target_class="support-amount-match" data_reveal_class="false" %}We are not asking for child support to be included in the order
@@ -74,7 +60,6 @@
                 {% input_field type="textarea" name="child_support_in_order_reason" class="other-textbox response-textarea form-control" tabindex="-1" maxlength="500" rows="3" %}
             </p>
         </div>
-        {% endif %}
     </div>
 
     <div class="question-well support-amount-match hide-grouping" id="amount_does_not_match" hidden>

edivorce/apps/core/templates/question/10_other_questions.html

@@ -28,13 +28,13 @@
         <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_you" value="USA" %}USA</label></div>
         <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_you" value="Other" %}Other {% input_field type="text" name="address_to_send_official_document_other_country_you" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
 
-        <p>Postal code</p>
+        <p>Postal code (optional)</p>
         {% input_field type="text" name="address_to_send_official_document_postal_code_you" class="form-block input-wide response-textbox" %}
     </div>
 
     <div>
         <p>If you don’t live within 30 km of a court registry, you must provide a fax number or email address.
-            If you main address is a PO box, you can list this instead of the fax or email but you must also list
+            If your main address is a PO box, you can list this instead of the fax or email but you must also list
             an address that’s not a PO box.</p>
 
         <p>Fax number (optional)</p>
@@ -62,7 +62,7 @@
         <div class="radio"><label>{% input_field type="radio" class="radio-with-other" name="address_to_send_official_document_country_spouse" value="USA" %}USA</label></div>
         <div class="radio"><label>{% input_field type="radio" class="radio-with-other radio_with_textbox" name="address_to_send_official_document_country_spouse" value="Other" %}Other {% input_field type="text" name="address_to_send_official_document_other_country_spouse" class="response-textbox other-textbox input-inline" tabindex="-1" %}</label></div>
 
-        <p>Postal code</p>
+        <p>Postal code (optional)</p>
         {% input_field type="text" name="address_to_send_official_document_postal_code_spouse" class="form-block input-wide response-textbox" %}
     </div>
 

edivorce/apps/core/tests.py

@@ -511,7 +511,7 @@ class UserResponseTestCase(TestCase):
                                                                             'question__conditional_target',
                                                                             'question__reveal_response',
                                                                             'question__required')
-        self.assertEqual(is_complete(step, lst)[0], False)
+        self.assertEqual(is_complete(step, lst)[0], True)
 
         # All required questions for spouse and you
         create_response(user, 'address_to_send_official_document_postal_code_spouse', 'Canada')

edivorce/fixtures/Question.json

@@ -591,8 +591,7 @@
     "fields": {
         "name": "Postal code",
         "description": "For step 9, Form 1 8. Claimants' addresses for service, Form 38(joint) Affidavit section",
-        "summary_order": 57,
-        "required": "Required"
+        "summary_order": 57
     },
     "model": "core.question",
     "pk": "address_to_send_official_document_postal_code_you"
@@ -671,8 +670,7 @@
     "fields": {
         "name": "Postal code",
         "description": "For step 9, Form 1 8. Claimants' addresses for service",
-        "summary_order": 65,
-        "required": "Required"
+        "summary_order": 65
     },
     "model": "core.question",
     "pk": "address_to_send_official_document_postal_code_spouse"