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

# Conflicts:
#	package-lock.json
#	package.json
This commit is contained in:
Jonathan Bobel
2024-07-23 11:39:49 -04:00
40 changed files with 2039 additions and 1438 deletions

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"], []),