From d3c3183573e7fa527188c285b7b28866b7dbab77 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Tue, 16 Jan 2024 15:37:56 -0800 Subject: [PATCH] added choose time form --- app/main/views/send.py | 5 ++++- app/templates/views/notifications/check.html | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/main/views/send.py b/app/main/views/send.py index fe36c961b..91e9814af 100644 --- a/app/main/views/send.py +++ b/app/main/views/send.py @@ -780,6 +780,8 @@ def _check_notification(service_id, template_id, exception=None): back_link = get_back_link(service_id, template, len(placeholders), placeholders) + choose_time_form = ChooseTimeForm() + if (not session.get("recipient")) or not all_placeholders_in_session( template.placeholders ): @@ -791,6 +793,7 @@ def _check_notification(service_id, template_id, exception=None): return dict( template=template, back_link=back_link, + choose_time_form=choose_time_form, **(get_template_error_dict(exception) if exception else {}), ) @@ -861,7 +864,7 @@ def send_notification(service_id, template_id): job_api_client.create_job( upload_id, service_id, - scheduled_for="", + scheduled_for=request.form.get("scheduled_for", ""), template_id=template_id, original_file_name=filename, notification_count=1, diff --git a/app/templates/views/notifications/check.html b/app/templates/views/notifications/check.html index 0b60063d3..5bc970f9b 100644 --- a/app/templates/views/notifications/check.html +++ b/app/templates/views/notifications/check.html @@ -54,6 +54,16 @@ )}}" class='page-footer'> {% if not error %} + {% if choose_time_form %} + {{ choose_time_form.scheduled_for(param_extensions={ + 'formGroup': {'classes': 'bottom-gutter-2-3'}, + 'attributes': { + 'data-module': 'radio-select', + 'data-categories': choose_time_form.scheduled_for.categories|join(','), + 'data-show-now-as-default': 'true' + } + }) }} + {% endif %} {% set button_text %}Send 1 {{ 1|message_count_label(template.template_type, suffix='') }}{% endset %} {{ usaButton({ "text": button_text }) }} {% endif %}