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

fix

Browse Source
This commit is contained in:
Kenneth Kehl
2023-11-16 12:47:47 -08:00
parent 36987e7202
commit 654557e793
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/utils/csv.py
View File

@@ -2,6 +2,7 @@ import datetime
import pytz import pytz
from flask import current_app from flask import current_app
from flask_login import current_user
from notifications_utils.recipients import RecipientCSV from notifications_utils.recipients import RecipientCSV
from app.models.spreadsheet import Spreadsheet from app.models.spreadsheet import Spreadsheet
@@ -62,10 +63,6 @@ def get_errors_for_csv(recipients, template_type):
return errors return errors
def get_user_preferred_timezone():
return "US/Eastern"
def generate_notifications_csv(**kwargs): def generate_notifications_csv(**kwargs):
from app import notification_api_client from app import notification_api_client
from app.s3_client.s3_csv_client import s3download from app.s3_client.s3_csv_client import s3download
@@ -162,6 +159,10 @@ def generate_notifications_csv(**kwargs):
def convert_report_date_to_preferred_timezone(db_date_str_in_utc): def convert_report_date_to_preferred_timezone(db_date_str_in_utc):
"""
Report dates in the db are in UTC. We need to convert them to the user's default timezone,
which defaults to "US/Eastern"
"""
date_arr = db_date_str_in_utc.split(" ") date_arr = db_date_str_in_utc.split(" ")
db_date_str_in_utc = f"{date_arr[0]}T{date_arr[1]}+00:00" db_date_str_in_utc = f"{date_arr[0]}T{date_arr[1]}+00:00"
utc_date_obj = datetime.datetime.fromisoformat(db_date_str_in_utc) utc_date_obj = datetime.datetime.fromisoformat(db_date_str_in_utc)
@@ -172,3 +173,10 @@ def convert_report_date_to_preferred_timezone(db_date_str_in_utc):
preferred_tz_created_at = preferred_date_obj.strftime("%Y-%m-%d %H:%M:%S") preferred_tz_created_at = preferred_date_obj.strftime("%Y-%m-%d %H:%M:%S")
return f"{preferred_tz_created_at} {get_user_preferred_timezone()}" return f"{preferred_tz_created_at} {get_user_preferred_timezone()}"
def get_user_preferred_timezone():
if current_user and hasattr(current_user, "preferred_timezone"):
return current_user.preferred_timezone
return "US/Eastern"