From 281873a35f6ff4422acbc816e1bcc6019dd65227 Mon Sep 17 00:00:00 2001 From: Justin Johnson Date: Mon, 8 Jan 2018 10:15:13 -0800 Subject: [PATCH] DIV-664 --- edivorce/apps/core/templates/pdf/form1.html | 143 +++++++++--------- .../question/06_children_income_expenses.html | 6 +- .../apps/core/templatetags/format_utils.py | 6 + 3 files changed, 81 insertions(+), 74 deletions(-) diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index 94a126a5..22ad0b33 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -213,6 +213,7 @@
Claimant 1 and Claimant 2 have not lived together since then
+
@@ -223,28 +224,28 @@ during the following period(s), in an unsuccessful attempt to reconcile:
[give dates of period(s)]

+ + + {% multiple_values_to_list source=responses.reconciliation_period as periods %} + {% if periods and responses.try_reconcile_after_separated == 'YES' %} + {% for period in periods %} + + + + + {% endfor %} + {% else %} + + + + + {% endif %} +
From: {{ period|first|date_formatter }}To: {{ period|last|date_formatter }}
From:  To:  
+
- - {% multiple_values_to_list source=responses.reconciliation_period as periods %} - {% if periods and responses.try_reconcile_after_separated == 'YES' %} - - {% for period in periods %} -

from: {{period | first |date_formatter }}

- {% endfor %} - - - {% for period in periods %} -

to: {{period | last |date_formatter }}

- {% endfor %} - - {% else %} -

From:  

-

To:  

- {% endif %} - (ii) {% checkbox False %} @@ -384,7 +385,7 @@ {{ child.child_name }} {{ child.child_birth_date|date_formatter }}   - {{ child.child_live_with }} + {{ child.child_live_with|claimantize }} {% endfor %} @@ -417,7 +418,7 @@ order respecting arrangements for parenting or contact: - {{ responses.order_respecting_arrangement }} + @@ -431,7 +432,7 @@ Claimant 1 and Claimant 2 are asking for an order for child support as follows: - {{ responses.order_for_child_support }} + @@ -467,7 +468,7 @@
Claimant 1 and Claimant 2 are asking for an order for spousal support as follows:
- {% if 'Spousal support' in orders and responses.spouse_support_details %} + {% if 'Spousal support' in responses.want_which_orders and responses.spouse_support_details %}
    {{responses.spouse_support_details|striptags|linebreaksli }}
{% endif %} @@ -497,56 +498,56 @@

6. Property and debt

- - - + + - - - - - + + + + + + + + +
-
A. Property claims under the Family Law Act

- - {% checkbox want_which_orders='Division of property and debts' %} +
+
A. Property claims under the Family Law Act

+ + {% checkbox want_which_orders='Division of property and debts' %} + +
+ Claimant 1 and Claimant 2 are asking for an order for:

+
+ + {% checkbox want_which_orders='Division of property and debts' deal_with_property_debt='Equal division' %} + +
+ an equal division of family property and family debt

+
+
+
+ + {% checkbox want_which_orders='Division of property and debts' deal_with_property_debt='Unequal division' %} + +
+ an unequal division of family property and family debt as follows: + + {% if responses.deal_with_property_debt == 'Unequal division' and responses.how_to_divide_property_debt and 'Division of property and debts' in responses.want_which_orders %} +
    {{ responses.how_to_divide_property_debt|striptags|linebreaksli }}
+ {% endif %} -
- Claimant 1 and Claimant 2 are asking for an order for:

-
- - {% checkbox want_which_orders='Division of property and debts' deal_with_property_debt='Equal division' %} - -
- an equal division of family property and family debt

-
-
-
- - {% checkbox want_which_orders='Division of property and debts' deal_with_property_debt='Unequal division' %} - -
- an unequal division of family property and family debt as follows: - - {% if responses.deal_with_property_debt == 'Unequal division' and responses.how_to_divide_property_debt and responses.want_which_orders == 'Division of property and debts' %} -
    {{ responses.how_to_divide_property_debt|striptags|linebreaksli }}
- {% endif %} - -
-
-
-
-
B. Other property claims

- {% checkbox responses.other_property_claims %} -
- Claimant 1 and Claimant 2 ask for an order respecting - an interest in property or for compensation instead - of an interest in that property, as follows:
- - {% if responses.other_property_claims %} -
    {{ responses.other_property_claims|striptags|linebreaksli }}
- {% endif %} - -
-
+
B. Other property claims

+ {% checkbox responses.other_property_claims %} +
+ Claimant 1 and Claimant 2 ask for an order respecting + an interest in property or for compensation instead + of an interest in that property, as follows:
+ + {% if responses.other_property_claims %} +
    {{ responses.other_property_claims|striptags|linebreaksli }}
+ {% endif %} + +
+

7. Other

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 fda8e12b..7c7e1e8e 100644 --- a/edivorce/apps/core/templates/question/06_children_income_expenses.html +++ b/edivorce/apps/core/templates/question/06_children_income_expenses.html @@ -15,7 +15,7 @@