Skip to content

Commit

Permalink
Merge pull request #1842 from uktrade/LTD-4772-Add-identifiers-siel-t…
Browse files Browse the repository at this point in the history 
…emplate

LTD-4772: Add element identifiers in SIEL licence template
  • Loading branch information
@saruniitr
saruniitr authored Feb 26, 2024
2 parents dddd450 + 02b4b2d commit 719872b
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions api/letter_templates/templates/letter_templates/nlr.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ <h2>Where to find further information</h2>

The following items do not require a licence:
{% endfilter %}
<table class="govuk-table">
<table id="nlr-products-table" class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header">#</th>
Expand All @@ -82,7 +82,7 @@ <h2>Where to find further information</h2>
</thead>
<tbody>
{% for good in goods.no_licence_required %}
<tr class="govuk-table__row">
<tr id="nlr-product-row-{{ forloop.counter }}" class="govuk-table__row">
<td class="govuk-table__cell">{{ forloop.counter }}</td>
<td class="govuk-table__cell">{{ good.good.name }}</td>
<td class="govuk-table__cell">{{ good.good.description }}</td>
Expand Down
34 changes: 17 additions & 17 deletions api/letter_templates/templates/letter_templates/siel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,21 +37,21 @@ <h1>Standard Individual Export Licence</h1>
<strong>Registered No. {{ organisation.registration_number}}</strong>
</span>
</td>
<td class="border-black" colspan="3">
<td id="licence-reference-column" class="border-black" colspan="3">
<span class="cell__heading">2. Licence number</span>
<span class="cell__uppercase">{{ licence.reference_code }}</span>
</td>
<td class="border-black" colspan="3">
<td id="licence-start-date" class="border-black" colspan="3">
<span class="cell__heading">3a. Commencement date</span>
<span class="cell__uppercase">{{ licence.start_date }}</span>
</td>
</tr>
<tr>
<td class="border-black" colspan="3">
<td id="application-reference-code" class="border-black" colspan="3">
<span class="cell__heading">2a. Application number</span>
<span class="cell__uppercase">{{ case_reference }}</span>
</td>
<td class="border-black" colspan="3">
<td id="licence-end-date" class="border-black" colspan="3">
<span class="cell__heading">3b. Expiry date</span>
<span class="cell__uppercase">{{ licence.end_date }}</span>
</td>
Expand Down Expand Up @@ -80,7 +80,7 @@ <h1>Standard Individual Export Licence</h1>
</td>
</tr>
<tr>
<td class="border-black" colspan="5">
<td id="consignee-details" class="border-black" colspan="5">
<span class="cell__heading">5. Consignee(s)/Destination(s)</span>
<span class="cell__uppercase">
<span class="cell__uppercase">
Expand Down Expand Up @@ -133,7 +133,7 @@ <h1>Standard Individual Export Licence</h1>
</td>
</tr>
<tr>
<td class="border-black" colspan="5" rowspan="3">
<td id="end-user-details" class="border-black" colspan="5" rowspan="3">
<span class="cell__heading">10. End User(if different from consignee)</span>
<span class="cell__uppercase">
{{ end_user.name }}<br>
Expand Down Expand Up @@ -203,7 +203,7 @@ <h1>Standard Individual Export Licence</h1>
<span class="cell__heading">20. Contract date</span>
<span class="cell__uppercase">{{ current_date }}</span>
</td>
<td class="border-black" colspan="3">
<td id="export-type" class="border-black" colspan="3">
<span class="cell__heading">21. Customs export procedure(Type of licence)</span>
<span class="cell__uppercase">{{ details.export_type }}</span>
</td>
Expand All @@ -217,7 +217,7 @@ <h1>Standard Individual Export Licence</h1>
</table>

<p style="page-break-before: always">
<table>
<table id="products-table">
<tr>
<td class="border-top-black padding-none align-centre" rowspan="999">
<div class="text-large border-left-black border-bottom-black">1</div>
Expand Down Expand Up @@ -276,11 +276,11 @@ <h1>Standard Individual Export Licence</h1>
</tr>
{% for good_item in goods.approve %}
{% with good=good_item.good firearm_details=good_item.firearm_details %}
<tr>
<tr id="product-row-{{ forloop.counter}}" >
<td class="border-black" colspan="1">{{ forloop.counter }}</td>
<td class="border-black" colspan="5">
<td id="row-{{ forloop.counter}}-description" class="border-black" colspan="5">
<table border="0">
<tr>
<tr id="row-{{ forloop.counter}}-description-name">
<td><strong>Name:</strong></td>
<td>{% if good.name %}{{ good.name }}{% else %}{{ good.description }}{% endif %}
</td>
Expand All @@ -289,32 +289,32 @@ <h1>Standard Individual Export Licence</h1>
<td><strong>Description:</strong></td>
<td>{{ good.description|default_na }}</td>
</tr>
<tr>
<tr id="row-{{ forloop.counter}}-description-part-number">
<td><strong>Part number:</strong></td>
<td>{{ good.part_number|default_na }}</td>
</tr>
{% if firearm_details and firearm_details.has_serial_numbers %}
<tr>
<tr id="row-{{ forloop.counter}}-description-serial-numbers">
<td><strong>Serial number:</strong></td>
<td>
{{ firearm_details.serial_numbers|format_serial_numbers|join:"<br>" }}
</td>
</tr>
{% else %}
<tr>
<tr id="row-{{ forloop.counter}}-description-serial-numbers-na">
<td><strong>Serial number:</strong></td>
<td>N/A</td>
</tr>
{% endif %}
</table>
</td>
<td class="border-black" colspan="2">
<td id="row-{{ forloop.counter}}-control-list-entries" class="border-black" colspan="2">
{% for clc in good.control_list_entries %}
{{ clc }}{% if not forloop.last %},{% endif %}
{% endfor %}
</td>
<td class="border-black" colspan="2">{{ good_item.value }}</td>
<td class="border-black" colspan="2">{{ good_item.quantity }}</td>
<td id="row-{{ forloop.counter}}-value" class="border-black" colspan="2">{{ good_item.value }}</td>
<td id="row-{{ forloop.counter}}-quantity" class="border-black" colspan="2">{{ good_item.quantity }}</td>
</tr>
{% endwith %}
{% endfor %}
Expand Down

0 comments on commit 719872b

Please sign in to comment.