@@ -364,6 +374,17 @@
transform: rotate(-90deg);
}
}
+
+/* Today's Schedule — horizontal collapsible at all breakpoints. */
+#todays-actions-content.collapsed {
+ display: none;
+}
+#todays-actions-chevron.collapsed {
+ transform: rotate(-90deg);
+}
+#todays-actions-chevron {
+ transition: transform 0.2s ease-in-out;
+}
@@ -654,7 +675,8 @@ function toggleCard(cardName) {
// Restore card states from localStorage on page load
function restoreCardStates() {
const cardStates = JSON.parse(localStorage.getItem('dashboardCardStates') || '{}');
- const cardNames = ['fleet-summary', 'recent-alerts', 'recent-callins', 'todays-actions', 'fleet-map', 'fleet-status'];
+ // Note: todays-actions has its own collapse handling (see toggleTodaysSchedule / onTodaysActionsSwap)
+ const cardNames = ['fleet-summary', 'recent-alerts', 'recent-callins', 'fleet-map', 'fleet-status'];
cardNames.forEach(cardName => {
const content = document.getElementById(`${cardName}-content`);
@@ -839,89 +861,139 @@ async function loadRecentPhotos() {
loadRecentPhotos();
setInterval(loadRecentPhotos, 30000);
-// Load and display recent call-ins
-let showingAllCallins = false;
-const DEFAULT_CALLINS_DISPLAY = 5;
-
+// Load and display recent call-ins.
+// Source: SFM events (forwarded by series3-watcher from Blastware ACH).
+// Each event = one call-home. Heartbeat-derived endpoint /api/recent-callins
+// is being phased out but kept as a backup.
async function loadRecentCallins() {
+ const callinsList = document.getElementById('recent-callins-list');
try {
- const response = await fetch('/api/recent-callins?hours=6');
+ const response = await fetch('/api/recent-event-callins?limit=10');
if (!response.ok) {
throw new Error('Failed to load recent call-ins');
}
const data = await response.json();
- const callinsList = document.getElementById('recent-callins-list');
- const showAllButton = document.getElementById('show-all-callins');
- if (data.call_ins && data.call_ins.length > 0) {
- // Determine how many to show
- const displayCount = showingAllCallins ? data.call_ins.length : Math.min(DEFAULT_CALLINS_DISPLAY, data.call_ins.length);
- const callinsToDisplay = data.call_ins.slice(0, displayCount);
-
- // Build HTML for call-ins list
- let html = '';
- callinsToDisplay.forEach(callin => {
- // Status color
- const statusColor = callin.status === 'OK' ? 'green' : callin.status === 'Pending' ? 'yellow' : 'red';
- const statusClass = callin.status === 'OK' ? 'bg-green-500' : callin.status === 'Pending' ? 'bg-yellow-500' : 'bg-red-500';
-
- // Build location/note line
- let subtitle = '';
- if (callin.location) {
- subtitle = callin.location;
- } else if (callin.note) {
- subtitle = callin.note;
- }
-
- html += `
-
`;
- });
-
- callinsList.innerHTML = html;
-
- // Show/hide the "Show all" button
- if (data.call_ins.length > DEFAULT_CALLINS_DISPLAY) {
- showAllButton.classList.remove('hidden');
- showAllButton.textContent = showingAllCallins
- ? `Show fewer (${DEFAULT_CALLINS_DISPLAY})`
- : `Show all (${data.call_ins.length})`;
- } else {
- showAllButton.classList.add('hidden');
- }
- } else {
- callinsList.innerHTML = '
No units have called in within the past 6 hours
';
- showAllButton.classList.add('hidden');
+ if (!data.call_ins || data.call_ins.length === 0) {
+ callinsList.innerHTML = '
No recent event call-ins from SFM
';
+ return;
}
+
+ // Two-column dense grid on lg+, single column below.
+ let html = '
';
+ data.call_ins.forEach(c => {
+ const isFalse = c.false_trigger;
+ const pvs = c.peak_vector_sum;
+ const pvsStr = (pvs !== null && pvs !== undefined)
+ ? Number(pvs).toFixed(3) + ' in/s'
+ : '—';
+
+ // Subtitle: prefer sensor_location, fallback to project.
+ const subtitle = c.sensor_location || c.project || '';
+
+ // Status dot: amber for false trigger, green for real event,
+ // gray if unit not in roster.
+ const dotClass = !c.in_roster
+ ? 'bg-gray-400'
+ : (isFalse ? 'bg-amber-400' : 'bg-green-500');
+
+ // Format event timestamp short (e.g. "05-13 05:00").
+ let tsShort = '';
+ if (c.event_timestamp) {
+ const ts = c.event_timestamp.replace('T', ' ');
+ // "2026-05-13 05:00:13" → "05-13 05:00"
+ tsShort = ts.length >= 16 ? ts.slice(5, 16) : ts;
+ }
+
+ const unitLink = c.in_roster
+ ? `
${c.unit_id}`
+ : `
${c.unit_id}`;
+
+ html += `
+
+
+
+
+
+ ${unitLink}
+ ${isFalse ? 'false' : ''}
+ ${pvsStr}
+
+ ${subtitle ? `
${subtitle}
` : ''}
+
+
+
+ ${c.time_ago}
+ ${tsShort ? `${tsShort}` : ''}
+
+
`;
+ });
+ html += '
';
+ callinsList.innerHTML = html;
} catch (error) {
console.error('Error loading recent call-ins:', error);
- document.getElementById('recent-callins-list').innerHTML = '
Failed to load recent call-ins
';
+ callinsList.innerHTML = '
Failed to load recent call-ins
';
}
}
-// Toggle show all/show fewer
-document.addEventListener('DOMContentLoaded', function() {
- const showAllButton = document.getElementById('show-all-callins');
- showAllButton.addEventListener('click', function() {
- showingAllCallins = !showingAllCallins;
- loadRecentCallins();
- });
-});
-
-// Load recent call-ins on page load and refresh every 30 seconds
+// Load recent call-ins on page load and refresh every 30 seconds.
loadRecentCallins();
setInterval(loadRecentCallins, 30000);
+
+// ===== Today's Schedule horizontal card =====
+function toggleTodaysSchedule() {
+ const content = document.getElementById('todays-actions-content');
+ const chevron = document.getElementById('todays-actions-chevron');
+ if (!content || !chevron) return;
+ const isCollapsed = content.classList.toggle('collapsed');
+ chevron.classList.toggle('collapsed', isCollapsed);
+ // Remember the user's explicit choice so we don't fight them on the next
+ // 30s htmx refresh.
+ localStorage.setItem('todaysScheduleUserToggled', '1');
+ localStorage.setItem('todaysScheduleCollapsed', isCollapsed ? '1' : '0');
+}
+
+function onTodaysActionsSwap(el) {
+ // Read pending/total counts from the rendered partial to drive
+ // auto-expand + the header badge.
+ const badge = document.getElementById('todays-actions-badge');
+ const content = document.getElementById('todays-actions-content');
+ const chevron = document.getElementById('todays-actions-chevron');
+ if (!content || !chevron) return;
+
+ // Count yellow status indicators in the rendered partial as a proxy for
+ // "pending action present today".
+ const pendingDots = el.querySelectorAll('.bg-yellow-400').length;
+ const pendingTimes = el.querySelectorAll('.text-yellow-600').length;
+ const hasPending = pendingDots > 0 || pendingTimes > 0;
+
+ if (badge) {
+ if (hasPending) {
+ const n = Math.max(pendingDots, pendingTimes);
+ badge.textContent = `${n} pending today`;
+ badge.classList.remove('hidden');
+ } else {
+ badge.classList.add('hidden');
+ }
+ }
+
+ // Auto-expand only if the user hasn't manually toggled this session AND
+ // there's something pending. Once the user collapses/expands manually,
+ // their preference sticks.
+ const userToggled = localStorage.getItem('todaysScheduleUserToggled') === '1';
+ if (!userToggled && hasPending) {
+ content.classList.remove('collapsed');
+ chevron.classList.remove('collapsed');
+ } else if (!userToggled && !hasPending) {
+ content.classList.add('collapsed');
+ chevron.classList.add('collapsed');
+ } else if (userToggled) {
+ const stored = localStorage.getItem('todaysScheduleCollapsed') === '1';
+ content.classList.toggle('collapsed', stored);
+ chevron.classList.toggle('collapsed', stored);
+ }
+}
{% endblock %}