darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split ‘send SMS’ page into two pages

Browse Source 
This commit just splits the existing page into two. It doesn’t do any
substantive changes to how the two parts of the page work.
This commit is contained in:
Chris Hill-Scott
2016-02-02 17:28:30 +00:00
parent 24cdfd9f64
commit 394a9db3f7
9 changed files with 116 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/forms.py
View File

@@ -217,7 +217,7 @@ class ChangePasswordForm(Form):
class CsvUploadForm(Form):
file = FileField('File to upload', validators=[DataRequired(
file = FileField('Upload a CSV file to add your recipients’ details', validators=[DataRequired(
message='Please pick a file'), CsvFileValidator()])

30
app/main/views/sms.py
View File

@@ -33,15 +33,34 @@ from app.main.utils import (
@main.route("/services/<service_id>/sms/send", methods=['GET', 'POST'])
def choose_sms_template(service_id):
if request.method == 'POST':
return redirect(url_for('.send_sms',
service_id=service_id,
template_id=request.form.get('template')))
try:
templates = templates_dao.get_service_templates(service_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
else:
raise e
return render_template('views/choose-sms-template.html',
templates=templates,
service_id=service_id)
@main.route("/services/<service_id>/sms/send/<template_id>", methods=['GET', 'POST'])
@login_required
def send_sms(service_id):
def send_sms(service_id, template_id):
form = CsvUploadForm()
if form.validate_on_submit():
try:
csv_file = form.file.data
filedata = _get_filedata(csv_file)
upload_id = str(uuid.uuid4())
template_id = request.form.get('template')
s3upload(upload_id, service_id, filedata, current_app.config['AWS_REGION'])
session['upload_data'] = {"template_id": template_id, "original_file_name": filedata['file_name']}
return redirect(url_for('.check_sms',
@@ -52,10 +71,10 @@ def send_sms(service_id):
csv_file.filename)
flash(message)
flash(str(e))
return redirect(url_for('.send_sms', service_id=service_id))
return redirect(url_for('.send_sms', service_id=service_id, template_id=template_id))
try:
templates = templates_dao.get_service_templates(service_id)['data']
template = templates_dao.get_service_template(service_id, template_id)['data']
except HTTPError as e:
if e.status_code == 404:
abort(404)
@@ -63,7 +82,7 @@ def send_sms(service_id):
raise e
return render_template('views/send-sms.html',
templates=templates,
template=template,
form=form,
service_id=service_id)
@@ -84,6 +103,7 @@ def check_sms(service_id, upload_id):
'views/check-sms.html',
upload_result=upload_result,
message_template=template['content'],
template_id=template_id,
service_id=service_id
)
elif request.method == 'POST':