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

Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

Browse Source 
# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Jonathan Bobel
2024-07-23 11:39:49 -04:00
parent 5cf05bd4b6 d968fcd4e5
commit 4af04ff183
40 changed files with 2039 additions and 1438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/dashboard.py
View File

@@ -116,6 +116,8 @@ def service_dashboard(service_id):
".view_job", service_id=current_service.id, job_id=job["id"]
),
"created_at": job["created_at"],
"processing_finished": job["processing_finished"],
"processing_started": job["processing_started"],
"notification_count": job["notification_count"],
"created_by": job["created_by"],
"notifications": aggregate_notifications_by_job.get(job["id"], []),

9
app/main/views/send.py
View File

@@ -1053,8 +1053,13 @@ def get_email_reply_to_address_from_session():
def get_sms_sender_from_session():
if session.get("sender_id"):
return current_service.get_sms_sender(session["sender_id"])["sms_sender"]
sender_id = session.get("sender_id")
if sender_id:
sms_sender = current_service.get_sms_sender(session["sender_id"])["sms_sender"]
current_app.logger.info(f"SMS Sender ({sender_id}) #: {sms_sender}")
return sms_sender
else:
current_app.logger.error("No SMS Sender!!!!!!")
def get_spreadsheet_column_headings_from_template(template):