Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
106 changes: 52 additions & 54 deletions legal-api/report-templates/annualReport.html

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And this too up until line 46?

Original file line number Diff line number Diff line change
@@ -1,67 +1,65 @@
[[macros.html]]

<!DOCTYPE html>
<html lang="en">
<head>
<title>{{ meta_title }}</title>
<title>Annual Report</title>
<meta charset="UTF-8">
<meta name="author" content="BC Registries and Online Services">
<meta name="description" content="{{ meta_subject }}">

[[style.html]]

[[common/style.html]]
{% if enable_sandbox %}
[[common/watermark.html]]
{% endif %}
</head>

<body>

[[logo.html]]

<div class="column-report">
<div class="column-report-headspace"></div>
<div class="header-blue">
{{ header.ARFilingYear }} BC COOPERATIVE ANNUAL REPORT
</div>
<div class="header-gold">
BC Cooperative &bull; Cooperative Association Act
</div>

<div class="column-report-inner">
<div class="entity-name">
{{ business.legalName }}
</div>

<!-- Struggling doing this with CSS, because weasyprint isn't laying it out the same as a browser. -->
<div class="section-data">
<table class="section-data-table">
<tr class="no-page-break">
<td class="table-name">Incorporation Number:</td>
<td class="table-value">{{ business.identifier }}</td>
</tr>
<tr class="no-page-break">
<td class="table-name">Business Number:</td>
<td class="table-value">{{ business.tax_id }}</td>
</tr>
<tr class="no-page-break">
<td class="table-name">Filing Date and Time:</td>
<td class="table-value">{{ filing_date_time }}</td>
</tr>
<tr class="no-page-break">
<td class="table-name">Annual General Meeting (AGM) Date:</td>
<td class="table-value">{{ agm_date }}</td>
</tr>
</table>
</div>
{% if effective_date is defined %}
[[addresses.html]]

[[directors.html]]
{% endif %}
[[certification.html]]

<div class="header">
<table class="header-table" role="presentation">

Check warning on line 15 in legal-api/report-templates/annualReport.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace this layout table with a CSS layout.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaJ8JVNcsmiDkEP&open=AZ7NiCaJ8JVNcsmiDkEP&pullRequest=4496

Check warning on line 15 in legal-api/report-templates/annualReport.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use <img> instead of the presentation role to ensure accessibility across all devices.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaJ8JVNcsmiDkEQ&open=AZ7NiCaJ8JVNcsmiDkEQ&pullRequest=4496
<tr class="no-page-break">
<td>
[[logo.html]]
</td>
<td>
<div class="report-type">{{ header.ARFilingYear }} ANNUAL REPORT</div>
<div class="report-type-desc">{{ entityDescription }} - {{ entityAct }}</div>
</td>
</tr>
</table>
<div class="business-name-header">
<label class="lbl-business-name">

Check warning on line 27 in legal-api/report-templates/annualReport.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A form label must be associated with a control and have accessible text.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaJ8JVNcsmiDkER&open=AZ7NiCaJ8JVNcsmiDkER&pullRequest=4496
{{business.legalName}}
</label>
</div>
</div>
[[common/businessDetails.html]]
{% if business.legalType == 'CP' %}
<div class="container">
<table class="section-data section-data-table" role="presentation">

Check warning on line 35 in legal-api/report-templates/annualReport.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use <img> instead of the presentation role to ensure accessibility across all devices.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaJ8JVNcsmiDkET&open=AZ7NiCaJ8JVNcsmiDkET&pullRequest=4496

Check warning on line 35 in legal-api/report-templates/annualReport.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace this layout table with a CSS layout.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaJ8JVNcsmiDkES&open=AZ7NiCaJ8JVNcsmiDkES&pullRequest=4496
<tr class="no-page-break">
<td class="col-35">
<div class="section-sub-title">
<span>Annual General Meeting Date:</span>
</div>
</td>
<td>
<div>{{ agm_date }}</div>
</td>
</tr>
</table>
</div>
<div class="container mt-4">
<div class="separator"></div>
{% if effective_date is defined %}
[[addresses.html]]
<div class="separator"></div>

[[footer.html]]

[[directors.html]]
{% endif %}
[[certification.html]]
</div>
{% else %}
<div class="container">
<div class="separator"></div>
[[bc-annual-report/legalObligations.html]]
</div>
{% endif %}
</body>
</html>
38 changes: 0 additions & 38 deletions legal-api/report-templates/bcAddressChange.html

This file was deleted.

38 changes: 0 additions & 38 deletions legal-api/report-templates/bcAnnualReport.html

This file was deleted.

38 changes: 0 additions & 38 deletions legal-api/report-templates/bcDirectorChange.html

This file was deleted.

81 changes: 28 additions & 53 deletions legal-api/report-templates/changeOfAddress.html

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And here - exact same as bcAddressChange

Original file line number Diff line number Diff line change
@@ -1,65 +1,40 @@
[[macros.html]]

<!DOCTYPE html>
<html lang="en">
<head>
<title>{{ meta_title }}</title>
<title>Address Change</title>
<meta charset="UTF-8">
<meta name="author" content="BC Registries and Online Services">
<meta name="description" content="{{ meta_subject }}">

[[style.html]]

[[common/style.html]]
{% if enable_sandbox %}
[[common/watermark.html]]
{% endif %}
</head>

<body>

[[logo.html]]

<div class="column-report">
<div class="column-report-headspace"></div>
<div class="header-blue">
BC COOPERATIVE ADDRESS CHANGE
</div>
<div class="header-gold">
BC Cooperative &bull; Cooperative Association Act
</div>

<div class="column-report-inner">
<div class="entity-name">
{{ business.legalName }}
</div>

<!-- Struggling doing this with CSS, because weasyprint isn't laying it out the same as a browser. -->
<div class="section-data">
<table class="section-data-table">
<tr class="no-page-break">
<td class="table-name">Incorporation Number:</td>
<td class="table-value">{{ business.identifier }}</td>
</tr>
<tr class="no-page-break">
<td class="table-name">Business Number:</td>
<td class="table-value">{{ business.tax_id }}</td>
</tr>
<tr class="no-page-break">
<td class="table-name">Filing Date and Time:</td>
<td class="table-value">{{ filing_date_time }}</td>
</tr>
<tr class="no-page-break">
<td class="table-name">Date of Change:</td>
<td class="table-value">{{ effective_date }}</td>
</tr>
</table>
</div>

[[addresses.html]]

[[certification.html]]

<div class="header">
<table class="header-table" role="presentation">

Check warning on line 15 in legal-api/report-templates/changeOfAddress.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Replace this layout table with a CSS layout.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaY8JVNcsmiDkEU&open=AZ7NiCaY8JVNcsmiDkEU&pullRequest=4496

Check warning on line 15 in legal-api/report-templates/changeOfAddress.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Use <img> instead of the presentation role to ensure accessibility across all devices.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaY8JVNcsmiDkEV&open=AZ7NiCaY8JVNcsmiDkEV&pullRequest=4496
<tr class="no-page-break">
<td>
[[logo.html]]
</td>
<td>
<div class="report-type">ADDRESS CHANGE</div>
<div class="report-type-desc">{{entityDescription}} - {{ entityAct }}</div>
</td>
</tr>
</table>
<div class="business-name-header">
<label class="lbl-business-name">

Check warning on line 27 in legal-api/report-templates/changeOfAddress.html

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

A form label must be associated with a control and have accessible text.

See more on https://sonarcloud.io/project/issues?id=bcgov_lear&issues=AZ7NiCaY8JVNcsmiDkEW&open=AZ7NiCaY8JVNcsmiDkEW&pullRequest=4496
{{business.legalName}}
</label>
</div>
</div>

[[footer.html]]

[[common/businessDetails.html]]
<div class="container">
[[addresses.html]]
{% if business.legalType == 'CP' %}
[[certification.html]]
{% endif %}
</div>
</body>
</html>
Loading