From 6d7b16fd5985958c66facf4a31c18ef23738a5c7 Mon Sep 17 00:00:00 2001 From: Pea Tyczynska Date: Fri, 15 Jan 2021 13:36:12 +0000 Subject: [PATCH] View edit service notes page --- app/main/views/service_settings.py | 2 +- .../service-settings/edit-service-notes.html | 28 +++++++++++++++++++ tests/__init__.py | 2 ++ tests/app/main/views/test_service_settings.py | 11 ++++++++ 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 app/templates/views/service-settings/edit-service-notes.html diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py index 839925c8e..1e5d8c484 100644 --- a/app/main/views/service_settings.py +++ b/app/main/views/service_settings.py @@ -1195,7 +1195,7 @@ def edit_service_notes(service_id): form = EditServiceNotesForm() if request.method == 'GET': - form.name.data = current_service.notes + form.notes.data = current_service.notes if form.validate_on_submit(): diff --git a/app/templates/views/service-settings/edit-service-notes.html b/app/templates/views/service-settings/edit-service-notes.html new file mode 100644 index 000000000..a00e073a7 --- /dev/null +++ b/app/templates/views/service-settings/edit-service-notes.html @@ -0,0 +1,28 @@ +{% extends "withnav_template.html" %} +{% from "components/page-header.html" import page_header %} +{% from "components/page-footer.html" import page_footer %} +{% from "components/form.html" import form_wrapper %} +{% from "components/textbox.html" import textbox %} + +{% block service_page_title %} + Data retention +{% endblock %} + +{% block maincolumn_content %} + + {{ page_header( + 'Edit service notes', + back_link=url_for('.service_settings', service_id=current_service.id) + ) }} + {% call form_wrapper() %} + {{ textbox( + form.notes, + rows=4, + width='1-1', + autofocus=True, + autosize=True, + ) }} + {{ page_footer('Save') }} + {% endcall %} + +{% endblock %} diff --git a/tests/__init__.py b/tests/__init__.py index ff4866012..8478af8e8 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -150,6 +150,7 @@ def service_json( contact_link=None, organisation_id=None, rate_limit=3000, + notes=None, ): if users is None: users = [] @@ -188,6 +189,7 @@ def service_json( 'consent_to_research': True, 'count_as_live': True, 'organisation': organisation_id, + 'notes': notes } diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 46bfd64ee..1bf7779ed 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -5249,3 +5249,14 @@ def test_service_settings_links_to_edit_service_notes_page_for_platform_admins( )) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') assert len(page.find_all('a', attrs={'href': '/services/{}/notes'.format(SERVICE_ONE_ID)})) == 1 + + +def test_view_edit_service_notes( + platform_admin_client, + service_one, + +): + response = platform_admin_client.get(url_for('main.edit_service_notes', service_id=SERVICE_ONE_ID)) + page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') + assert page.select_one('h1').text == "Edit service notes" + assert page.find('label', class_="form-label").text.strip() == "Notes"