Browse Source

Updated form dates to "dd/mmm/yyyy"

pull/160/head
Dominik Szopa 6 years ago
parent
commit
bfcabdea2e
4 changed files with 17 additions and 17 deletions
  1. +12
    -12
      edivorce/apps/core/templates/pdf/form1.html
  2. +1
    -1
      edivorce/apps/core/templates/pdf/form37.html
  3. +2
    -2
      edivorce/apps/core/templates/pdf/form52.html
  4. +2
    -2
      edivorce/apps/core/templatetags/format_utils.py

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

@ -61,7 +61,7 @@
<td> <td>
<span class="td-list-item">{% checkbox responses.when_were_you_live_married_like %}</span> <span class="td-list-item">{% checkbox responses.when_were_you_live_married_like %}</span>
began to live together in a marriage-like relationship on began to live together in a marriage-like relationship on
<em class="no-wrap">[dd mmm yyyy]</em>
<em class="no-wrap">[dd/mmm/yyyy]</em>
</td> </td>
<td colname="c2"> <td colname="c2">
{% response responses.when_were_you_live_married_like as_date=True %} {% response responses.when_were_you_live_married_like as_date=True %}
@ -70,7 +70,7 @@
<tr> <tr>
<td> <td>
<span class="td-list-item">{% checkbox responses.when_were_you_married %}</span> <span class="td-list-item">{% checkbox responses.when_were_you_married %}</span>
were married on <em class="no-wrap">[dd mmm yyyy]</em>
were married on <em class="no-wrap">[dd/mmm/yyyy]</em>
</td> </td>
<td colname="c2"> <td colname="c2">
{% response responses.when_were_you_married as_date=True %} {% response responses.when_were_you_married as_date=True %}
@ -79,7 +79,7 @@
<tr> <tr>
<td> <td>
<span class="td-list-item">{% checkbox responses.separation_date %}</span> <span class="td-list-item">{% checkbox responses.separation_date %}</span>
separated on <em class="no-wrap">[dd mmm yyyy]</em>
separated on <em class="no-wrap">[dd/mmm/yyyy]</em>
</td> </td>
<td colname="c2"> <td colname="c2">
{% response responses.separation_date as_date=True %} {% response responses.separation_date as_date=True %}
@ -89,7 +89,7 @@
<td> <td>
<span class="td-list-item">{% checkbox False %}</span> <span class="td-list-item">{% checkbox False %}</span>
were divorced from each other by order made on were divorced from each other by order made on
<em class="no-wrap">[dd mmm yyyy]</em>
<em class="no-wrap">[dd/mmm/yyyy]</em>
</td> </td>
<td colname="c2"><span class="form-entry not-complete">&nbsp;</span></td> <td colname="c2"><span class="form-entry not-complete">&nbsp;</span></td>
</tr> </tr>
@ -125,14 +125,14 @@
<td colname="c3"><strong>Claimant 2</strong></td> <td colname="c3"><strong>Claimant 2</strong></td>
</tr> </tr>
<tr> <tr>
<td>Birthdate: <em class="no-wrap">[dd mmm yyyy]</em></td>
<td>Birthdate: <em class="no-wrap">[dd/mmm/yyyy]</em></td>
<td colname="c2">{% response responses.birthday_you as_date=True %}</td> <td colname="c2">{% response responses.birthday_you as_date=True %}</td>
<td colname="c3">{% response responses.birthday_spouse as_date=True %}</td> <td colname="c3">{% response responses.birthday_spouse as_date=True %}</td>
</tr> </tr>
<tr> <tr>
<td> <td>
Ordinarily resident in British Columbia since: Ordinarily resident in British Columbia since:
<em class="no-wrap">[dd mmm yyyy]</em>
<em class="no-wrap">[dd/mmm/yyyy]</em>
</td> </td>
<td colname="c2"> <td colname="c2">
{% if responses.lived_in_bc_you == 'Since birth' %} {% if responses.lived_in_bc_you == 'Since birth' %}
@ -207,7 +207,7 @@
<td colspan="2"> <td colspan="2">
<span class="td-list-item">(i) {% checkbox responses.separation_date %}</span> <span class="td-list-item">(i) {% checkbox responses.separation_date %}</span>
Claimant 1 and Claimant 2 have lived separate and apart Claimant 1 and Claimant 2 have lived separate and apart
since {% response responses.separation_date %}
since {% response responses.separation_date|date_formatter %}
</td> </td>
</tr> </tr>
<tr> <tr>
@ -383,7 +383,7 @@
<table class="table table-fixed table-bordered"> <table class="table table-fixed table-bordered">
<tr> <tr>
<th align="center">Full name</th> <th align="center">Full name</th>
<th align="center">Birth date<br />[<em>dd mmm yyyy</em>]</th>
<th align="center">Birth date<br />[<em>dd/mmm/yyyy</em>]</th>
<th align="center">Resides with</th> <th align="center">Resides with</th>
</tr </tr
{% if responses.children_of_marriage == 'YES' %} {% if responses.children_of_marriage == 'YES' %}
@ -718,7 +718,7 @@
</tr> </tr>
<tr> <tr>
<td class="sig-col1"></td> <td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd mmm yyyy]</td>
<td class="sig-col2 sig-line-text">[dd/mmm/yyyy]</td>
<td class="sig-col3"></td> <td class="sig-col3"></td>
<td class="sig-col4 sig-line-text"> <td class="sig-col4 sig-line-text">
<p> <p>
@ -743,7 +743,7 @@
</tr> </tr>
<tr> <tr>
<td class="sig-col1"></td> <td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd mmm yyyy]</td>
<td class="sig-col2 sig-line-text">[dd/mmm/yyyy]</td>
<td class="sig-col3"></td> <td class="sig-col3"></td>
<td class="sig-col4 sig-line-text"> <td class="sig-col4 sig-line-text">
<p> <p>
@ -786,7 +786,7 @@
</tr> </tr>
<tr> <tr>
<td class="sig-col1"></td> <td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd mmm yyyy]</td>
<td class="sig-col2 sig-line-text">[dd/mmm/yyyy]</td>
<td class="sig-col3"></td> <td class="sig-col3"></td>
<td class="sig-col4 sig-line-text"> <td class="sig-col4 sig-line-text">
<p> <p>
@ -834,7 +834,7 @@
</tr> </tr>
<tr> <tr>
<td class="sig-col1"></td> <td class="sig-col1"></td>
<td class="sig-col2 sig-line-text">[dd mmm yyyy]</td>
<td class="sig-col2 sig-line-text">[dd/mmm/yyyy]</td>
<td class="sig-col3"></td> <td class="sig-col3"></td>
<td class="sig-col4 sig-line-text"> <td class="sig-col4 sig-line-text">
<p> <p>


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

@ -165,7 +165,7 @@
{% for child in responses.children %} {% for child in responses.children %}
<tr> <tr>
<td>{{ child.child_name }}</td> <td>{{ child.child_name }}</td>
<td>{{ child.child_birth_date|date_formatter }} &nbsp;</td>
<td style="white-space: nowrap">{{ child.child_birth_date|date_formatter }} &nbsp;</td>
<td>{{ child.child_birth_date|age }}</td> <td>{{ child.child_birth_date|age }}</td>
<td>{{ child.child_live_with|claimantize }}</td> <td>{{ child.child_live_with|claimantize }}</td>
<td>{{ child.child_relationship_to_you }}</td> <td>{{ child.child_relationship_to_you }}</td>


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

@ -82,8 +82,8 @@
{% else %}<span class="form-entry not-complete"></span>{% endif %} {% else %}<span class="form-entry not-complete"></span>{% endif %}
on on
{% if responses.when_were_you_married %} {% if responses.when_were_you_married %}
{{ responses.when_were_you_married|date_formatter }}
{% else %}<span class="form-entry not-complete"></span>{% endif %},
{{ responses.when_were_you_married|date_formatter }},
{% else %}<span class="form-entry not-complete"></span>,{% endif %}
are divorced from each other, the divorce to take effect on are divorced from each other, the divorce to take effect on
{% effective_date %}. {% effective_date %}.
</p> </p>


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

@ -26,7 +26,7 @@ def linebreaksli(value):
@register.filter @register.filter
def date_formatter(value): def date_formatter(value):
""" Changes date format from dd/mm/yyyy to dd mmm yyyy """
""" Changes date format to dd/mmm/yyyy """
if value is None or value == '': if value is None or value == '':
return '' return ''
@ -39,7 +39,7 @@ def date_formatter(value):
if date is None: if date is None:
date = datetime.strptime(value, '%b %d, %Y') date = datetime.strptime(value, '%b %d, %Y')
return date.strftime('%d %b %Y')
return date.strftime('%d/%b/%Y')
@register.simple_tag() @register.simple_tag()


Loading…
Cancel
Save