From c6c64da0a20034e3ba1c4ab1b3c2872ec92dbfff Mon Sep 17 00:00:00 2001 From: Mike Olund Date: Thu, 15 Jun 2017 16:01:18 -0700 Subject: [PATCH] DIV-480 - PDF fixes --- edivorce/apps/core/static/css/weasyprint.css | 31 +++++++ edivorce/apps/core/templates/pdf/form1.html | 82 ++++++++++++------- edivorce/apps/core/templates/pdf/form35.html | 67 ++++++++++++++- edivorce/apps/core/templates/pdf/form36.html | 2 +- edivorce/apps/core/templates/pdf/form38.html | 14 ++-- .../apps/core/templates/pdf/form38_we.html | 13 +-- edivorce/apps/core/templates/pdf/form52.html | 60 ++++++++------ .../apps/core/templatetags/summary_format.py | 4 +- 8 files changed, 203 insertions(+), 70 deletions(-) diff --git a/edivorce/apps/core/static/css/weasyprint.css b/edivorce/apps/core/static/css/weasyprint.css index b688d185..fe7e9248 100644 --- a/edivorce/apps/core/static/css/weasyprint.css +++ b/edivorce/apps/core/static/css/weasyprint.css @@ -16,7 +16,12 @@ } @page { + size: Letter; margin: 0.75cm; + + @bottom-right { + content: counter(page) " of " counter(pages) + } } body {font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;} @@ -72,4 +77,30 @@ i.fa { table-layout: fixed; } +.sig-table td.underline { + border-bottom: 1px solid black; +} +.sig-table .sig-line-text { + font-size: 0.88em; +} +.sig-table .sig-col1 { + max-width: 30px; +} +.sig-table .sig-col2 { + width: 220px; + padding-left: 0; +} +.sig-table .sig-col3 { + max-width: 10px; +} + +.sig-table .sig-col4 { + width: 350px; + padding-left: 0; +} + +.sig-table td { + border-top: none !important; +} + diff --git a/edivorce/apps/core/templates/pdf/form1.html b/edivorce/apps/core/templates/pdf/form1.html index 77fcd905..4e0730f1 100644 --- a/edivorce/apps/core/templates/pdf/form1.html +++ b/edivorce/apps/core/templates/pdf/form1.html @@ -380,40 +380,50 @@ - + +
- - + + + + + + + + +
Date:   [dd/mm/yyyy] -
 
+ 		Date:
[dd/mm/yyyy]

Signature of

Claimant 1 lawyer for Claimant 1

-

-  
-

- +

+
- - + + + + + + + + + @@ -437,23 +447,30 @@

(b) informed the party of the facilities and other resources, known to me, that may be available to assist in resolving the dispute.

-
Date:   [dd/mm/yyyy] -
 
+ 		Date:
[dd/mm/yyyy]

Signature of

Claimant 2 lawyer for Claimant 2

-

-  
-

+

+
- - + + + + + + + + +
Date:   [dd/mm/yyyy] -
 
+ 		Date:
[dd/mm/yyyy]

Signature of lawyer

-

-  
-

-
+ +


+

The following certificate must be completed for each party to a divorce claim who is represented by a lawyer.

@@ -478,23 +495,28 @@ (2) It is the duty of every barrister, solicitor, lawyer or advocate who undertakes to act on behalf of a spouse in a divorce proceeding to discuss with the spouse the advisability of negotiating the matters that may be the subject of a support order or a custody order and to inform the spouse of the mediation facilities known to him or her that might be able to assist the spouses in negotiating those matters.

- +

+
- - + + + + + + + + +
Date:   [dd/mm/yyyy] -
 
+ 		Date:
[dd/mm/yyyy]

Signature of lawyer

-

-  
-

-
+ Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce diff --git a/edivorce/apps/core/templates/pdf/form35.html b/edivorce/apps/core/templates/pdf/form35.html index 128b9ff8..ddd471ea 100644 --- a/edivorce/apps/core/templates/pdf/form35.html +++ b/edivorce/apps/core/templates/pdf/form35.html @@ -86,14 +86,73 @@

Child Support Affidavit in Form F37.

-

+

affidavit in Form F38.

- + +


+
- - + + + + + + + + + + + + + + + + + + + + + + + + +
Date:  
Signature of filing party lawyer for filing party(ies) 		Date:
[dd/mm/yyyy] +

Signature of

+

filing party lawyer for filing party(ies)

+
 
[Print name]
+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
Date:
[dd/mm/yyyy] +

Signature of

+

filing party lawyer for filing party(ies)

+
 
[Print name]
diff --git a/edivorce/apps/core/templates/pdf/form36.html b/edivorce/apps/core/templates/pdf/form36.html index 952beba8..419497a0 100644 --- a/edivorce/apps/core/templates/pdf/form36.html +++ b/edivorce/apps/core/templates/pdf/form36.html @@ -55,7 +55,7 @@ Date: -  
Registrar +  

Registrar diff --git a/edivorce/apps/core/templates/pdf/form38.html b/edivorce/apps/core/templates/pdf/form38.html index 77c61b7e..1d93dece 100644 --- a/edivorce/apps/core/templates/pdf/form38.html +++ b/edivorce/apps/core/templates/pdf/form38.html @@ -120,7 +120,8 @@ 6 I am neither directly nor indirectly a party to an agreement or conspiracy for the purpose of subverting the administration of justice, or to any agreement, understanding or arrangement to fabricate or suppress evidence or to deceive the court.

-

+

+ 7 There are no children of the marriage as defined by the Divorce Act (Canada).

{% comment "This section is out of scope" %} @@ -138,9 +139,11 @@

{% endcomment %} -

- 8 Additional Details -

+ {% comment "This section is out of scope" %} +

+ 8 Additional Details +

+ {% endcomment %} {% comment "This section is out of scope" %}

@@ -156,7 +159,8 @@

{% endcomment %} - +


+
diff --git a/edivorce/apps/core/templates/pdf/form38_we.html b/edivorce/apps/core/templates/pdf/form38_we.html index 128cddca..d01ccd09 100644 --- a/edivorce/apps/core/templates/pdf/form38_we.html +++ b/edivorce/apps/core/templates/pdf/form38_we.html @@ -130,7 +130,7 @@ 6 We are neither directly nor indirectly a party to an agreement or conspiracy for the purpose of subverting the administration of justice, or to any agreement, understanding or arrangement to fabricate or suppress evidence or to deceive the court.

-

+

7 There are no children of the marriage as defined by the Divorce Act (Canada).

{% comment "This section is out of scope" %} @@ -148,11 +148,14 @@

{% endcomment %} -

- 8 Additional Details -

+ {% comment "This section is out of scope" %} +

+ 8 Additional Details +

+ {% endcomment %} -
SWORN (OR AFFIRMED) BEFORE
+


+
diff --git a/edivorce/apps/core/templates/pdf/form52.html b/edivorce/apps/core/templates/pdf/form52.html index 9919dfb9..27c4b9c4 100644 --- a/edivorce/apps/core/templates/pdf/form52.html +++ b/edivorce/apps/core/templates/pdf/form52.html @@ -97,6 +97,8 @@ the divorce to take effect on {% if responses.divorce_take_effect_on_specific_date %}{{ responses.divorce_take_effect_on_specific_date }}{% else %}{% endif %}. {% endif %}

+ + {% comment "removed as per CLAW-480" %}

THIS COURT ORDERS that BY CONSENT:

@@ -113,41 +115,53 @@

THE FOLLOWING PARTIES APPROVE THE FORM OF THIS ORDER AND CONSENT TO EACH OF THE ORDERS, IF ANY, THAT ARE INDICATED ABOVE AS BEING BY CONSENT:

+ {% endcomment %} -
SWORN (OR AFFIRMED) BEFORE
+

+ +
+ - + + + + + - + - - + + + + + + + + + + + + + +
-

-  
Signature of
party lawyer for -

+ 		   
+

Signature of

- + Claimant 1 lawyer for Claimant 1

+   +

Signature of

-  
Signature of
party lawyer for -

-

- + Claimant 2 lawyer for Claimant 2

- - -

- By the Court. -

-

-  
Registrar -

- 		  By the Court.
   

  Registrar
-
Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce diff --git a/edivorce/apps/core/templatetags/summary_format.py b/edivorce/apps/core/templatetags/summary_format.py index cfc4fb72..6bdde37a 100644 --- a/edivorce/apps/core/templatetags/summary_format.py +++ b/edivorce/apps/core/templatetags/summary_format.py @@ -280,9 +280,9 @@ def prequal_tag(source): tags.append(first_column + reconciliation_period['question__name'] + second_column + reconciliation_period_reformat(reconciliation_period['value']) + end_tag) if children_of_marriage: tags.append(first_column + children_of_marriage['question__name'] + second_column + children_of_marriage['value'] + end_tag) - if children_of_marriage['value'] == 'YES' and any_under_19: + if children_of_marriage and children_of_marriage['value'] == 'YES' and any_under_19: tags.append(first_column + any_under_19['question__name'] + second_column + any_under_19['value'] + end_tag) - if children_of_marriage['value'] == 'YES' and any_under_19['value'] == 'NO' and financial_support: + if children_of_marriage and children_of_marriage['value'] == 'YES' and any_under_19['value'] == 'NO' and financial_support: tags.append(first_column + financial_support['question__name'] + second_column + json.loads(financial_support['value'])[0] + end_tag) if certificate: tags.append(first_column + certificate['question__name'] + second_column + certificate['value'] + end_tag)