Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

24629 - update logic to show effective date #3108

Merged
merged 2 commits into from
Dec 3, 2024
Merged

24629 - update logic to show effective date #3108

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a3e3cd
24629 - update logic to show effective date
ketaki-deodhar Dec 3, 2024
39bbe87
24629 - hide field and label
ketaki-deodhar Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 28 additions & 12 deletions legal-api/report-templates/template-parts/common/businessDetails.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@
<td>
<div class="bold">Incorporation Number:</div>
<div class="bold pt-2">Issued Date and Time:</div>
<div class="bold pt-2">Recognition Date and Time:</div>
{% if header.isFutureEffective or header.status == 'COMPLETED' %}
<div class="bold pt-2">Recognition Date and Time:</div>
{% endif %}
<div class="bold pt-2">Retrieved Date and Time:</div>
</td>
<td>
Expand All @@ -70,7 +72,7 @@
<div class="pt-2">{{effective_date_time}}</div>
{% if header.isFutureEffective %}
<div class="pt-2">{{effective_date_time}}</div>
{% else %}
{% elif header.status == 'COMPLETED' %}
<div class="pt-2">{{recognition_date_time}}</div>
{% endif %}
<div class="pt-2">{{report_date_time}}</div>
Expand Down Expand Up @@ -118,7 +120,9 @@
<td class="col-33">
<div class="bold">Incorporation Number:</div>
<div class="bold pt-2">Filed Date and Time:</div>
<div class="bold pt-2">Recognition Date and Time:</div>
{% if header.isFutureEffective or header.status == 'COMPLETED' %}
<div class="bold pt-2">Recognition Date and Time:</div>
{% endif %}
<div class="bold pt-2">Retrieved Date and Time:</div>
</td>
<td>
Expand All @@ -130,7 +134,7 @@
<div class="pt-2">{{filing_date_time}}</div>
{% if header.isFutureEffective %}
<div class="pt-2">{{effective_date_time}}</div>
{% else %}
{% elif header.status == 'COMPLETED' %}
<div class="pt-2">{{recognition_date_time}}</div>
{% endif %}
<div class="pt-2">{{report_date_time}}</div>
Expand Down Expand Up @@ -204,26 +208,34 @@
<td>
<div class="bold">Incorporation Number:</div>
<div class="bold pt-2">Filed Date and Time:</div>
<div class="bold pt-2">Address Effective Date and Time:</div>
{% if header.status == 'COMPLETED' %}
<div class="bold pt-2">Address Effective Date and Time:</div>
{% endif %}
<div class="bold pt-2">Retrieved Date and Time:</div>
</td>
<td>
<div>{{business.identifier}}</div>
<div class="pt-2">{{filing_date_time}}</div>
<div class="pt-2">{{effective_date_time}}</div>
{% if header.status == 'COMPLETED' %}
<div class="pt-2">{{effective_date_time}}</div>
{% endif %}
<div class="pt-2">{{report_date_time}}</div>
</td>
{% elif header.name == 'changeOfDirectors' %}
<td>
<div class="bold">Incorporation Number:</div>
<div class="bold pt-2">Filed Date and Time:</div>
<div class="bold pt-2">Director Change Date:</div>
{% if header.status == 'COMPLETED' %}
<div class="bold pt-2">Director Change Date:</div>
{% endif %}
<div class="bold pt-2">Retrieved Date and Time:</div>
</td>
<td>
<div>{{business.identifier}}</div>
<div class="pt-2">{{filing_date_time}}</div>
<div class="pt-2">{{effective_date}}</div>
{% if header.status == 'COMPLETED' %}
<div class="pt-2">{{effective_date}}</div>
{% endif %}
<div class="pt-2">{{report_date_time}}</div>
</td>
{% elif header.name == 'annualReport' %}
Expand Down Expand Up @@ -264,13 +276,17 @@
<td>
<div class="bold">Incorporation Number:</div>
<div class="bold pt-2">Filed Date and Time:</div>
<div class="bold pt-2">Alteration Date and Time:</div>
{% if header.isFutureEffective or header.status == 'COMPLETED' %}
<div class="bold pt-2">Alteration Date and Time:</div>
{% endif %}
<div class="bold pt-2">Retrieved Date and Time:</div>
</td>
<td>
<div>{{business.identifier}}</div>
<div class="pt-2">{{filing_date_time}}</div>
<div class="pt-2">{{effective_date_time}}</div>
{% if header.isFutureEffective or header.status == 'COMPLETED' %}
<div class="pt-2">{{effective_date_time}}</div>
{% endif %}
<div class="pt-2">{{report_date_time}}</div>
</td>
{% elif header.name == 'dissolution' %}
Expand All @@ -286,7 +302,7 @@
<div class="bold pt-2">Registration Date:</div>
{% endif %}
<div class="bold pt-2">Filed Date and Time:</div>
{% if business.legalType not in ['CP', 'SP', 'GP'] %}
{% if business.legalType not in ['CP', 'SP', 'GP'] and header.status == 'COMPLETED' %}
<div class="bold pt-2">Effective Date and Time:</div>
{% endif %}
{% if business.legalType in ['GP', 'SP'] %}
Expand All @@ -300,7 +316,7 @@
<div class="pt-2">{{ recognition_date_utc }}</div>
{% endif %}
<div class="pt-2">{{filing_date_time}}</div>
{% if business.legalType not in ['CP', 'SP', 'GP'] %}
{% if business.legalType not in ['CP', 'SP', 'GP'] and header.status == 'COMPLETED' %}
<div class="pt-2">{{effective_date_time}}</div>
{% endif %}
{% if business.legalType in ['GP', 'SP'] %}
Expand Down