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

Merge pull request #1371 from GSA/1365-update-date-on-preview-page-and-status-page

Browse Source 
Update datetime on preview to be more human readable
This commit is contained in:
Carlo Costino
2024-04-03 19:12:27 -04:00
committed by GitHub
parent cc20c02839 a2ab04018d
commit 2cf3ddb6ff
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/formatters.py
View File

@@ -22,7 +22,7 @@ from notifications_utils.recipients import InvalidPhoneError, validate_phone_num
from notifications_utils.take import Take from notifications_utils.take import Take
from app.utils.csv import get_user_preferred_timezone from app.utils.csv import get_user_preferred_timezone
from app.utils.time import parse_naive_dt from app.utils.time import parse_dt, parse_naive_dt
def apply_html_class(tags, html_file): def apply_html_class(tags, html_file):
@@ -99,12 +99,10 @@ def format_datetime_table(date):
def format_time_12h(date): def format_time_12h(date):
date = parse_naive_dt(date) date = parse_dt(date)
preferred_tz = pytz.timezone(get_user_preferred_timezone()) preferred_tz = pytz.timezone(get_user_preferred_timezone())
return ( return date.astimezone(preferred_tz).strftime("%I:%M %p")
date.replace(tzinfo=timezone.utc).astimezone(preferred_tz).strftime("%I:%M %p")
)
def format_datetime_relative(date): def format_datetime_relative(date):

2
app/templates/views/check/preview.html
View File

@@ -21,7 +21,7 @@
{{ page_header('Preview') }} {{ page_header('Preview') }}
<div> <div>
<p class="sms-message-scheduler">Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}</p> <p class="sms-message-scheduler">Scheduled: {{ scheduled_for |format_datetime_normal if scheduled_for else 'Now'}}</p>
<p class="sms-message-file-name">File: {{original_file_name}}</p> <p class="sms-message-file-name">File: {{original_file_name}}</p>
<p class="sms-message-template">Template: {{template.name}}</p> <p class="sms-message-template">Template: {{template.name}}</p>
<p class="sms-message-sender" >From: {{ template.sender }}</p> <p class="sms-message-sender" >From: {{ template.sender }}</p>

2
app/templates/views/notifications/preview.html
View File

@@ -43,7 +43,7 @@
{{ page_header('Preview') }} {{ page_header('Preview') }}
{% endif %} {% endif %}
<div> <div>
<p class="sms-message-scheduler">Scheduled: {{ scheduled_for if scheduled_for else 'Now'}}</p> <p class="sms-message-scheduler">Scheduled: {{ scheduled_for |format_datetime_normal if scheduled_for else 'Now'}}</p>
<p class="sms-message-template">Template: {{template.name}}</p> <p class="sms-message-template">Template: {{template.name}}</p>
<p class="sms-message-sender" >From: {{ template.sender }}</p> <p class="sms-message-sender" >From: {{ template.sender }}</p>
<p class="sms-message-sender" >To: {{ recipient }}</p> <p class="sms-message-sender" >To: {{ recipient }}</p>

5
app/utils/time.py
View File

@@ -22,3 +22,8 @@ def is_less_than_days_ago(date_from_db, number_of_days):
def parse_naive_dt(dt): def parse_naive_dt(dt):
return parser.parse(dt, ignoretz=True) return parser.parse(dt, ignoretz=True)
def parse_dt(dt):
# Parse datetime without ignoring the timezone
return parser.parse(dt)