mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-23 15:57:23 -04:00
remove components related to MOU and agreement (#476)
Co-authored-by: Kenneth Kehl <@kkehl@flexion.us>
This commit is contained in:
Kenneth Kehl
@@ -7,9 +7,7 @@ Service: {{ service.name }}
|
||||
|
||||
---
|
||||
Organisation type: {{ service.organisation_type_label }}
|
||||
Agreement signed: {{ organisation.agreement_signed|format_yes_no(none='Can’t tell') }}
|
||||
{%- if organisation.agreement_signed %}, for {{ current_service.organisation.name }}
|
||||
{%- elif organisation.name %} (organisation is {{ organisation.name }})
|
||||
{%- if organisation.name %} (organisation is {{ organisation.name }})
|
||||
{%- else %} (domain is {{ user.email_domain }})
|
||||
{%- endif %}.
|
||||
{%- if organisation.request_to_go_live_notes %} {{ organisation.request_to_go_live_notes }}{% endif %}
|
||||
|
||||
@@ -1,48 +0,0 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/radios.html" import radio, conditional_radio_panel %}
|
||||
{% from "components/select-input.html" import select_wrapper %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Accept our data sharing and financial agreement
|
||||
{% endblock %}
|
||||
|
||||
{% block backLink %}
|
||||
{{ govukBackLink({ "href": url_for('main.service_agreement', service_id=current_service.id) }) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-five-sixths">
|
||||
|
||||
{{ page_header('Accept our data sharing and financial agreement') }}
|
||||
|
||||
{% call form_wrapper(class='top-gutter') %}
|
||||
|
||||
{% call select_wrapper(form.who) %}
|
||||
{% for option in form.who %}
|
||||
{{ radio(option, data_target='on-behalf-of' if option.data == 'someone-else' else None) }}
|
||||
{% endfor %}
|
||||
{% endcall %}
|
||||
{% call conditional_radio_panel('on-behalf-of') %}
|
||||
{{ form.on_behalf_of_name(param_extensions={"classes": "govuk-!-width-full"}) }}
|
||||
{{ form.on_behalf_of_email(param_extensions={"classes": "govuk-!-width-full"}) }}
|
||||
{% endcall %}
|
||||
{{ form.version(
|
||||
param_extensions={
|
||||
"hint": {"text": "The version number is on the front page, for example ‘3.6’"},
|
||||
"classes": "govuk-!-width-one-third"}
|
||||
) }}
|
||||
|
||||
{{ page_footer('Continue') }}
|
||||
|
||||
{% endcall %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,42 +0,0 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Confirm that you accept the agreement
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block backLink %}
|
||||
{{ govukBackLink({ "href": url_for('main.service_accept_agreement', service_id=current_service.id) }) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-five-sixths">
|
||||
|
||||
{{ page_header('Confirm that you accept the agreement') }}
|
||||
|
||||
{% call form_wrapper(class='top-gutter') %}
|
||||
|
||||
{% if current_service.organisation.agreement_signed_on_behalf_of_name and current_service.organisation.agreement_signed_on_behalf_of_email_address %}
|
||||
<p class="govuk-body">
|
||||
I confirm that I have the legal authority to accept the U.S. Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) on behalf of {{ current_service.organisation.agreement_signed_on_behalf_of_name }} ({{ current_service.organisation.agreement_signed_on_behalf_of_email_address }}) and that {{ current_service.organisation.name }} will be bound by it.
|
||||
</p>
|
||||
{% else %}
|
||||
<p class="govuk-body">
|
||||
I confirm that I have the legal authority to accept the U.S. Notify data sharing and financial agreement (version {{ current_service.organisation.agreement_signed_version }}) and that {{ current_service.organisation.name }} will be bound by it.
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
{{ page_footer('Accept this agreement') }}
|
||||
|
||||
{% endcall %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,27 +0,0 @@
|
||||
{% extends "withoutnav_template.html" %}
|
||||
{% from "components/sub-navigation.html" import sub_navigation %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Download the U.S. Notify data sharing and financial agreement
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-two-thirds">
|
||||
|
||||
<h1 class="heading-large">
|
||||
Download the U.S. Notify data sharing and financial agreement
|
||||
</h1>
|
||||
|
||||
<p class="govuk-body">
|
||||
<a class="govuk-link govuk-link--no-visited-state" href="{{ download_link }}">Download the agreement (PDF)</a>{% if owner %} for {{ owner }}{% endif %}.
|
||||
</p>
|
||||
<p class="govuk-body">
|
||||
The agreement contains commercially sensitive information. Do not share it outside your organization.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,31 +0,0 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block service_page_title %}
|
||||
Your organization has already accepted the agreement
|
||||
{% endblock %}
|
||||
|
||||
{% block backLink %}
|
||||
{{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-five-sixths">
|
||||
|
||||
{{ page_header('Your organization has already accepted the agreement')}}
|
||||
|
||||
<p class="govuk-body">
|
||||
{{ current_service.organisation.name }} has already accepted the US
|
||||
Notify data sharing and financial agreement.
|
||||
</p>
|
||||
<p class="govuk-body">
|
||||
The agreement is confidential and should not be shared outside your organization.
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -1,42 +0,0 @@
|
||||
{% extends "withnav_template.html" %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/uk_components/button/macro.njk" import govukButton %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block service_page_title %}
|
||||
Accept our data sharing and financial agreement
|
||||
{% endblock %}
|
||||
|
||||
{% block backLink %}
|
||||
{{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-five-sixths">
|
||||
|
||||
{{ page_header('Accept our data sharing and financial agreement')}}
|
||||
|
||||
<p class="govuk-body">
|
||||
Before you can use U.S. Notify, you need to accept our data sharing and financial agreement.
|
||||
</p>
|
||||
<p class="govuk-body">
|
||||
This must be done by, or on behalf of, someone with the authority to sign contracts for {{ current_service.organisation.name }}.
|
||||
</p>
|
||||
<p class="govuk-body">
|
||||
Once accepted, the agreement covers all Notify services from {{ current_service.organisation.name }}.
|
||||
</p>
|
||||
<p class="govuk-body">
|
||||
The agreement is confidential and should not be shared outside your organization.
|
||||
</p>
|
||||
{{ govukButton({
|
||||
"element": "a",
|
||||
"text": "Continue",
|
||||
"href": url_for('main.service_accept_agreement', service_id=current_service.id),
|
||||
}) }}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@@ -6,16 +6,12 @@
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block per_page_title %}
|
||||
Accept our data sharing and financial agreement
|
||||
{% endblock %}
|
||||
|
||||
{% block backLink %}
|
||||
{{ govukBackLink({ "href": url_for('main.request_to_go_live', service_id=current_service.id) }) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
{{ page_header('Accept our data sharing and financial agreement') }}
|
||||
{% call form_wrapper() %}
|
||||
{% call select_wrapper(form.same_as_service_name) %}
|
||||
{% for option in form.same_as_service_name %}
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% set page_title = "Accept our data sharing and financial agreement" %}
|
||||
|
||||
{% block per_page_title %}
|
||||
{{ page_title }}
|
||||
{% endblock %}
|
||||
|
||||
@@ -4,37 +4,3 @@
|
||||
{% block org_page_title %}
|
||||
Billing
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
{{ page_header("Billing", size="medium") }}
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-five-sixths">
|
||||
<h2 class="heading-small">
|
||||
Data sharing and financial agreement
|
||||
</h2>
|
||||
|
||||
{% if current_org.agreement_signed_at %}
|
||||
<p class="govuk-body">
|
||||
Your organization accepted version {{ current_org.agreement_signed_version }} of the U.S. Notify data sharing
|
||||
and financial agreement on {{ current_org.agreement_signed_at | format_date_normal }}.
|
||||
</p>
|
||||
<p class="govuk-body">
|
||||
{{ current_org.agreement_signed_on_behalf_of_name or current_org.agreement_signed_by.name }} signed the agreement
|
||||
on behalf of {{ current_org.name}}.
|
||||
</p>
|
||||
{% elif current_org.agreement_signed %}
|
||||
<p class="govuk-body">
|
||||
{{ current_org.name}} has accepted the U.S. Notify data sharing and financial agreement.
|
||||
</p>
|
||||
{% elif current_org.agreement_signed is false %}
|
||||
<p class="govuk-body">
|
||||
{{ current_org.name}} needs to accept the U.S. Notify data sharing and financial agreement.
|
||||
</p>
|
||||
{% elif current_org.agreement_signed is none %}
|
||||
<p class="govuk-body">
|
||||
{{ current_org.name}} has not accepted the U.S. Notify data sharing and financial agreement, but we have some service-specific agreements in place.
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
{% extends "org_template.html" %}
|
||||
{% from "components/page-footer.html" import page_footer %}
|
||||
{% from "components/page-header.html" import page_header %}
|
||||
{% from "components/form.html" import form_wrapper %}
|
||||
{% from "components/uk_components/back-link/macro.njk" import govukBackLink %}
|
||||
|
||||
{% block backLink %}
|
||||
{{ govukBackLink({ "href": url_for('.organisation_settings', org_id=current_org.id) }) }}
|
||||
{% endblock %}
|
||||
|
||||
{% block org_page_title %}
|
||||
Data sharing and financial agreement
|
||||
{% endblock %}
|
||||
|
||||
{% block maincolumn_content %}
|
||||
{{ page_header("Data sharing and financial agreement") }}
|
||||
<div class="govuk-grid-row">
|
||||
<div class="govuk-grid-column-five-sixths">
|
||||
{% call form_wrapper() %}
|
||||
{{ form.agreement_signed }}
|
||||
{{ page_footer('Save') }}
|
||||
{% endcall %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -34,22 +34,6 @@
|
||||
)
|
||||
}}
|
||||
{% endcall %}
|
||||
{% call row() %}
|
||||
{{ text_field('Data sharing and financial agreement') }}
|
||||
{{ text_field(
|
||||
{
|
||||
True: 'Signed',
|
||||
False: 'Not signed',
|
||||
None: 'Not signed (but we have some service-specific agreements in place)'
|
||||
}.get(current_org.agreement_signed)
|
||||
) }}
|
||||
{{ edit_field(
|
||||
'Change',
|
||||
url_for('.edit_organisation_agreement', org_id=current_org.id),
|
||||
suffix='data sharing and financial agreement for the organization'
|
||||
)
|
||||
}}
|
||||
{% endcall %}
|
||||
{% call row() %}
|
||||
{{ text_field('Request to go live notes') }}
|
||||
{{ optional_text_field(current_org.request_to_go_live_notes, default='None') }}
|
||||
|
||||
@@ -50,19 +50,12 @@
|
||||
url_for('main.service_sms_senders', service_id=current_service.id),
|
||||
) }}
|
||||
{% endif %}
|
||||
{% if current_service.able_to_accept_agreement %}
|
||||
{{ task_list_item(
|
||||
current_service.organisation.agreement_signed,
|
||||
'Accept our data sharing and financial agreement',
|
||||
url_for('main.service_agreement', service_id=current_service.id),
|
||||
) }}
|
||||
{% endif %}
|
||||
{% endcall %}
|
||||
{% if not current_user.is_gov_user %}
|
||||
<p class="govuk-body">
|
||||
Only team members with a government email address can request to go live.
|
||||
</p>
|
||||
{% elif (not current_service.go_live_checklist_completed) or (current_service.able_to_accept_agreement and not current_service.organisation.agreement_signed) %}
|
||||
{% elif (not current_service.go_live_checklist_completed) %}
|
||||
<p class="govuk-body">
|
||||
You must complete these steps before you can request to go live.
|
||||
</p>
|
||||
|
||||
@@ -36,7 +36,6 @@
|
||||
<ul class="list list-bullet">
|
||||
<li>add examples of the messages you want to send</li>
|
||||
<li>update your settings so you’re ready to send and receive messages</li>
|
||||
<li>accept our data sharing and financial agreement</li>
|
||||
<li>accept our terms of use</li>
|
||||
</ul>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user