mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-09-07 18:58:25 -04:00
add a call on the send page as well
This commit is contained in:
@@ -25,6 +25,7 @@ from app import (
|
|||||||
)
|
)
|
||||||
from app.formatters import format_date_numeric, format_datetime_numeric, get_time_left
|
from app.formatters import format_date_numeric, format_datetime_numeric, get_time_left
|
||||||
from app.main import main
|
from app.main import main
|
||||||
|
from app.main.views.user_profile import set_timezone
|
||||||
from app.statistics_utils import get_formatted_percentage
|
from app.statistics_utils import get_formatted_percentage
|
||||||
from app.utils import (
|
from app.utils import (
|
||||||
DELIVERED_STATUSES,
|
DELIVERED_STATUSES,
|
||||||
@@ -552,15 +553,3 @@ def get_tuples_of_financial_years(
|
|||||||
)
|
)
|
||||||
for year in reversed(range(start, end + 1))
|
for year in reversed(range(start, end + 1))
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def set_timezone():
|
|
||||||
# Cookie is set in dashboard.html on page load
|
|
||||||
try:
|
|
||||||
timezone = request.cookies.get("timezone", "US/Eastern")
|
|
||||||
current_app.logger.debug(hilite(f"User's timezone is {timezone}"))
|
|
||||||
serialized_user = current_user.serialize()
|
|
||||||
if serialized_user["preferred_timezone"] is not timezone:
|
|
||||||
current_user.update(preferred_timezone=timezone)
|
|
||||||
except Exception:
|
|
||||||
current_app.logger.exception(hilite("Can't get timezone"))
|
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ from app.main.forms import (
|
|||||||
SetSenderForm,
|
SetSenderForm,
|
||||||
get_placeholder_form_instance,
|
get_placeholder_form_instance,
|
||||||
)
|
)
|
||||||
|
from app.main.views.user_profile import set_timezone
|
||||||
from app.models.user import Users
|
from app.models.user import Users
|
||||||
from app.s3_client.s3_csv_client import (
|
from app.s3_client.s3_csv_client import (
|
||||||
get_csv_metadata,
|
get_csv_metadata,
|
||||||
@@ -1075,6 +1076,7 @@ def get_spreadsheet_column_headings_from_template(template):
|
|||||||
|
|
||||||
|
|
||||||
def get_recipient():
|
def get_recipient():
|
||||||
|
set_timezone()
|
||||||
if {"recipient", "placeholders"} - set(session.keys()):
|
if {"recipient", "placeholders"} - set(session.keys()):
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|||||||
@@ -275,3 +275,15 @@ def user_profile_disable_platform_admin_view():
|
|||||||
return render_template(
|
return render_template(
|
||||||
"views/user-profile/disable-platform-admin-view.html", form=form
|
"views/user-profile/disable-platform-admin-view.html", form=form
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def set_timezone():
|
||||||
|
# Cookie is set in dashboard.html on page load
|
||||||
|
try:
|
||||||
|
timezone = request.cookies.get("timezone", "US/Eastern")
|
||||||
|
current_app.logger.debug(f"User's timezone is {timezone}")
|
||||||
|
serialized_user = current_user.serialize()
|
||||||
|
if serialized_user["preferred_timezone"] is not timezone:
|
||||||
|
current_user.update(preferred_timezone=timezone)
|
||||||
|
except Exception:
|
||||||
|
current_app.logger.exception(hilite("Can't get timezone"))
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
{% from "components/file-upload.html" import file_upload %}
|
{% from "components/file-upload.html" import file_upload %}
|
||||||
{% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
|
{% from "components/table.html" import list_table, text_field, index_field, index_field_heading %}
|
||||||
{% from "components/components/back-link/macro.njk" import usaBackLink %}
|
{% from "components/components/back-link/macro.njk" import usaBackLink %}
|
||||||
|
<script type="text/javascript" src="{{ asset_url('js/setTimezone.js') }}"></script>
|
||||||
|
|
||||||
{% block service_page_title %}
|
{% block service_page_title %}
|
||||||
Upload a list of {{ 999|recipient_count_label(template.template_type) }}
|
Upload a list of {{ 999|recipient_count_label(template.template_type) }}
|
||||||
|
|||||||
Reference in New Issue
Block a user