';
}
// No events message
if ((!data.current || data.current.length === 0) && (!data.upcoming || data.upcoming.length === 0)) {
- html += '
✅ No scheduled events for the next 48 hours
';
+ html += '
✅ No scheduled events for the next 72 hours
';
}
container.innerHTML = html;
@@ -399,6 +430,17 @@
return div.innerHTML;
}
+ // Map Bootstrap color classes to hex colors
+ function getColorFromType(typecolor) {
+ const colorMap = {
+ 'success': '#0ad64f', // Green (GE Avionics Green) - Awareness, TBD
+ 'warning': '#ffc107', // Yellow - Change
+ 'danger': '#dc3545', // Red - Incident
+ 'secondary': '#6c757d' // Gray - fallback
+ };
+ return colorMap[typecolor] || colorMap['secondary'];
+ }
+
// Fetch notifications from API
async function fetchNotifications() {
try {
@@ -428,7 +470,7 @@
container.innerHTML = `
⚠️ Unable to load events
- Retrying...
+ Retrying...
`;
}
diff --git a/server.js b/server.js
index faf52bb..7b29936 100644
--- a/server.js
+++ b/server.js
@@ -27,17 +27,20 @@ app.use(express.static('public'));
app.get('/api/notifications', async (req, res) => {
try {
const now = new Date();
- const future = new Date(now.getTime() + (48 * 60 * 60 * 1000)); // 48 hours from now
+ const future = new Date(now.getTime() + (72 * 60 * 60 * 1000)); // 72 hours from now
const [rows] = await promisePool.query(
- `SELECT notificationid, notification, starttime, endtime, ticketnumber, link, isactive
- FROM notifications
- WHERE isactive = 1
+ `SELECT n.notificationid, n.notification, n.starttime, n.endtime, n.ticketnumber, n.link,
+ n.isactive, n.isshopfloor, nt.typename, nt.typecolor
+ FROM notifications n
+ LEFT JOIN notificationtypes nt ON n.notificationtypeid = nt.notificationtypeid
+ WHERE n.isactive = 1
+ AND n.isshopfloor = 1
AND (
- (starttime <= ? AND (endtime IS NULL OR endtime >= ?))
- OR (starttime BETWEEN ? AND ?)
+ (n.starttime <= ? AND (n.endtime IS NULL OR n.endtime >= ?))
+ OR (n.starttime BETWEEN ? AND ?)
)
- ORDER BY starttime ASC`,
+ ORDER BY n.starttime ASC`,
[future, now, now, future]
);