Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

# Conflicts:
#	app/main/views/dashboard.py
#	app/templates/views/dashboard/dashboard.html
#	package-lock.json
#	package.json
This commit is contained in:
Jonathan Bobel
2024-07-04 13:07:35 -04:00
22 changed files with 298 additions and 257 deletions

View File

@@ -256,6 +256,12 @@
handleDropdownChange({ target: { value: selectedValue } });
});
module.exports = { createChart, createTable, handleDropdownChange, fetchData };
// Exporting the functions for browser environment
window.myModule = {
createChart: l,
createTable: r,
handleDropdownChange: t,
fetchData: n
};
})(window);

View File

@@ -30,13 +30,13 @@
});
var socket = io();
var serviceId = ctx.getAttribute('data-service-id');
socket.on('connect', function() {
socket.emit('fetch_daily_stats', serviceId);
socket.emit('fetch_daily_stats_by_user');
});
socket.on('daily_stats_update', function(data) {
socket.on('daily_stats_by_user_update', function(data) {
// console.log('Data received:', data);
var labels = [];
var deliveredData = [];
var failedData = [];
@@ -53,13 +53,14 @@
});
socket.on('error', function(data) {
console.log('Error:', data);
// console.log('Error:', data);
});
var sevenDaysButton = document.getElementById('sevenDaysButton');
if (sevenDaysButton) {
sevenDaysButton.addEventListener('click', function() {
socket.emit('fetch_daily_stats', serviceId);
socket.emit('fetch_daily_stats_by_user');
// console.log('clicked');
});
}
}