darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-02-05 10:53:28 -05:00
Code Issues Packages Projects Releases Wiki Activity

cleared up style checks

Browse Source
This commit is contained in:
Beverly Nguyen
2024-06-03 13:35:30 -07:00
parent d12b798bba
commit 89f19bb63d
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,11 @@ from notifications_utils.recipients import format_phone_number_human_readable
def handle_fetch_daily_stats(service_id): def handle_fetch_daily_stats(service_id):
if service_id: if service_id:
date_range = get_stats_date_range() date_range = get_stats_date_range()
daily_stats = service_api_client.get_service_notification_statistics_by_day(service_id, start_date=date_range['start_date'], days=date_range['days']) daily_stats = service_api_client.get_service_notification_statistics_by_day(
service_id,
start_date=date_range['start_date'],
days=date_range['days']
)
emit('daily_stats_update', daily_stats) emit('daily_stats_update', daily_stats)
else: else:
emit('error', {'error': 'No service_id provided'}) emit('error', {'error': 'No service_id provided'})
@@ -47,7 +51,11 @@ def handle_fetch_daily_stats(service_id):
@socketio.on('fetch_single_month_notification_stats') @socketio.on('fetch_single_month_notification_stats')
def handle_fetch_single_month_notification_stats(service_id): def handle_fetch_single_month_notification_stats(service_id):
date_range = get_stats_date_range() date_range = get_stats_date_range()
single_month_notification_stats = service_api_client.get_single_month_notification_stats(service_id, year=date_range['current_financial_year'], month=date_range['current_month']) single_month_notification_stats = service_api_client.get_single_month_notification_stats(
service_id,
year=date_range['current_financial_year'],
month=date_range['current_month']
)
emit('single_month_notification_stats_update', single_month_notification_stats) emit('single_month_notification_stats_update', single_month_notification_stats)
@@ -55,7 +63,9 @@ def handle_fetch_single_month_notification_stats(service_id):
def handle_fetch_monthly_stats(service_id): def handle_fetch_monthly_stats(service_id):
date_range = get_stats_date_range() date_range = get_stats_date_range()
monthly_stats_by_year_stats = format_monthly_stats_to_list( monthly_stats_by_year_stats = format_monthly_stats_to_list(
service_api_client.get_monthly_notification_stats(service_id, year=date_range['current_financial_year'])["data"] service_api_client.get_monthly_notification_stats(
service_id,
year=date_range['current_financial_year'])["data"]
) )
emit('monthly_stats_by_year_update', monthly_stats_by_year_stats) emit('monthly_stats_by_year_update', monthly_stats_by_year_stats)
@@ -471,6 +481,7 @@ def get_current_month_for_financial_year(year):
current_month = datetime.now().month current_month = datetime.now().month
return current_month return current_month
def get_stats_date_range(): def get_stats_date_range():
current_financial_year = get_current_financial_year() current_financial_year = get_current_financial_year()
current_month = get_current_month_for_financial_year(current_financial_year) current_month = get_current_month_for_financial_year(current_financial_year)
@@ -483,6 +494,7 @@ def get_stats_date_range():
"days": days, "days": days,
} }
def get_months_for_year(start, end, year): def get_months_for_year(start, end, year):
return [datetime(year, month, 1) for month in range(start, end)] return [datetime(year, month, 1) for month in range(start, end)]

5
app/notify_client/service_api_client.py
View File

@@ -56,11 +56,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
"/service/{0}/notifications/month?year={1}&month={2}".format(service_id, year, month), "/service/{0}/notifications/month?year={1}&month={2}".format(service_id, year, month),
) )
# def get_single_month_notification_stats(self, service_id, user_id, year, month):
# return self.get(
# "/service/{0}/notifications/<uuid:user_id>/month?year={1}&month={2}".format(service_id, user_id, year, month),
# )
def get_services(self, params_dict=None): def get_services(self, params_dict=None):
""" """
Retrieve a list of services. Retrieve a list of services.