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

moved table to parent dashboard

Browse Source
This commit is contained in:
Beverly Nguyen
2024-01-04 13:43:47 -08:00
parent aac23a754f
commit 3ad5fb1d7c
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main/views/dashboard.py
+1 -4
View File
@@ -13,8 +13,6 @@ from app import (
current_service, current_service,
service_api_client, service_api_client,
template_statistics_client, template_statistics_client,
format_datetime_short,
notification_api_client,
) )
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
@@ -30,7 +28,6 @@ from app.utils.pagination import generate_next_dict, generate_previous_dict
from app.utils.time import get_current_financial_year from app.utils.time import get_current_financial_year
from app.utils.user import user_has_permissions from app.utils.user import user_has_permissions
from app.main.views.jobs import get_notifications from app.main.views.jobs import get_notifications
from pprint import pprint
@main.route("/services/<uuid:service_id>/dashboard") @main.route("/services/<uuid:service_id>/dashboard")
@@ -50,7 +47,7 @@ def service_dashboard(service_id):
if not current_user.has_permissions("view_activity"): if not current_user.has_permissions("view_activity"):
return redirect(url_for("main.choose_template", service_id=service_id)) return redirect(url_for("main.choose_template", service_id=service_id))
notifications=get_notifications(service_id, message_type=None)['batched_data'] notifications=get_notifications(service_id, message_type=None)['notifications_data']
for notification in notifications: for notification in notifications:
message_type = notification.get('template_type') message_type = notification.get('template_type')
app/main/views/jobs.py
+1 -1
View File
@@ -235,7 +235,7 @@ def get_notifications(service_id, message_type, status_override=None): # noqa
return { return {
"service_data_retention_days": service_data_retention_days, "service_data_retention_days": service_data_retention_days,
'batched_data': notifications['notifications'], 'notifications_data': notifications['notifications'],
"counts": render_template( "counts": render_template(
"views/activity/counts.html", "views/activity/counts.html",
status=request.args.get("status"), status=request.args.get("status"),