Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit f8650ac

Browse files
vysakh-menon-aotvysakh-menon-aot
authored
34595 optional first name for director (#4740)
1 parent ba3b493 commit f8650ac

33 files changed

Lines changed: 250 additions & 174 deletions

File tree

‎legal-api/poetry.lock‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎legal-api/pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "legal-api"
3-
version = "3.1.19"
3+
version = "3.1.20"
44
description = ""
55
authors = [
66
{name = "thor",email = "[email protected]"}

‎legal-api/report-templates/template-parts/business-summary/parties.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
{% if party.officer.partyType == 'organization' %}
2020
<span class="upper-text">{{ party.officer.organizationName }}</span>
2121
{% else %}
22-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
23-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
22+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
23+
{% if party.officer.firstName or party.officer.middleInitial %},{% endif %}
24+
{% if party.officer.firstName %}
25+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
26+
{% endif %}
2427
{% if party.officer.middleInitial %}
2528
<span class="capitalize-text">{{ party.officer.middleInitial }}</span>
2629
{% endif %}

‎legal-api/report-templates/template-parts/business-summary/receiverInformation.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
{% if party.officer.partyType == 'organization' %}
1111
<span class="upper-text section-sub-title">{{ party.officer.organizationName }}</span>
1212
{% else %}
13-
<span class="upper-text section-sub-title">{{ party.officer.lastName }}</span>,
14-
<span class="upper-text section-sub-title">{{ party.officer.firstName }}</span>
13+
<span class="upper-text section-sub-title">{{ party.officer.lastName }}</span>
14+
{% if party.officer.firstName or party.officer.middleInitial %},{% endif %}
15+
{% if party.officer.firstName %}
16+
<span class="upper-text section-sub-title">{{ party.officer.firstName }}</span>
17+
{% endif %}
1518
{% if party.officer.middleInitial %}
1619
<span class="upper-text section-sub-title">{{ party.officer.middleInitial }}</span>
1720
{% endif %}

‎legal-api/report-templates/template-parts/business-summary/recordKeeper.html‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
<tr class="no-page-break">
99
<td class="col-33">
1010
<div class="section-sub-title">
11-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
12-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
11+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
12+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
13+
{% if party.officer.firstName %}
14+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
15+
{% endif %}
1316
{% if party.officer.middleName %}
1417
<span class="capitalize-text">{{ party.officer.middleName }}</span>
1518
{% endif %}
@@ -42,4 +45,4 @@
4245
</tr>
4346
{% endfor %}
4447
</table>
45-
{% endif %}
48+
{% endif %}

‎legal-api/report-templates/template-parts/change-of-registration/partner.html‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@
1313
{% if party.officer.partyType == 'organization' %}
1414
<span class="upper-text">{{ party.officer.organizationName }}</span>
1515
{% else %}
16-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
17-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
16+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
17+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
18+
{% if party.officer.firstName %}
19+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
20+
{% endif %}
1821
{% if party.officer.middleName %}
1922
<span class="capitalize-text">{{ party.officer.middleName }}</span>
2023
{% endif %}
@@ -94,8 +97,11 @@
9497
{% if party.officer.partyType == 'organization' %}
9598
<span class="upper-text">{{ party.officer.organizationName }}</span>
9699
{% else %}
97-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
98-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
100+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
101+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
102+
{% if party.officer.firstName %}
103+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
104+
{% endif %}
99105
{% if party.officer.middleName %}
100106
<span class="capitalize-text">{{ party.officer.middleName }}</span>
101107
{% endif %}
@@ -171,8 +177,11 @@
171177
{% if party.officer.partyType == 'organization' %}
172178
<span class="upper-text">{{ party.officer.organizationName }}</span>
173179
{% else %}
174-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
175-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
180+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
181+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
182+
{% if party.officer.firstName %}
183+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
184+
{% endif %}
176185
{% if party.officer.middleName %}
177186
<span class="capitalize-text">{{ party.officer.middleName }}</span>
178187
{% endif %}

‎legal-api/report-templates/template-parts/change-of-registration/proprietor.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,11 @@
1919
{% if party.officer.partyType == 'organization' %}
2020
<span class="upper-text">{{ party.officer.organizationName }}</span>
2121
{% else %}
22-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
23-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
22+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
23+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
24+
{% if party.officer.firstName %}
25+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
26+
{% endif %}
2427
{% if party.officer.middleName %}
2528
<span class="capitalize-text">{{ party.officer.middleName }}</span>
2629
{% endif %}

‎legal-api/report-templates/template-parts/common/directors.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,11 @@
99
<tr class="no-page-break">
1010
<td class="col-33">
1111
<div class="section-sub-title">
12-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
13-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
12+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
13+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
14+
{% if party.officer.firstName %}
15+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
16+
{% endif %}
1417
{% if party.officer.middleName %}
1518
<span class="capitalize-text">{{ party.officer.middleName }}</span>
1619
{% endif %}

‎legal-api/report-templates/template-parts/correction/directors.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@
1010
<tr class="no-page-break">
1111
<td class="col-33">
1212
<div class="section-sub-title">
13-
<span class="capitalize-text">{{ party.officer.lastName }}</span>,
14-
<span class="capitalize-text">{{ party.officer.firstName }}</span>
13+
<span class="capitalize-text">{{ party.officer.lastName }}</span>
14+
{% if party.officer.firstName or party.officer.middleName %},{% endif %}
15+
{% if party.officer.firstName %}
16+
<span class="capitalize-text">{{ party.officer.firstName }}</span>
17+
{% endif %}
1518
{% if party.officer.middleName %}
1619
<span class="capitalize-text">{{ party.officer.middleName }}</span>
1720
{% endif %}

‎legal-api/report-templates/template-parts/directors.html‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
<tr class="no-page-break">
66
<td class="col-33">
77
<div class="section-sub-title">
8-
<span class="capitalize-text">{{ director.officer.lastName }}</span>,
8+
<span class="capitalize-text">{{ director.officer.lastName }}</span>
9+
{% if director.officer.firstName or director.officer.middleInitial is defined %},{% endif %}
10+
{% if director.officer.firstName %}
911
<span class="capitalize-text">{{ director.officer.firstName }}</span>
12+
{% endif %}
1013
{% if director.officer.middleInitial is defined %}
1114
<span class="capitalize-text">{{ director.officer.middleInitial }}</span>
1215
{% endif %}
@@ -61,8 +64,11 @@
6164
<tr class="no-page-break">
6265
<td class="col-33">
6366
<div class="section-sub-title">
64-
<span class="capitalize-text">{{ director.officer.lastName }}</span>,
67+
<span class="capitalize-text">{{ director.officer.lastName }}</span>
68+
{% if director.officer.firstName or director.officer.middleInitial is defined %},{% endif %}
69+
{% if director.officer.firstName %}
6570
<span class="capitalize-text">{{ director.officer.firstName }}</span>
71+
{% endif %}
6672
{% if director.officer.middleInitial is defined %}
6773
<span class="capitalize-text">{{ director.officer.middleInitial }}</span>
6874
{% endif %}
@@ -118,8 +124,11 @@
118124
<tr class="no-page-break">
119125
<td class="col-33">
120126
<div class="section-sub-title">
121-
<span class="capitalize-text">{{ director.officer.lastName }}</span>,
122-
<span class="capitalize-text">{{ director.officer.firstName }}</span>
127+
<span class="capitalize-text">{{ director.officer.lastName }}</span>
128+
{% if director.officer.firstName or director.officer.middleInitial is defined %},{% endif %}
129+
{% if director.officer.firstName %}
130+
<span class="capitalize-text">{{ director.officer.firstName }}</span>
131+
{% endif %}
123132
{% if director.officer.middleInitial is defined %}
124133
<span class="capitalize-text">{{ director.officer.middleInitial }}</span>
125134
{% endif %}
@@ -129,7 +138,12 @@
129138
{% endif %}
130139
{% if 'nameChanged' in director.actions %}
131140
<div class="director-former-name">
132-
{% set prevName = director.officer.prevLastName + ', ' + director.officer.prevFirstName + ' ' + director.officer.prevMiddleInitial %}
141+
{% set prevName = director.officer.prevLastName +
142+
(', ' if director.officer.prevFirstName or director.officer.prevMiddleInitial else '') +
143+
[director.officer.prevFirstName, director.officer.prevMiddleInitial] |
144+
reject('none') | reject('equalto', '') |
145+
map('trim') | join(' ')
146+
%}
133147
(Formerly {{ prevName | trim }})
134148
</div>
135149
{% endif %}

0 commit comments

Comments
 (0)