Skip to content

Commit a6aab2a

Browse files
nitheesh-aotnitheesh-aot
authored
Merge pull request #295 from dinesh-aot/COMP-394
Comp 394
2 parents 06b56f3 + bf0eff3 commit a6aab2a

File tree

11 files changed

+123
-1143
lines changed

11 files changed

+123
-1143
lines changed

‎compliance-api/migrations/versions/1c5786563579_adding_address_line_2_in_department.py‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
"""adding address line 2 in department
2+
3+
4+
Revision ID: 1c5786563579
5+
Revises: bfc8625ce5ce
6+
Create Date: 2025-04-21 19:36:54.347271
7+
8+
"""
9+
from alembic import op
10+
import sqlalchemy as sa
11+
12+
13+
# revision identifiers, used by Alembic.
14+
revision = '1c5786563579'
15+
down_revision = 'bfc8625ce5ce'
16+
branch_labels = None
17+
depends_on = None
18+
19+
20+
def upgrade():
21+
# ### commands auto generated by Alembic - please adjust! ###
22+
with op.batch_alter_table('department_details', schema=None) as batch_op:
23+
batch_op.add_column(
24+
sa.Column('address_line1', sa.String(), nullable=True))
25+
batch_op.add_column(
26+
sa.Column('address_line2', sa.String(), nullable=True))
27+
batch_op.drop_column('address')
28+
29+
with op.batch_alter_table('department_details_version', schema=None) as batch_op:
30+
batch_op.add_column(
31+
sa.Column('address_line1', sa.String(), autoincrement=False, nullable=True))
32+
batch_op.add_column(
33+
sa.Column('address_line2', sa.String(), autoincrement=False, nullable=True))
34+
batch_op.add_column(sa.Column('address_line1_mod', sa.Boolean(
35+
), server_default=sa.text('false'), nullable=False))
36+
batch_op.add_column(sa.Column('address_line2_mod', sa.Boolean(
37+
), server_default=sa.text('false'), nullable=False))
38+
batch_op.drop_column('address_mod')
39+
batch_op.drop_column('address')
40+
op.execute(
41+
"UPDATE department_details SET address_line1 = 'PO Box 9426 Stn Prov Govt' WHERE id = 1")
42+
op.execute(
43+
"UPDATE department_details SET address_line2 = 'Victoria, BC V8W 9V1' WHERE id = 1")
44+
op.execute("Update department_details SET logo_url = 'https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/images/EAO_Compliance_IR_Report_Logo.png' WHERE id = 1")
45+
# ### end Alembic commands ###
46+
47+
48+
def downgrade():
49+
# ### commands auto generated by Alembic - please adjust! ###
50+
with op.batch_alter_table('department_details_version', schema=None) as batch_op:
51+
batch_op.add_column(sa.Column('address', sa.VARCHAR(),
52+
autoincrement=False, nullable=True))
53+
batch_op.add_column(sa.Column('address_mod', sa.BOOLEAN(
54+
), server_default=sa.text('false'), autoincrement=False, nullable=False))
55+
batch_op.drop_column('address_line2_mod')
56+
batch_op.drop_column('address_line1_mod')
57+
batch_op.drop_column('address_line2')
58+
batch_op.drop_column('address_line1')
59+
60+
with op.batch_alter_table('department_details', schema=None) as batch_op:
61+
batch_op.add_column(sa.Column('address', sa.VARCHAR(),
62+
autoincrement=False, nullable=False))
63+
batch_op.drop_column('address_line2')
64+
batch_op.drop_column('address_line1')
65+
op.execute("Update department_details SET logo_url = 'https://nrs.objectstore.gov.bc.ca/prod-epic/logo/eao_log.png' WHERE id = 1")
66+
op.execute(
67+
"Update department_details SET address = 'PO Box 9426 Stn Prov Govt, Victoria, BC V8W 9V1' WHERE id = 1")
68+
# ### end Alembic commands ###

‎compliance-api/src/compliance_api/models/department_detail.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ class DepartmentDetail(BaseModelVersioned):
1313
id = Column(Integer, primary_key=True)
1414
logo_url = Column(String, nullable=True)
1515
email = Column(String, nullable=False)
16-
address = Column(String, nullable=False)
16+
address_line1 = Column(String, nullable=True)
17+
address_line2 = Column(String, nullable=True)
1718
phone = Column(String, nullable=False)
1819
website = Column(String, nullable=True)

‎compliance-api/src/compliance_api/services/inspection_record/inspection_record_builder.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from compliance_api.models.inspection import Inspection as InspectionModel
1111
from compliance_api.models.inspection import InspectionAttendanceOptionEnum
1212
from compliance_api.models.inspection import InspectionReqSourceDetail as InspectionReqSourceDetailModel
13-
from compliance_api.models.inspection import InspectionRequirement as InspectionRequirementModel, InspectionRequirementTypeEnum
13+
from compliance_api.models.inspection import InspectionRequirement as InspectionRequirementModel
1414
from compliance_api.models.inspection import InspectionRequirementImage as InspectionRequirementImageModel
1515
from compliance_api.models.inspection import InspectionRequirementTypeEnum
1616
from compliance_api.models.inspection import IRStatusOption as IRStatusOptionModel

‎compliance-api/src/compliance_api/templates/ir_preliminary_template.html‎

Lines changed: 52 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,29 @@
66
<style>
77
@font-face {
88
font-family: 'CalibriRegular';
9-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-regular.ttf') format('truetype');
10-
font-weight: normal;
9+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-regular.ttf') format('truetype');
10+
font-weight: 400;
1111
font-style: normal;
1212
}
1313

1414
@font-face {
1515
font-family: 'CalibriItalic';
16-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-italic.ttf') format('truetype');
17-
font-weight: normal;
16+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-italic.ttf') format('truetype');
17+
font-weight: 400;
1818
font-style: normal;
1919
}
2020

2121
@font-face {
2222
font-family: 'CalibriBold';
23-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-bold.ttf') format('truetype');
24-
font-weight: normal;
23+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-bold.ttf') format('truetype');
24+
font-weight: 700;
2525
font-style: normal;
2626
}
2727

2828
@font-face {
2929
font-family: 'CalibriBoldItalic';
30-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-bold-italic.ttf') format('truetype');
31-
font-weight: normal;
30+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-bold-italic.ttf') format('truetype');
31+
font-weight: 700;
3232
font-style: normal;
3333
}
3434

@@ -53,6 +53,10 @@
5353
width: auto;
5454
}
5555

56+
strong {
57+
font-family: 'CalibriBold';
58+
}
59+
5660
.com-ir-header-title {
5761
text-align: right;
5862
font-size: 18px;
@@ -81,11 +85,13 @@
8185

8286
.com-ir-header-background {
8387
background-color: #bfbfbf;
88+
font-family: 'CalibriBold';
8489
}
8590

8691
.com-ir-general-info-header th {
8792
width: 140px;
8893
vertical-align: top;
94+
font-family: 'CalibriBold';
8995
}
9096

9197
table {
@@ -99,11 +105,10 @@
99105
border: 1px solid black;
100106
padding: 4px 8px;
101107
text-align: left;
102-
font-family: 'CalibriBold';
103108
vertical-align: middle;
104109
}
105110

106-
.com-ir-mailing-address-container {
111+
.com-ir-mailing-address-container strong {
107112
vertical-align: top !important;
108113
}
109114

@@ -185,29 +190,29 @@
185190

186191
@font-face {
187192
font-family: 'CalibriRegular';
188-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-regular.ttf') format('truetype');
189-
font-weight: normal;
193+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-regular.ttf') format('truetype');
194+
font-weight: 400;
190195
font-style: normal;
191196
}
192197

193198
@font-face {
194199
font-family: 'CalibriItalic';
195-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-italic.ttf') format('truetype');
196-
font-weight: normal;
200+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-italic.ttf') format('truetype');
201+
font-weight: 400;
197202
font-style: normal;
198203
}
199204

200205
@font-face {
201206
font-family: 'CalibriBold';
202-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-bold.ttf') format('truetype');
203-
font-weight: normal;
207+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-bold.ttf') format('truetype');
208+
font-weight: 700;
204209
font-style: normal;
205210
}
206211

207212
@font-face {
208213
font-family: 'CalibriBoldItalic';
209-
src: url('https://dev.compliance.eao.gov.bc.ca/fonts/pdf-fonts/calibri-bold-italic.ttf') format('truetype');
210-
font-weight: normal;
214+
src: url('https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/fonts/calibri-bold-italic.ttf') format('truetype');
215+
font-weight: 700;
211216
font-style: normal;
212217
}
213218

@@ -219,6 +224,10 @@
219224
line-height: 17px;
220225
}
221226

227+
strong {
228+
font-family: 'CalibriBold';
229+
}
230+
222231
.com-ir-header-container {
223232
display: flex;
224233
position: running(header);
@@ -247,13 +256,29 @@
247256
font-family: 'CalibriBold';
248257
}
249258

259+
.com-ir-header-background {
260+
background-color: #bfbfbf;
261+
font-family: 'CalibriBold';
262+
}
263+
250264
.com-ir-photo-caption {
251265
margin-top: 4px;
252266
font-style: italic;
253267
font-family: 'CalibriItalic';
254268
font-size: 9pt;
255269
}
256270

271+
.com-ir-mailing-address-container strong {
272+
vertical-align: top !important;
273+
font-family: 'CalibriBold';
274+
}
275+
276+
.com-ir-comp-finding-header {
277+
background-color: #d9d9d9 !important;
278+
font-family: 'CalibriBold';
279+
}
280+
281+
257282
/* .content {
258283
padding: 0 56px;
259284
} */
@@ -294,6 +319,9 @@
294319
td,
295320
th {
296321
padding: 6px 8px;
322+
}
323+
324+
.com-ir-general-info-header th {
297325
font-family: 'CalibriBold';
298326
}
299327

@@ -312,7 +340,8 @@
312340
<body>
313341
<!-- <div class="header"> -->
314342
<div class="com-ir-header-container">
315-
<img src="https://dev.compliance.eao.gov.bc.ca/logo/EAO_Compliance_IR_Report_Logo.png" class="com-ir-header-logo" alt="EAO Logo">
343+
<img src="https://nrs.objectstore.gov.bc.ca/epic-static-assets/compliance-assets/images/EAO_Compliance_IR_Report_Logo.png"
344+
class="com-ir-header-logo" alt="EAO Logo">
316345
<div class="com-ir-header-title">INSPECTION RECORD</div>
317346
</div>
318347
<!-- </div> -->
@@ -553,10 +582,11 @@ <h2>INSPECTION DETAILS</h2>
553582
Enforcement
554583
Branch</th>
555584
</tr>
556-
<tr>
557-
<td class="com-ir-mailing-address-container">
585+
<tr class="com-ir-mailing-address-container">
586+
<td>
558587
<strong>Mailing Address:</strong></br>
559-
{{ department_details.address }}
588+
{{ department_details.address_line1 }}</br>
589+
{{ department_details.address_line2 }}
560590
</td>
561591
<td>
562592
<strong>Phone:</strong> {{ department_details.phone }}<br>

‎compliance-web/public/fonts/pdf-fonts/ReadMe.md‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎compliance-web/public/fonts/pdf-fonts/calibri-bold-italic.ttf‎

-932 KB
Binary file not shown.

‎compliance-web/public/fonts/pdf-fonts/calibri-bold.ttf‎

-829 KB
Binary file not shown.

‎compliance-web/public/fonts/pdf-fonts/calibri-italic.ttf‎

-974 KB
Binary file not shown.

‎compliance-web/public/fonts/pdf-fonts/calibri-regular.ttf‎

-792 KB
Binary file not shown.

‎compliance-web/public/logo/EAO_Compliance_IR_Report_Logo.png‎

-22.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)