From a108165e4775b1e5abd51740752573d5d22c8c80 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Fri, 11 Nov 2016 09:51:20 +0000 Subject: [PATCH] Give more realistic example address data MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Posit that examples of where you can put different parts of the address is more helpful than ‘example, example, example’. Also shows that you don’t have to fill all of the address columns. Spot the Easter egg 🎅 --- app/main/views/send.py | 17 ++++++++++++++--- app/templates/views/send-test.html | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index f263126d1..5e6f5b60c 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -54,13 +54,24 @@ def get_example_csv_rows(template, use_example_as_example=True, submitted_fields 'sms': ['07700 900321'] if use_example_as_example else [validate_and_format_phone_number( current_user.mobile_number, human_readable=True )], - 'letter': [current_user.name] + [ - (submitted_fields or {}).get(key, 'example' if use_example_as_example else key) - for key in first_column_headings['letter'][1:] + 'letter': [ + (submitted_fields or {}).get( + key, get_example_letter_address(key) if use_example_as_example else key + ) + for key in first_column_headings['letter'] ] }[template.template_type] + get_example_csv_fields(template.placeholders, use_example_as_example, submitted_fields) +def get_example_letter_address(key): + return { + 'address line 1': 'A. Name', + 'address line 2': '123 Example Street', + 'address line 3': 'Example town', + 'postcode': 'XM4 5HQ' + }.get(key, '') + + @main.route("/services//send/", methods=['GET']) @login_required @user_has_permissions('view_activity', diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html index 0ce9d9a0c..4f8fa4980 100644 --- a/app/templates/views/send-test.html +++ b/app/templates/views/send-test.html @@ -51,7 +51,7 @@ ) %} {% for column in item %} {% call field() %} - {% if loop.index > 1 %} + {% if loop.index > 1 or template.template_type == 'letter' %} {% else %}