connecting api data to socket and setting up chartjs to use the data

app/assets/javascripts/chartDashboard.js

@@ -1,24 +1,78 @@
 (function (window) {
 
-    const ctx = document.getElementById('myChart');
+    var socket = io();
+    var serviceId = chart.getAttribute('data-service-id');
 
-    new Chart(ctx, {
+    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_single_month_notification_stats', serviceId);
+        socket.emit('fetch_monthly_stats_by_year', serviceId);
+    });
+
+    //this is for previous 7 days
+    socket.on('daily_stats_update', function(data) {
+        console.log('Received daily_stats_update:', data);
+        // Process the 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();
+    });
+    //this is for a single month
+    socket.on('single_month_notification_stats_update', function(data) {
+        console.log('Received single_month_notification_stats_update:', data);
+        // Update Chart.js with new data here
+    });
+    //this is for monthly stats by year
+    socket.on('monthly_stats_by_year_update', function(data) {
+        console.log('Received monthly_stats_by_year_update:', data);
+        // Update Chart.js with new data here
+    });
+
+    socket.on('error', function(data) {
+        console.log('Error:', data);
+    });
+
+    sevenDaysButton.addEventListener('click', function() {
+        socket.emit('fetch_monthly_stats_by_year', serviceId);
+        console.log('button click');  // Debug log, i'll delete later
+    });
+
+    // Initialize Chart.js bar chart
+    var ctx = document.getElementById('myChart').getContext('2d');
+    var myBarChart = new Chart(ctx, {
         type: 'bar',
         data: {
-        labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+            labels: [], // Initialize with empty data
-        datasets: [{
+            datasets: [
-            label: '# of Votes',
+                {
-            data: [12, 19, 3, 5, 2, 3],
+                    label: 'Delivered',
-            borderWidth: 1
+                    data: [],
-        }]
+                    backgroundColor: '#0076d6',
+                    stack: 'Stack 0'
+                },
+            ]
         },
         options: {
-        scales: {
+            scales: {
-            y: {
+                y: {
-            beginAtZero: true
+                    beginAtZero: true
+                }
             }
         }
-        }
     });
 
 })(window);

app/main/views/dashboard.py

@@ -20,7 +20,6 @@ from app import (
 )
 from app.formatters import format_date_numeric, format_datetime_numeric, get_time_left
 from app.main import main
-from app.models.user import User
 from app.statistics_utils import get_formatted_percentage
 from app.utils import (
     DELIVERED_STATUSES,
@@ -36,20 +35,30 @@ from app.utils.user import user_has_permissions
 from notifications_utils.recipients import format_phone_number_human_readable
 
 
-# @socketio.on('connect')
+@socketio.on('fetch_daily_stats')
-# def handle_connect():
+def handle_fetch_daily_stats(service_id):
-#     print('Client connected')
+    if service_id:
+        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'])
+        emit('daily_stats_update', daily_stats)
+    else:
+        emit('error', {'error': 'No service_id provided'})
 
 
-# @socketio.on('disconnect')
+@socketio.on('fetch_single_month_notification_stats')
-# def handle_disconnect():
+def handle_fetch_single_month_notification_stats(service_id):
-#     print('Client disconnected')
+    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_jobs')
+@socketio.on('fetch_monthly_stats_by_year')
-def handle_fetch_jobs(service_id):
+def handle_fetch_monthly_stats(service_id):
-    job_response = job_api_client.get_jobs(service_id)["data"]
+    date_range = get_stats_date_range()
-    emit('job_update', job_response)
+    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")
@@ -103,6 +112,7 @@ def service_dashboard(service_id):
         partials=get_dashboard_partials(service_id),
         job_and_notifications=job_and_notifications,
         service_data_retention_days=service_data_retention_days,
+        service_id=service_id
     )
 
 
@@ -343,10 +353,6 @@ def aggregate_notifications_stats(template_statistics):
 
 def get_dashboard_partials(service_id):
     current_financial_year = get_current_financial_year()
-    current_month = get_current_month_for_financial_year(current_financial_year)
-    start_date = datetime.now().strftime('%Y-%m-%d')
-    days=7
-
     all_statistics = template_statistics_client.get_template_statistics_for_service(
         service_id, limit_days=7
     )
@@ -368,21 +374,10 @@ def get_dashboard_partials(service_id):
         service_id,
         current_financial_year,
     )
-
-    #Previous 7 day stats
-    daily_stats = service_api_client.get_service_notification_statistics_by_day(service_id, start_date=start_date, days=days)
-
-    #Single month stats
-    single_month_notification_stats = service_api_client.get_single_month_notification_stats(service_id, year=current_financial_year, month=current_month)
-
-    #monthly stats by year
     monthly_stats = format_monthly_stats_to_list(
         service_api_client.get_monthly_notification_stats(service_id, current_financial_year)["data"]
     )
 
-    # user=User.from_id(user_id),
-    # single_month_notification_stats = service_api_client.get_single_month_notification_stats_by_user(service_id, user, year=current_financial_year, month=current_month)
-
     return {
         "upcoming": render_template(
             "views/dashboard/_upcoming.html",
@@ -479,6 +474,17 @@ def get_current_month_for_financial_year(year):
     current_month = datetime.now().month
     return current_month
 
+def get_stats_date_range():
+    current_financial_year = get_current_financial_year()
+    current_month = get_current_month_for_financial_year(current_financial_year)
+    start_date = datetime.now().strftime('%Y-%m-%d')
+    days = 7
+    return {
+        "current_financial_year": current_financial_year,
+        "current_month": current_month,
+        "start_date": start_date,
+        "days": days,
+    }
 
 def get_months_for_year(start, end, year):
     return [datetime(year, month, 1) for month in range(start, end)]

app/templates/views/dashboard/dashboard.html

@@ -23,8 +23,9 @@
     </h2>
 
     <h1>Job Dashboard</h1>
-    <button id="fetchJobsButton">Fetch Jobs</button>
+    <button id="sevenDaysButton">7 Days</button>
-
+    <canvas id="myChart" ></canvas>
+    <div id="chart" data-service-id="{{ service_id }}"></div>
     {{ ajax_block(partials, updates_url, 'inbox') }}
 
     {{ ajax_block(partials, updates_url, 'totals') }}