Skip to content

fixed null data issue #2

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

Merged
lucy-davidson-23 merged 1 commit into from
May 19, 2026
Merged

fixed null data issue #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ function normaliseServices (raw) {
? (v.suggested === true ? 'Yes' : v.suggested === false ? 'No' : null)
: suggested
return {
current: f === 'serviceCategory' || f === 'attendInPerson' ? null : (v.current !== undefined ? String(v.current) : null),
current: f === 'serviceCategory' || f === 'attendInPerson' ? null : (v.current !== undefined && v.current !== null ? String(v.current) : null),
suggested: f === 'attendInPerson' ? attendSuggested : suggested,
changed: !!v.changed,
manualInputNeeded: v.suggested === 'TBC' || v.suggested === null || v.suggested === undefined,
Expand Down
6 changes: 3 additions & 3 deletions app/views/confirm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<tr>
<td><strong>Address</strong></td>
<td class="dos-confirm-table__current">
{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else "—" }}
{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}
</td>
<td class="dos-confirm-table__arrow">→</td>
<td>
Expand Down Expand Up @@ -70,7 +70,7 @@
<tr>
<td><strong>ODS Code</strong></td>
<td class="dos-confirm-table__current">
{{ service.fields.odsCode.current if service.fields.odsCode.current else "—" }}
{{ service.fields.odsCode.current if service.fields.odsCode.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}
</td>
<td class="dos-confirm-table__arrow">→</td>
<td>
Expand Down Expand Up @@ -131,7 +131,7 @@
<tr>
<td><strong>Service type</strong></td>
<td class="dos-confirm-table__current">
{{ service.fields.serviceType.current if service.fields.serviceType.current else "—" }}
{{ service.fields.serviceType.current if service.fields.serviceType.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}
</td>
<td class="dos-confirm-table__arrow">→</td>
<td>
Expand Down
6 changes: 3 additions & 3 deletions app/views/edit-field.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h2 class="nhsuk-heading-m dos-modify-section__heading">Address</h2>
<div class="dos-modify-section__body">
<div class="dos-modify-col dos-modify-col--left">
<p class="nhsuk-body-s nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-1">Address in DoS</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else "—" }}</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</p>
</div>
<div class="dos-modify-col dos-modify-col--right">
<div class="nhsuk-form-group" id="address-postcode-group">
Expand Down Expand Up @@ -74,7 +74,7 @@ <h2 class="nhsuk-heading-m dos-modify-section__heading">ODS code</h2>
<div class="dos-modify-section__body">
<div class="dos-modify-col dos-modify-col--left">
<p class="nhsuk-body-s nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-1">Current</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ service.fields.odsCode.current if service.fields.odsCode.current else "—" }}</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ service.fields.odsCode.current if service.fields.odsCode.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</p>
</div>
<div class="dos-modify-col dos-modify-col--right">
<div class="nhsuk-form-group" id="odsCode-group">
Expand Down Expand Up @@ -138,7 +138,7 @@ <h2 class="nhsuk-heading-m dos-modify-section__heading">Service category and typ
<div class="dos-modify-col dos-modify-col--left">
<p class="nhsuk-body-s nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-1">Current</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">
Service type<br>{{ service.fields.serviceType.current if service.fields.serviceType.current else "—" }}
Service type<br>{{ service.fields.serviceType.current if service.fields.serviceType.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}
</p>
</div>
<div class="dos-modify-col dos-modify-col--right">
Expand Down
6 changes: 3 additions & 3 deletions app/views/modify.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ <h2 class="nhsuk-heading-m dos-modify-section__heading">Address</h2>
<div class="dos-modify-section__body">
<div class="dos-modify-col dos-modify-col--left">
<p class="nhsuk-body-s nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-1">Address in DoS</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else "—" }}</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</p>
</div>
<div class="dos-modify-col dos-modify-col--right">
<div class="nhsuk-form-group {% if addrErr %}nhsuk-form-group--error{% endif %}" id="address-postcode-group">
Expand Down Expand Up @@ -95,7 +95,7 @@ <h2 class="nhsuk-heading-m dos-modify-section__heading">ODS code</h2>
<div class="dos-modify-section__body">
<div class="dos-modify-col dos-modify-col--left">
<p class="nhsuk-body-s nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-1">Current</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ service.fields.odsCode.current if service.fields.odsCode.current else "—" }}</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">{{ service.fields.odsCode.current if service.fields.odsCode.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</p>
</div>
<div class="dos-modify-col dos-modify-col--right">
<div class="nhsuk-form-group {% if odsErr %}nhsuk-form-group--error{% endif %}" id="odsCode-group">
Expand Down Expand Up @@ -156,7 +156,7 @@ <h2 class="nhsuk-heading-m dos-modify-section__heading">Service category and typ
<div class="dos-modify-col dos-modify-col--left">
<p class="nhsuk-body-s nhsuk-u-font-weight-bold nhsuk-u-margin-bottom-1">Current</p>
<p class="nhsuk-body-s nhsuk-u-secondary-text-color">
Service type<br>{{ service.fields.serviceType.current if service.fields.serviceType.current else "—" }}
Service type<br>{{ service.fields.serviceType.current if service.fields.serviceType.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}
</p>
</div>
<div class="dos-modify-col dos-modify-col--right">
Expand Down
2 changes: 1 addition & 1 deletion app/views/queue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ <h1 class="nhsuk-heading-xl nhsuk-u-margin-bottom-4">Services to review</h1>
{% if service.fields.odsCode.suggested %}
{{ service.fields.odsCode.suggested }}
{% else %}
<span style="color: #4C6272">No data</span>
<span class="dos-not-applicable">No data</span>
{% endif %}
</td>
</tr>
Expand Down
16 changes: 8 additions & 8 deletions app/views/review.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
{# ── ADDRESS ──────────────────────────────────────────── #}
<tr>
<td><strong>Address</strong></td>
<td>{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else "—" }}</td>
<td>{{ (service.fields.address.current | replace("$", "<br>") | safe) if service.fields.address.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</td>
<td>
{{ (service.fields.address.suggested | replace("$", "<br>") | safe) if service.fields.address.suggested else "—" }}
{{ (service.fields.address.suggested | replace("$", "<br>") | safe) if service.fields.address.suggested else ('<span class="dos-not-applicable">No data</span>' | safe) }}
<button type="button" class="dos-reasoning-toggle" aria-expanded="false" aria-controls="reasoning-address">View reasoning</button>
</td>
<td>
Expand Down Expand Up @@ -80,12 +80,12 @@
{% set odsManual = service.fields.odsCode.manualInputNeeded %}
<tr>
<td><strong>ODS Code</strong></td>
<td>{{ service.fields.odsCode.current if service.fields.odsCode.current else "—" }}</td>
<td>{{ service.fields.odsCode.current if service.fields.odsCode.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</td>
<td>
{% if odsManual %}
<span class="dos-tag dos-tag--warning">Manual input needed</span>
{% else %}
{{ service.fields.odsCode.suggested if service.fields.odsCode.suggested else "—" }}
{{ service.fields.odsCode.suggested if service.fields.odsCode.suggested else ('<span class="dos-not-applicable">No data</span>' | safe) }}
{% endif %}
<button type="button" class="dos-reasoning-toggle" aria-expanded="false" aria-controls="reasoning-odsCode">View reasoning</button>
</td>
Expand Down Expand Up @@ -135,7 +135,7 @@
</td>
<td><span class="dos-not-applicable">Not applicable</span></td>
<td>
{{ service.fields.serviceCategory.suggested if service.fields.serviceCategory.suggested else "—" }}
{{ service.fields.serviceCategory.suggested if service.fields.serviceCategory.suggested else ('<span class="dos-not-applicable">No data</span>' | safe) }}
<button type="button" class="dos-reasoning-toggle" aria-expanded="false" aria-controls="reasoning-serviceCategory">View reasoning</button>
</td>
<td>
Expand Down Expand Up @@ -174,9 +174,9 @@
<strong>Service type</strong><br>
<a href="/taxonomy" target="_blank" class="nhsuk-body-s">View service types </a>
</td>
<td>{{ service.fields.serviceType.current if service.fields.serviceType.current else "—" }}</td>
<td>{{ service.fields.serviceType.current if service.fields.serviceType.current else ('<span class="dos-not-applicable">No data</span>' | safe) }}</td>
<td>
{{ service.fields.serviceType.suggested if service.fields.serviceType.suggested else "—" }}
{{ service.fields.serviceType.suggested if service.fields.serviceType.suggested else ('<span class="dos-not-applicable">No data</span>' | safe) }}
<button type="button" class="dos-reasoning-toggle" aria-expanded="false" aria-controls="reasoning-serviceType">View reasoning</button>
</td>
<td>
Expand Down Expand Up @@ -217,7 +217,7 @@
</td>
<td><span class="dos-not-applicable">Not applicable</span></td>
<td>
{{ service.fields.attendInPerson.suggested if service.fields.attendInPerson.suggested else "—" }}
{{ service.fields.attendInPerson.suggested if service.fields.attendInPerson.suggested else ('<span class="dos-not-applicable">No data</span>' | safe) }}
<button type="button" class="dos-reasoning-toggle" aria-expanded="false" aria-controls="reasoning-attendInPerson">View reasoning</button>
</td>
<td>
Expand Down