Add government channel

We have been asked to support the government channel so that:
- it can be tested
- the option to use it is available for the most severe of emergencies,
  where the public’s choice to opt-out is outweighed by the widespread
  risk to life
This commit is contained in:
Chris Hill-Scott
2021-05-11 09:50:18 +01:00
parent ffd844b2a7
commit f640767f3d
6 changed files with 69 additions and 36 deletions

View File

@@ -2351,6 +2351,7 @@ class ServiceBroadcastAccountTypeForm(StripWhitespaceForm):
("live-test-vodafone", "Test channel (Vodafone)"),
("live-test", "Test channel (all networks)"),
("live-severe", "Live (all networks)"),
("live-government", "Government channel (all networks)"),
],
validators=[DataRequired()]
)

View File

@@ -434,6 +434,7 @@
{% if not current_service.broadcast_channel %}
Off
{% else %}
{% if current_service.live and current_service.broadcast_channel == "government" %}Government{% endif %}
{% if current_service.live and current_service.broadcast_channel == "severe" %}Live{% endif %}
{% if current_service.live and current_service.broadcast_channel == "test" %}Test {% if current_service.allowed_broadcast_provider != "all" %}({{ current_service.allowed_broadcast_provider|format_mobile_network }}){% else %}(All networks){% endif %}{%endif%}
{% if not current_service.live%}Training {% endif%}

View File

@@ -27,8 +27,8 @@
<span class="navigation-service-type navigation-service-type--live govuk-!-margin-left-0">
{% if form.account_type.broadcast_channel == 'severe' %}
Live
{% elif form.account_type.broadcast_channel == 'test' %}
Test
{% else %}
{{ form.account_type.broadcast_channel|title }}
{% endif %}
{% if form.account_type.provider_restriction != 'all' %}
({{ form.account_type.provider_restriction|format_mobile_network }})
@@ -40,7 +40,10 @@
{% if form.account_type.broadcast_channel == 'test' %}
who have switched on the test channel on their phones
{% endif %}
will receive alerts sent from this service.
will receive alerts sent from this service
{%- if form.account_type.broadcast_channel == 'government' -%}
, even if theyve opted out
{%- endif %}.
</p>
{% endif %}

View File

@@ -22,11 +22,15 @@
{% elif current_service.has_permission('broadcast') %}
{% if current_service.trial_mode %}
<span class="navigation-service-type navigation-service-type--training">Training
{% else %}
{% elif current_service.broadcast_channel == 'severe' %}
<span class="navigation-service-type navigation-service-type--live">Live
{% endif %}
{% if current_service.allowed_broadcast_provider != "all" %}
({{ current_service.allowed_broadcast_provider }})
{% elif current_service.broadcast_channel == 'test' %}
<span class="navigation-service-type navigation-service-type--live">{{ current_service.broadcast_channel|title }}
{% if current_service.allowed_broadcast_provider != "all" %}
({{ current_service.allowed_broadcast_provider }})
{% endif %}
{% else %}
<span class="navigation-service-type navigation-service-type--live">{{ current_service.broadcast_channel|title }}
{% endif %}
</span>
{% endif %}