diff --git a/app/assets/javascripts/chartDashboard.js b/app/assets/javascripts/chartDashboard.js index 98378137a..e73f655f9 100644 --- a/app/assets/javascripts/chartDashboard.js +++ b/app/assets/javascripts/chartDashboard.js @@ -1,30 +1,21 @@ (function (window) { - + // Initialize flask-socketio var socket = io(); var serviceId = chart.getAttribute('data-service-id'); socket.on('connect', function() { - console.log('Connected to the server'); // Debug log, i'll delete later socket.emit('fetch_daily_stats', serviceId); }); - //this is for previous 7 days socket.on('daily_stats_update', function(data) { - console.log('Received daily_stats_update:', data); - var labels = []; var deliveredData = []; - // var failureData = []; - // var requestedData = []; for (var date in data) { labels.push(date); 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.datasets[0].data = deliveredData; myBarChart.update(); @@ -36,7 +27,6 @@ sevenDaysButton.addEventListener('click', function() { socket.emit('fetch_daily_stats', serviceId); - console.log('button click'); // Debug log, i'll delete later }); // Initialize Chart.js bar chart diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py index 7ad899a53..a64444dc2 100644 --- a/app/main/views/dashboard.py +++ b/app/main/views/dashboard.py @@ -46,30 +46,6 @@ def handle_fetch_daily_stats(service_id): 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//dashboard") @user_has_permissions("view_activity", "send_messages") def old_service_dashboard(service_id): diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py index 627bd0ccd..42f54572f 100644 --- a/app/notify_client/service_api_client.py +++ b/app/notify_client/service_api_client.py @@ -53,13 +53,6 @@ class ServiceAPIClient(NotifyAdminAPIClient): "/service/{0}/statistics/{1}/{2}".format(service_id, start_date, days), )["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): """ Retrieve a list of services.