creylopez
/
django-ex
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 2 Wiki Activity
Browse Source

DIV-480 - PDF fixes

pull/160/head
Mike Olund 8 years ago
parent
1de99d7b73
commit
c6c64da0a2
8 changed files with 203 additions and 70 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +31
    -0
      edivorce/apps/core/static/css/weasyprint.css
  2. +52
    -30
      edivorce/apps/core/templates/pdf/form1.html
  3. +63
    -4
      edivorce/apps/core/templates/pdf/form35.html
  4. +1
    -1
      edivorce/apps/core/templates/pdf/form36.html
  5. +9
    -5
      edivorce/apps/core/templates/pdf/form38.html
  6. +8
    -5
      edivorce/apps/core/templates/pdf/form38_we.html
  7. +37
    -23
      edivorce/apps/core/templates/pdf/form52.html
  8. +2
    -2
      edivorce/apps/core/templatetags/summary_format.py

+ 31
- 0
edivorce/apps/core/static/css/weasyprint.css View File

@ -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;
}

+ 52
- 30
edivorce/apps/core/templates/pdf/form1.html View File

@ -380,40 +380,50 @@
</tr>
</tbody>
</table>
<table class="table">
<table class="table sig-table">
<tbody>
<tr>
<td> Date: <span class="form-entry not-complete">&nbsp;</span> [<em>dd/mm/yyyy</em>]</td>
<td>
<div class="form-entry form-bold not-complete">&nbsp;</div>
<td class="sig-col1">Date:</td>
<td class="sig-col2 underline"></td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd/mm/yyyy]</td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text">
<p>
Signature of
</p>
<p>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 1 <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 1
</p>
<p>
<span class="form-entry not-complete">&nbsp;</span><br />
</p>
</td>
</tr>
</tbody>
</table>
<table class="table">
<br><br>
<table class="table sig-table">
<tbody>
<tr>
<td> Date: <span class="form-entry not-complete">&nbsp;</span> [<em>dd/mm/yyyy</em>]</td>
<td>
<div class="form-entry form-bold not-complete">&nbsp;</div>
<td class="sig-col1">Date:</td>
<td class="sig-col2 underline"></td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd/mm/yyyy]</td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text">
<p>
Signature of
</p>
<p>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 2 <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 2
</p>
<p>
<span class="form-entry not-complete">&nbsp;</span><br />
</p>
</td>
</tr>
</tbody>
@ -437,23 +447,30 @@
<p class="schIndent2">
(b) informed the party of the facilities and other resources, known to me, that may be available to assist in resolving the dispute.
</p>
<table class="table">
<br><br>
<table class="table sig-table">
<tbody>
<tr>
<td> Date: <span class="form-entry not-complete">&nbsp;</span> [<em>dd/mm/yyyy</em>]</td>
<td>
<div class="form-entry form-bold not-complete">&nbsp;</div>
<td class="sig-col1">Date:</td>
<td class="sig-col2 underline"></td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd/mm/yyyy]</td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text">
<p>
Signature of lawyer
</p>
<p>
<span class="form-entry not-complete">&nbsp;</span><br />
</p>
</td>
</tr>
</tbody>
</table>
<hr />
<br><br><br>
<p class="text-center">
<em> The following certificate must be completed for each party to a divorce claim who is represented by a lawyer. </em>
</p>
@ -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.
</p>
<table class="table">
<br><br>
<table class="table sig-table">
<tbody>
<tr>
<td> Date: <span class="form-entry not-complete">&nbsp;</span> [<em>dd/mm/yyyy</em>]</td>
<td>
<div class="form-entry form-bold not-complete">&nbsp;</div>
<td class="sig-col1">Date:</td>
<td class="sig-col2 underline"></td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd/mm/yyyy]</td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text">
<p>
Signature of lawyer
</p>
<p>
<span class="form-entry not-complete">&nbsp;</span><br />
</p>
</td>
</tr>
</tbody>
</table>
<hr />
<small>Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce</small>
</div>
</body>


+ 63
- 4
edivorce/apps/core/templates/pdf/form35.html View File

@ -86,14 +86,73 @@
<p class="schIndent1">
<i class="fa fa-square-o" aria-hidden="true"></i> Child Support Affidavit in Form F37.
</p>
<p class="schIndent1">
<p class="schIndent1 force-break">
<i class="fa fa-square-o" aria-hidden="true"></i> affidavit in Form F38.
</p>
<table class="table table-bordered force-break">
<br><br><br>
<table class="table sig-table">
<tbody>
<tr>
<td colname="c1" valign="top"> Date: <span class="form-entry not-complete"></span> </td>
<td colname="c2" align="right"> <span class="form-entry not-complete">&nbsp;</span><br> Signature of <i class="fa fa-square-o" aria-hidden="true"></i> filing party <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for filing party(ies) </td>
<td class="sig-col1">Date:</td>
<td class="sig-col2 underline"></td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd/mm/yyyy]</td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p><i class="fa fa-square-o" aria-hidden="true"></i> filing party <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for filing party(ies)</p>
</td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2"></td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text"> [Print name] </td>
</tr>
</tbody>
</table>
<br><br>
<table class="table sig-table">
<tbody>
<tr>
<td class="sig-col1">Date:</td>
<td class="sig-col2 underline"></td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd/mm/yyyy]</td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p><i class="fa fa-square-o" aria-hidden="true"></i> filing party <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for filing party(ies)</p>
</td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3"></td>
<td class="sig-col4 underline"></td>
</tr>
<tr>
<td class="sig-col1"></td>
<td class="sig-col2"></td>
<td class="sig-col3"></td>
<td class="sig-col4 sig-line-text"> [Print name] </td>
</tr>
</tbody>
</table>


+ 1
- 1
edivorce/apps/core/templates/pdf/form36.html View File

@ -55,7 +55,7 @@
<tr>
<td colname="c1"> Date: <span class="form-entry not-complete"></span> </td>
<td colname="c2"> <span class="form-entry not-complete">&nbsp;</span><br> Registrar </td>
<td colname="c2"> <span class="form-entry not-complete">&nbsp;</span><br><br>Registrar </td>
</tr>
</tbody>
</table>


+ 9
- 5
edivorce/apps/core/templates/pdf/form38.html View File

@ -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.
</p>
<p class="schIndent1">
<p class="schIndent1 force-break">
<!-- Keep question #7 together with the sig block, so the sig block is never on a page by iteself. -->
7 There are no children of the marriage as defined by the <em>Divorce Act</em> (Canada).
</p>
{% comment "This section is out of scope" %}
@ -138,9 +139,11 @@
</p>
{% endcomment %}
<p class="schIndent1">
8 Additional Details <span class="form-entry form-textarea not-complete"> </span>
</p>
{% comment "This section is out of scope" %}
<p class="schIndent1">
8 Additional Details <span class="form-entry form-textarea not-complete"> </span>
</p>
{% endcomment %}
{% comment "This section is out of scope" %}
<p>
@ -156,7 +159,8 @@
</p>
{% endcomment %}
<table class="table table-bordered force-break">
<br><br><br>
<table class="table table-bordered">
<tbody>
<tr>
<td colname="c1"> SWORN (OR AFFIRMED) BEFORE </td>


+ 8
- 5
edivorce/apps/core/templates/pdf/form38_we.html View File

@ -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.
</p>
<p class="schIndent1">
<p class="schIndent1 force-break">
7 There are no children of the marriage as defined by the <em>Divorce Act</em> (Canada).
</p>
{% comment "This section is out of scope" %}
@ -148,11 +148,14 @@
</p>
{% endcomment %}
<p class="schIndent1 avoid-break">
8 Additional Details <span class="form-entry form-textarea not-complete"> </span>
</p>
{% comment "This section is out of scope" %}
<p class="schIndent1">
8 Additional Details <span class="form-entry form-textarea not-complete"> </span>
</p>
{% endcomment %}
<table class="table table-bordered force-break">
<br><br><br>
<table class="table table-bordered">
<tbody>
<tr>
<td colname="c1"> SWORN (OR AFFIRMED) BEFORE </td>


+ 37
- 23
edivorce/apps/core/templates/pdf/form52.html View File

@ -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 %}<span class="form-entry not-complete"></span>{% endif %}.
{% endif %}
</p>
{% comment "removed as per CLAW-480" %}
<p>
THIS COURT ORDERS that BY CONSENT:
</p>
@ -113,41 +115,53 @@
<p class="force-break">
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:
</p>
{% endcomment %}
<table class="table table-bordered">
<br><br>
<table class="table sig-table">
<tbody>
<tr>
<td>
<p>
<span class="form-entry not-complete">&nbsp;</span><br> Signature of<br> <i class="fa fa-square-o" aria-hidden="true"></i> party <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for <span class="form-entry not-complete"></span>
</p>
<td class="sig-col4 underline">&nbsp;</td>
<td style="width:10px">&nbsp;</td>
<td class="sig-col4 underline">&nbsp;</td>
</tr>
<tr>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p>
<span class="form-entry not-complete"></span>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 1 <i
class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 1<span
class="form-entry not-complete"></span>
</p>
</td>
<td>
<td>&nbsp;</td>
<td class="sig-col4 sig-line-text">
<p>Signature of</p>
<p>
<span class="form-entry not-complete">&nbsp;</span><br> Signature of<br> <i class="fa fa-square-o" aria-hidden="true"></i> party <i class="fa fa-square-o" aria-hidden="true"></i> lawyer for <span class="form-entry not-complete"></span>
</p>
<p>
<span class="form-entry not-complete"></span>
<i class="fa fa-square-o" aria-hidden="true"></i> Claimant 2 <i
class="fa fa-square-o" aria-hidden="true"></i> lawyer for Claimant 2<span
class="form-entry not-complete"></span>
</p>
</td>
</tr>
<tr>
<td>
</td>
<td>
<p class="text-right">
By the Court.
</p>
<p class="text-right">
<span class="form-entry not-complete">&nbsp;</span><br> Registrar
</p>
</td>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4">By the Court.</td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4 underline">&nbsp;<br><br></td>
</tr>
<tr>
<td class="sig-col2">&nbsp;</td>
<td class="sig-col3">&nbsp;</td>
<td class="sig-col4">Registrar</td>
</tr>
</tbody>
</table>
<hr />
<small>Printed on {% now "F jS, Y" %} from https://justice.gov.bc.ca/divorce</small>
</div>
</body>


+ 2
- 2
edivorce/apps/core/templatetags/summary_format.py View File

@ -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)


Write Preview
Loading…
Cancel
Save