From a2544a4d792852136d76676191bfce0ef056f415 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Mon, 12 Mar 2018 13:51:50 +0000 Subject: [PATCH 1/3] Remove the MoU question from request to go live MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This question was designed to make people feel like it was OK to submit their request without getting the MoU signed. We reckoned that this was the fastest way of getting their service live (because the MoU is the bit that’s most likely to slow them down). We now have a better way of telling people: - if they’ve signed the MoU already - or to contact us if they haven’t (which is what the majority of teams seem to do now) We were never actually using the answer to this question – we were still checking for every service whether they had it signed. So this commit removes this now-redundant question. --- app/main/forms.py | 12 ------------ app/main/views/service_settings.py | 2 -- .../service-settings/submit-request-to-go-live.html | 7 ------- tests/app/main/views/test_service_settings.py | 1 - 4 files changed, 22 deletions(-) diff --git a/app/main/forms.py b/app/main/forms.py index 94d28282f..ab1828fbe 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -554,18 +554,6 @@ class Triage(StripWhitespaceForm): class RequestToGoLiveForm(StripWhitespaceForm): - mou = RadioField( - ( - 'Has your organisation accepted the GOV.UK Notify data sharing and financial ' - 'agreement?' - ), - choices=[ - ('yes', 'Yes'), - ('no', 'No'), - ('don’t know', 'I don’t know') - ], - validators=[DataRequired()] - ) channel_email = BooleanField('Emails') channel_sms = BooleanField('Text messages') channel_letter = BooleanField('Letters') diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index c548dab27..4f38482e2 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -198,7 +198,6 @@ def submit_request_to_go_live(service_id): '\n---' '\nOrganisation type: {}' '\nAgreement signed: {}' - '\nMOU in place: {}' '\nChannel: {}\nStart date: {}\nStart volume: {}' '\nPeak volume: {}' '\nFeatures: {}' @@ -207,7 +206,6 @@ def submit_request_to_go_live(service_id): url_for('main.service_dashboard', service_id=current_service['id'], _external=True), current_service['organisation_type'], GovernmentDomain.from_current_user().as_human_readable, - form.mou.data, formatted_list(filter(None, ( 'email' if form.channel_email.data else None, 'text messages' if form.channel_sms.data else None, diff --git a/app/templates/views/service-settings/submit-request-to-go-live.html b/app/templates/views/service-settings/submit-request-to-go-live.html index ff4fb472a..088e1c0cf 100644 --- a/app/templates/views/service-settings/submit-request-to-go-live.html +++ b/app/templates/views/service-settings/submit-request-to-go-live.html @@ -14,13 +14,6 @@

Request to go live

-
-

We need permission to process your data before we can make your service live.

- {{ radios(form.mou, option_hints={ - 'no': 'We’ll send you a copy', - 'don’t know': 'We’ll check for you', - }) }} -
{{ checkbox_group('What kind of messages will you be sending?', [ form.channel_email, form.channel_sms, diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 1ed068554..2a6e96edd 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -566,7 +566,6 @@ def test_should_redirect_after_request_to_go_live( 'main.submit_request_to_go_live', service_id=SERVICE_ONE_ID, _data={ - 'mou': 'yes', 'channel_email': 'y', 'channel_sms': 'y', 'start_date': '01/01/2017', From 6fd483e39562e02e68eb2a9bbedbfe741f1d3a66 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 13 Mar 2018 11:35:45 +0000 Subject: [PATCH 2/3] Tweak spacing --- .../views/service-settings/submit-request-to-go-live.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/templates/views/service-settings/submit-request-to-go-live.html b/app/templates/views/service-settings/submit-request-to-go-live.html index 088e1c0cf..f0aad3576 100644 --- a/app/templates/views/service-settings/submit-request-to-go-live.html +++ b/app/templates/views/service-settings/submit-request-to-go-live.html @@ -13,7 +13,7 @@

Request to go live

- + {{ checkbox_group('What kind of messages will you be sending?', [ form.channel_email, form.channel_sms, @@ -29,7 +29,7 @@ form.method_upload, form.method_api ]) }} -

+

By requesting to go live you’re agreeing to our terms of use.

From 6462081f716454da0971711710d89e538a7bdd34 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 13 Mar 2018 11:39:40 +0000 Subject: [PATCH 3/3] Retitle request to go live submission page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `

`s should be unique across the site. This page’s `

` matches that of the previous page (the one with the checklist). This commit re-titles it to: - be unique - more accurately describe the content of the page --- .../views/service-settings/submit-request-to-go-live.html | 4 ++-- tests/app/main/views/test_service_settings.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/templates/views/service-settings/submit-request-to-go-live.html b/app/templates/views/service-settings/submit-request-to-go-live.html index f0aad3576..517afd278 100644 --- a/app/templates/views/service-settings/submit-request-to-go-live.html +++ b/app/templates/views/service-settings/submit-request-to-go-live.html @@ -6,12 +6,12 @@ {% from "components/banner.html" import banner_wrapper %} {% block service_page_title %} - Request to go live + How do you plan to use Notify? {% endblock %} {% block maincolumn_content %} -

Request to go live

+

How do you plan to use Notify?

{{ checkbox_group('What kind of messages will you be sending?', [ diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 2a6e96edd..a013066ec 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -532,7 +532,7 @@ def test_should_show_request_to_go_live( page = client_request.get( 'main.submit_request_to_go_live', service_id=SERVICE_ONE_ID ) - assert page.h1.text == 'Request to go live' + assert page.h1.text == 'How do you plan to use Notify?' for channel, label in ( ('email', 'Emails'), ('sms', 'Text messages'),