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

VACMS 19825 - Updated all operating status content-build templates #2355

Merged
merged 10 commits into from
Dec 4, 2024
Merged

VACMS 19825 - Updated all operating status content-build templates #2355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a09efbb
updated all operating status content-build templates
eselkin Nov 15, 2024
eb9da2d
Merge branch 'main' into VACMS-19825-operating-status-update
eselkin Nov 19, 2024
e4700db
Merge branch 'main' into VACMS-19825-operating-status-update
eselkin Nov 21, 2024
409200a
operation_status_information.liquid was not used/imported
eselkin Nov 22, 2024
d5fb78a
Merge branch 'main' into VACMS-19825-operating-status-update
eselkin Nov 22, 2024
936ae31
Merge branch 'main' into VACMS-19825-operating-status-update
eselkin Nov 27, 2024
5287081
slim alert if no fieldOperatingStatusMoreInfo
eselkin Nov 30, 2024
24e9881
margine and spacing
eselkin Nov 30, 2024
6fc87e5
merge
eselkin Dec 3, 2024
6c8b61e
Merge branch 'main' into VACMS-19825-operating-status-update
eselkin 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
24 changes: 22 additions & 2 deletions src/site/includes/operatingStatusFlagsLinks.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,35 @@
/>
</va-alert>
{% elsif fieldOperatingStatusFacility == 'limited' %}
<va-alert status="warning" slim visible>
<va-alert status="info" slim visible>
<va-link
class="vads-u-font-weight--bold operating-status-link"
href="{{ facilitySidebar.links.0.url.path }}/operating-status"
text="Limited services and hours"
/>
</va-alert>
{% elsif fieldOperatingStatusFacility == 'temporary_closure' %}
<va-alert status="warning" slim visible>
<va-link class="vads-u-font-weight--bold operating-status-link"
href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Temporary facility closure" />
</va-alert>
{% elsif fieldOperatingStatusFacility == 'temporary_location' %}
<va-alert status="warning" slim visible>
<va-link class="vads-u-font-weight--bold operating-status-link"
href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Temporary location" />
</va-alert>
{% elsif fieldOperatingStatusFacility == 'virtual_care' %}
<va-alert status="warning" slim visible>
<va-link class="vads-u-font-weight--bold operating-status-link"
href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Virtual care only" />
</va-alert>
{% elsif fieldOperatingStatusFacility == 'coming_soon' %}
<va-alert status="warning" slim visible>
<va-link class="vads-u-font-weight--bold operating-status-link"
href="{{ facilitySidebar.links.0.url.path }}/operating-status" text="Coming soon" />
</va-alert>
{% elsif fieldOperatingStatusFacility == 'closed' %}
<va-alert status="error" slim visible>
<va-alert status="warning" slim visible>
randimays marked this conversation as resolved.
Show resolved Hide resolved
<va-link
class="vads-u-font-weight--bold operating-status-link"
href="{{ facilitySidebar.links.0.url.path }}/operating-status"
Expand Down
31 changes: 28 additions & 3 deletions src/site/includes/operating_status_expandable_alert.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,26 @@
{% endif %}
{% case fieldOperatingStatusFacility %}
{% when 'limited' %}
{% assign status = "warning" %}
{% assign status = "info" %}
{% assign trigger = "Limited services and hours" %}
{% when 'closed' %}
{% assign status = "error" %}
{% assign status = "warning" %}
{% assign trigger = "Facility Closed" %}
{% when 'notice' %}
{% assign status = "info" %}
{% assign trigger = "Facility notice" %}
{% when 'temporary_closure' %}
{% assign status = "warning" %}
{% assign trigger = "Temporary facility closure" %}
{% when 'temporary_location' %}
{% assign status = "warning" %}
{% assign trigger = "Temporary location" %}
{% when 'virtual_care' %}
{% assign status = "warning" %}
{% assign trigger = "Virtual care only" %}
{% when 'coming_soon' %}
{% assign status = "warning" %}
{% assign trigger = "Coming soon" %}
{% endcase %}
{% if status and fieldOperatingStatusMoreInfo and fieldOperatingStatusMoreInfo != blank %}
<div class="vads-u-margin-bottom--1">
Expand All @@ -25,8 +37,21 @@
class="vads-u-margin-y--0 vamc-facility-expandable-alert"
style="max-width: 303px;"
>
<p>{{ fieldOperatingStatusMoreInfo | drupalToVaPath | phoneLinks | newline_to_br }}</p>
<p>{{ fieldOperatingStatusMoreInfo | drupalToVaPath | phoneLinks | newline_to_br }}</p>
</va-alert-expandable>
</div>
{% elsif status %}
<div class="vads-u-margin-bottom--1">
<va-alert
id="operating-status-nonexp-{{ operatingStatusId }}"
data-testid="operating-status-nonexp-{{ operatingStatusId }}"
status="{{ status }}"
class="vads-u-margin-y--0"
slim
style="max-width: 303px;"
>
<p class="vads-u-margin-y--0 vads-u-padding-y--0 vads-u-font-weight--bold">{{ trigger }}</p>
</va-alert>
</div>
{% endif %}
{% endif %}
19 changes: 0 additions & 19 deletions src/site/includes/operation_status_information.liquid
View file
Open in desktop

This file was deleted.

50 changes: 39 additions & 11 deletions src/site/includes/vba_facilities/expandable_alert.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,52 @@
{% elsif fieldOperatingStatusFacility == 'limited' %}
{% assign showVBAExpandableAlert = true %}
{% assign VBAExpandableAlertTrigger = 'Limited services and hours' %}
{% assign VBAExpandableAlertStatus = 'warning' %}
{% assign VBAExpandableAlertStatus = 'info' %}
{% elsif fieldOperatingStatusFacility == 'closed' %}
{% assign showVBAExpandableAlert = true %}
{% assign VBAExpandableAlertTrigger = 'Facility Closed' %}
{% assign VBAExpandableAlertStatus = 'error' %}
{% assign VBAExpandableAlertStatus = 'warning' %}
{% elsif fieldOperatingStatusFacility == 'temporary_closure' %}
{% assign showVBAExpandableAlert = true %}
randimays marked this conversation as resolved.
Show resolved Hide resolved
{% assign VBAExpandableAlertTrigger = 'Temporary facility closure' %}
{% assign VBAExpandableAlertStatus = 'warning' %}
{% elsif fieldOperatingStatusFacility == 'temporary_location' %}
{% assign showVBAExpandableAlert = true %}
{% assign VBAExpandableAlertTrigger = 'Temporary location' %}
{% assign VBAExpandableAlertStatus = 'warning' %}
{% elsif fieldOperatingStatusFacility == 'virtual_care' %}
{% assign showVBAExpandableAlert = true %}
{% assign VBAExpandableAlertTrigger = 'Virtual care only' %}
{% assign VBAExpandableAlertStatus = 'warning' %}
{% elsif fieldOperatingStatusFacility == 'coming_soon' %}
{% assign showVBAExpandableAlert = true %}
{% assign VBAExpandableAlertTrigger = 'Coming soon' %}
{% assign VBAExpandableAlertStatus = 'warning' %}
{% endif %}

{% if showVBAExpandableAlert %}
<va-alert-expandable
data-template="components/vba_facilities/expandable-alert.drupal.liquid"
class="vads-u-margin-top--0 vads-u-margin-bottom--0 vamc-facility-expandable-alert"
status="{{ VBAExpandableAlertStatus }}"
trigger="{{ VBAExpandableAlertTrigger }}"
>
<div>
<div class="vads-u-display--inline-block vads-u-margin-bottom--2">
{% if fieldOperatingStatusMoreInfo and fieldOperatingStatusMoreInfo != blank %}
<va-alert-expandable
trigger="{{ VBAExpandableAlertTrigger }}"
data-template="components/vba_facilities/expandable-alert.drupal.liquid"
class="vads-u-margin-top--0 vads-u-margin-bottom--0 vamc-facility-expandable-alert"
status="{{ VBAExpandableAlertStatus }}"
style="max-width: 303px;"
>
<p>
{{ fieldOperatingStatusMoreInfo | newline_to_br | phoneLinks }}
</p>
</div>
</va-alert-expandable>
</va-alert-expandable>
{% else %}
<va-alert
slim
status="{{ VBAExpandableAlertStatus }}"
class="vads-u-margin-y--0"
style="max-width: 303px;"
>
<p class="vads-u-margin-y--0 vads-u-padding-y--0 vads-u-font-weight--bold">{{ VBAExpandableAlertTrigger }}</p>
</va-alert>
{% endif %}
</div>
{% endif %}
24 changes: 22 additions & 2 deletions src/site/layouts/health_care_facility_status.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,33 @@
{% if office.fieldOperatingStatusFacility == 'normal' %}
Normal services and hours
{% elsif office.fieldOperatingStatusFacility == 'limited' %}
<va-alert slim="true" status="warning">
<va-alert slim="true" status="info">
Limited services and hours
</va-alert>
{% elsif office.fieldOperatingStatusFacility == 'closed' %}
<va-alert slim="true" status="error">
<va-alert slim="true" status="warning">
Facility closed
randimays marked this conversation as resolved.
Show resolved Hide resolved
</va-alert>
{% elsif office.fieldOperatingStatusFacility == 'notice' %}
<va-alert slim="true" status="info">
Facility notice
</va-alert>
{% elsif office.fieldOperatingStatusFacility == 'temporary_closure' %}
<va-alert slim="true" status="warning">
Temporary facility closure
</va-alert>
{% elsif office.fieldOperatingStatusFacility == 'temporary_location' %}
<va-alert slim="true" status="warning">
Temporary location
</va-alert>
{% elsif office.fieldOperatingStatusFacility == 'virtual_care' %}
<va-alert slim="true" status="warning">
Virtual care only
</va-alert>
{% elsif office.fieldOperatingStatusFacility == 'coming_soon' %}
<va-alert slim="true" status="warning">
Coming soon
</va-alert>
{% endif %}
{% endfor %}
</section>
Expand Down
4 changes: 2 additions & 2 deletions src/site/layouts/tests/vet_center/vet_center_locations_operating_status.unit.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ describe('Vet Center Locations Operating Status', () => {
);
const operatingStatus = queryAllByTestId(
rendered,
'operating-status-vc_5141OS',
'operating-status-nonexp-vc_5141OS',
);
expect(operatingStatus).to.be.empty;
expect(operatingStatus).to.have.lengthOf(1);
});

it('should render a limited operating status when has status and more info', async () => {
Expand Down
17 changes: 15 additions & 2 deletions src/site/layouts/vamc_operating_status_and_alerts.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,25 @@
</span>

{% elsif status.entity.fieldOperatingStatusFacility == 'limited' %}
<va-alert slim status="warning" visible>Limited services and hours</va-alert>
<va-alert slim status="info" visible>Limited services and hours</va-alert>

{% elsif status.entity.fieldOperatingStatusFacility == 'closed' %}
<va-alert slim status="error" visible>Facility Closed</va-alert>
<va-alert slim status="warning" visible>Facility Closed</va-alert>
randimays marked this conversation as resolved.
Show resolved Hide resolved

{% elsif status.entity.fieldOperatingStatusFacility == 'temporary_closure' %}
<va-alert slim status="warning" visible>Temporary facility closure</va-alert>

{% elsif status.entity.fieldOperatingStatusFacility == 'temporary_location' %}
<va-alert slim status="warning" visible>Temporary location</va-alert>

{% elsif status.entity.fieldOperatingStatusFacility == 'virtual_care' %}
<va-alert slim status="warning" visible>Virtual care only</va-alert>

{% elsif status.entity.fieldOperatingStatusFacility == 'coming_soon' %}
<va-alert slim status="warning" visible>Coming soon</va-alert>
{% endif %}


{% if status.entity.fieldOperatingStatusMoreInfo and status.entity.fieldOperatingStatusFacility != 'normal' %}
<div class="vads-u-margin-top--1p5">
{{ status.entity.fieldOperatingStatusMoreInfo }}
Expand Down
6 changes: 1 addition & 5 deletions src/site/layouts/vba_facility.drupal.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,7 @@
<div>
<div>

{% if fieldOperatingStatusMoreInfo and fieldOperatingStatusFacility and fieldOperatingStatusFacility != 'normal' %}
<div class="vads-u-display--inline-block vads-u-margin-bottom--1">
{% include "src/site/includes/vba_facilities/expandable_alert.liquid" %}
</div>
{% endif %}
{% include "src/site/includes/vba_facilities/expandable_alert.liquid" %}

<section>
<script type="application/ld+json">
Expand Down
Loading