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

cleaned up code

Browse Source
This commit is contained in:
Beverly Nguyen
2024-06-04 16:52:32 -07:00
parent 0a4cf290ac
commit fed2aff43c
3 changed files with 1 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/chartDashboard.js
View File

@@ -1,30 +1,21 @@
(function (window) { (function (window) {
// Initialize flask-socketio
var socket = io(); var socket = io();
var serviceId = chart.getAttribute('data-service-id'); var serviceId = chart.getAttribute('data-service-id');
socket.on('connect', function() { socket.on('connect', function() {
console.log('Connected to the server'); // Debug log, i'll delete later
socket.emit('fetch_daily_stats', serviceId); socket.emit('fetch_daily_stats', serviceId);
}); });
//this is for previous 7 days
socket.on('daily_stats_update', function(data) { socket.on('daily_stats_update', function(data) {
console.log('Received daily_stats_update:', data);
var labels = []; var labels = [];
var deliveredData = []; var deliveredData = [];
// var failureData = [];
// var requestedData = [];
for (var date in data) { for (var date in data) {
labels.push(date); labels.push(date);
deliveredData.push(data[date].sms.delivered); deliveredData.push(data[date].sms.delivered);
// failureData.push(data[date].sms.failure);
// requestedData.push(data[date].sms.requested);
} }
// Update Chart.js
myBarChart.data.labels = labels; myBarChart.data.labels = labels;
myBarChart.data.datasets[0].data = deliveredData; myBarChart.data.datasets[0].data = deliveredData;
myBarChart.update(); myBarChart.update();
@@ -36,7 +27,6 @@
sevenDaysButton.addEventListener('click', function() { sevenDaysButton.addEventListener('click', function() {
socket.emit('fetch_daily_stats', serviceId); socket.emit('fetch_daily_stats', serviceId);
console.log('button click'); // Debug log, i'll delete later
}); });
// Initialize Chart.js bar chart // Initialize Chart.js bar chart

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

@@ -46,30 +46,6 @@ def handle_fetch_daily_stats(service_id):
emit("error", {"error": "No service_id provided"}) emit("error", {"error": "No service_id provided"})
@socketio.on("fetch_single_month_notification_stats")
def handle_fetch_single_month_notification_stats(service_id):
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"],
)
)
emit("single_month_notification_stats_update", single_month_notification_stats)
@socketio.on("fetch_monthly_stats_by_year")
def handle_fetch_monthly_stats(service_id):
date_range = get_stats_date_range()
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"]
)
emit("monthly_stats_by_year_update", monthly_stats_by_year_stats)
@main.route("/services/<uuid:service_id>/dashboard") @main.route("/services/<uuid:service_id>/dashboard")
@user_has_permissions("view_activity", "send_messages") @user_has_permissions("view_activity", "send_messages")
def old_service_dashboard(service_id): def old_service_dashboard(service_id):

7
app/notify_client/service_api_client.py
View File

@@ -53,13 +53,6 @@ class ServiceAPIClient(NotifyAdminAPIClient):
"/service/{0}/statistics/{1}/{2}".format(service_id, start_date, days), "/service/{0}/statistics/{1}/{2}".format(service_id, start_date, days),
)["data"] )["data"]
def get_single_month_notification_stats(self, service_id, year, month):
return self.get(
"/service/{0}/notifications/month?year={1}&month={2}".format(
service_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.