diff --git a/app/main/forms.py b/app/main/forms.py index 1695ac682..a1c6db9bb 100644 --- a/app/main/forms.py +++ b/app/main/forms.py @@ -384,26 +384,47 @@ class Feedback(Form): class RequestToGoLiveForm(Form): - channel = StringField( - 'Are you sending emails or text messages or both?', - validators=[DataRequired(message='Can’t be empty')] + mou = RadioField( + ( + 'Has your organisation accepted the GOV.UK Notify data sharing and financial ' + 'agreement (Memorandum of Understanding)?' + ), + choices=[ + ('yes', 'Yes'), + ('no', 'No – we’ll send you a copy'), + ('don’t know', 'I don’t know – we’ll check for you') + ], + validators=[DataRequired()] + ) + channel = RadioField( + 'What kind of messages will you be sending?', + choices=[ + ('emails', 'Emails'), + ('text messages', 'Text messages'), + ('emails and text messages', 'Both') + ], + validators=[DataRequired()] ) start_date = StringField( 'When will you be ready to start sending messages?', validators=[DataRequired(message='Can’t be empty')] ) start_volume = StringField( - 'How many messages do you expect to send per month to start with? Give an estimate in numbers.', + 'How many messages do you expect to send to start with?', validators=[DataRequired(message='Can’t be empty')] ) peak_volume = StringField( - 'Will the number of messages a month increase and when will that start? Give an estimate.', + 'Will the number of messages increase and when will that start?', validators=[DataRequired(message='Can’t be empty')] ) - upload_or_api = StringField( - 'Are you uploading a list of contacts that you’re sending your message to, ' + - 'or are you integrating your system with ours?', - validators=[DataRequired(message='Can’t be empty')] + upload_or_api = RadioField( + 'How are you going to send messages?', + choices=[ + ('File upload', 'Upload a spreadsheet of recipients'), + ('API', 'Integrate with the GOV.UK Notify API'), + ('API and file upload', 'Both') + ], + validators=[DataRequired()] ) diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index b65f449d0..d80aa747c 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -112,11 +112,13 @@ def service_request_to_go_live(service_id): 'subject': 'Request to go live', 'message': ( 'On behalf of {} ({})\n\nExpected usage\n---' + '\nMOU in place: {}' '\nChannel: {}\nStart date: {}\nStart volume: {}' '\nPeak volume: {}\nUpload or API: {}' ).format( current_service['name'], url_for('main.service_dashboard', service_id=current_service['id'], _external=True), + form.mou.data, form.channel.data, form.start_date.data, form.start_volume.data, diff --git a/app/templates/views/service-settings/request-to-go-live.html b/app/templates/views/service-settings/request-to-go-live.html index d64bc2fa5..e86e8fa4d 100644 --- a/app/templates/views/service-settings/request-to-go-live.html +++ b/app/templates/views/service-settings/request-to-go-live.html @@ -1,5 +1,6 @@ {% extends "withnav_template.html" %} {% from "components/textbox.html" import textbox %} +{% from "components/radios.html" import radios %} {% from "components/page-footer.html" import page_footer %} {% from "components/banner.html" import banner_wrapper %} @@ -11,19 +12,10 @@

Request to go live

- {% call banner_wrapper(type='warning') %} -

You must accept the GOV.UK Notify data sharing and financial agreement (Memorandum of Understanding) before we can process data for you.

- -

- Contact the Notify team to get a copy of the agreement or to find out if your organisation has already accepted it. -

- {% endcall %} -

Before you request to go live, make sure you’ve:

-