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

Merge remote-tracking branch 'origin/all-pages-everywhere'

Browse Source
This commit is contained in:
Chris Hill-Scott
2017-05-16 11:22:33 +01:00
parent 24817de387 acae449ab9
commit 11394bce8e
4 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/main/views/send.py
View File

@@ -37,7 +37,7 @@ from app.utils import (
get_help_argument,
get_template
)
from app.template_previews import TemplatePreview
from app.template_previews import TemplatePreview, get_page_count_for_letter
def get_page_headings(template_type):
@@ -83,15 +83,19 @@ def get_example_letter_address(key):
@user_has_permissions('send_texts', 'send_emails', 'send_letters')
def send_messages(service_id, template_id):
template = service_api_client.get_service_template(service_id, template_id)['data']
template = get_template(
service_api_client.get_service_template(service_id, template_id)['data'],
template,
current_service,
show_recipient=True,
expand_emails=True,
letter_preview_url=url_for(
'.view_letter_template_preview',
service_id=service_id,
template_id=template_id,
filetype='png',
page_count=get_page_count_for_letter(template),
),
)
@@ -150,15 +154,19 @@ def send_test(service_id, template_id):
file_name = current_app.config['TEST_MESSAGE_FILENAME']
template = service_api_client.get_service_template(service_id, template_id)['data']
template = get_template(
service_api_client.get_service_template(service_id, template_id)['data'],
template,
current_service,
show_recipient=True,
expand_emails=True,
letter_preview_url=url_for(
'.view_letter_template_preview',
service_id=service_id,
template_id=template_id,
filetype='png',
page_count=get_page_count_for_letter(template),
),
)

8
app/main/views/templates.py
View File

@@ -19,7 +19,7 @@ from notifications_python_client.errors import HTTPError
from app.main import main
from app.utils import user_has_permissions, get_template
from app.template_previews import TemplatePreview
from app.template_previews import TemplatePreview, get_page_count_for_letter
from app.main.forms import (
ChooseTemplateType,
SMSTemplateForm,
@@ -74,10 +74,6 @@ def choose_template(service_id):
)
def view_template(service_id, template_id):
template = service_api_client.get_service_template(service_id, template_id)['data']
page_count = None
if template['template_type'] == 'letter':
page_count, _, _ = TemplatePreview.from_database_object(template, filetype='json')
page_count = json.loads(page_count.decode('utf-8'))['count']
return render_template(
'views/templates/template.html',
template=get_template(
@@ -91,7 +87,7 @@ def view_template(service_id, template_id):
filetype='png',
),
show_recipient=True,
page_count=page_count,
page_count=get_page_count_for_letter(template),
),
)

13
app/template_previews.py
View File

@@ -1,4 +1,4 @@
from flask import current_app
from flask import current_app, json
import requests
from app import current_service
@@ -32,3 +32,14 @@ class TemplatePreview:
template.values,
page=page,
)
def get_page_count_for_letter(template, values=None):
if template['template_type'] != 'letter':
return None
page_count, _, _ = TemplatePreview.from_database_object(template, values, filetype='json')
page_count = json.loads(page_count.decode('utf-8'))['count']
return page_count