-
${unit.id}
${deployedBadge}
${expiryWarning}
@@ -1707,6 +1771,108 @@ function closeUnitDetailModal() {
document.getElementById('unit-detail-iframe').src = '';
}
+async function openUnitQuickModal(unitId) {
+ document.getElementById('unit-quick-modal').classList.remove('hidden');
+ // Reset while loading
+ document.getElementById('uqm-title').textContent = unitId;
+ document.getElementById('uqm-deployed-badge').innerHTML = '';
+ document.getElementById('uqm-outforcal-badge').innerHTML = '';
+ document.getElementById('uqm-cal-date').textContent = '…';
+ document.getElementById('uqm-cal-due').textContent = '…';
+ ['uqm-address-row','uqm-project-row','uqm-modem-row','uqm-lastseen-row','uqm-note-row','uqm-reservations-row']
+ .forEach(id => document.getElementById(id).classList.add('hidden'));
+
+ try {
+ const resp = await fetch(`/api/fleet-calendar/unit-quick-info/${unitId}`);
+ if (!resp.ok) throw new Error('Not found');
+ const u = await resp.json();
+ const today = new Date(); today.setHours(0,0,0,0);
+
+ // Deployed badge
+ document.getElementById('uqm-deployed-badge').innerHTML = u.deployed
+ ? '
Deployed '
+ : '
Benched ';
+
+ // Out for cal badge
+ if (u.out_for_calibration) {
+ document.getElementById('uqm-outforcal-badge').innerHTML =
+ '
Out for Cal ';
+ }
+
+ // Cal date
+ const calDateEl = document.getElementById('uqm-cal-date');
+ calDateEl.textContent = u.last_calibrated
+ ? new Date(u.last_calibrated + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'})
+ : 'No record';
+ calDateEl.className = `text-sm font-medium ${!u.last_calibrated ? 'text-red-500 dark:text-red-400' : 'text-gray-900 dark:text-white'}`;
+
+ // Cal due
+ const calDueEl = document.getElementById('uqm-cal-due');
+ if (u.next_calibration_due) {
+ const due = new Date(u.next_calibration_due + 'T00:00:00');
+ const expired = due < today;
+ calDueEl.textContent = due.toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'}) + (expired ? ' (expired)' : '');
+ calDueEl.className = `text-sm font-medium ${expired ? 'text-red-500 dark:text-red-400' : 'text-green-600 dark:text-green-400'}`;
+ } else {
+ calDueEl.textContent = '—';
+ calDueEl.className = 'text-sm font-medium text-red-500 dark:text-red-400';
+ }
+
+ // Address
+ if (u.address) {
+ document.getElementById('uqm-address-row').classList.remove('hidden');
+ document.getElementById('uqm-address').textContent = u.address;
+ }
+
+ // Project
+ if (u.project_id) {
+ document.getElementById('uqm-project-row').classList.remove('hidden');
+ document.getElementById('uqm-project').textContent = u.project_id;
+ }
+
+ // Modem
+ if (u.deployed_with_modem_id) {
+ document.getElementById('uqm-modem-row').classList.remove('hidden');
+ document.getElementById('uqm-modem').textContent = u.deployed_with_modem_id;
+ }
+
+ // Last seen
+ if (u.last_seen) {
+ document.getElementById('uqm-lastseen-row').classList.remove('hidden');
+ document.getElementById('uqm-lastseen').textContent =
+ new Date(u.last_seen).toLocaleString('en-US', {month:'short', day:'numeric', year:'numeric', hour:'numeric', minute:'2-digit'});
+ }
+
+ // Note
+ if (u.note) {
+ document.getElementById('uqm-note-row').classList.remove('hidden');
+ document.getElementById('uqm-note').textContent = u.note;
+ }
+
+ // Reservations
+ if (u.reservations && u.reservations.length > 0) {
+ document.getElementById('uqm-reservations-row').classList.remove('hidden');
+ document.getElementById('uqm-reservations').innerHTML = u.reservations.map(r => {
+ const s = r.start_date ? new Date(r.start_date + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric'}) : '';
+ const e = r.end_date_tbd ? 'TBD' : (r.end_date ? new Date(r.end_date + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric'}) : 'TBD');
+ const loc = r.location_name ? ` · ${r.location_name}` : '';
+ return `
+ ${r.name}
+ ${s}–${e}${loc}
+
`;
+ }).join('');
+ }
+
+ } catch(e) {
+ document.getElementById('uqm-cal-date').textContent = 'Error loading';
+ }
+}
+
+function closeUnitQuickModal() {
+ document.getElementById('unit-quick-modal').classList.add('hidden');
+}
+
function plannerAddSlot() {
plannerState.slots.push({ unit_id: null, power_type: null, notes: null, location_name: null });
plannerRenderSlots();
@@ -1716,7 +1882,7 @@ function plannerAddSlot() {
// Fleet Summary (right panel on jobs list)
// ============================================================
let summaryAllUnits = [];
-let summaryActiveFilter = null; // null | 'deployed' | 'benched' | 'cal_expired'
+let summaryActiveFilters = new Set(); // multi-select: 'deployed' | 'benched' | 'cal_expired' | 'cal_good' | 'out_for_cal' | 'reserved'
async function loadFleetSummary() {
const plannerDeviceType = document.querySelector('input[name="planner_device_type"]:checked')?.value || 'seismograph';
@@ -1724,7 +1890,7 @@ async function loadFleetSummary() {
const resp = await fetch(`/api/fleet-calendar/planner-availability?device_type=${plannerDeviceType}`);
const data = await resp.json();
summaryAllUnits = data.units || [];
- summaryActiveFilter = null;
+ summaryActiveFilters = new Set();
renderFleetSummary();
} catch(e) { console.error('Fleet summary load error', e); }
}
@@ -1733,88 +1899,158 @@ function summaryFilterUnits() {
renderFleetSummary();
}
+// Stat cards: set exactly this one filter (or clear all if already the only active one)
function summarySetFilter(f) {
- summaryActiveFilter = summaryActiveFilter === f ? null : f;
+ if (f === null) {
+ summaryActiveFilters = new Set();
+ } else if (summaryActiveFilters.size === 1 && summaryActiveFilters.has(f)) {
+ summaryActiveFilters = new Set();
+ } else {
+ summaryActiveFilters = new Set([f]);
+ }
+ renderFleetSummary();
+}
+
+// Pills: toggle independently (multi-select)
+function summaryToggleFilter(f) {
+ if (summaryActiveFilters.has(f)) summaryActiveFilters.delete(f);
+ else summaryActiveFilters.add(f);
renderFleetSummary();
}
function renderFleetSummary() {
const search = document.getElementById('summary-search')?.value.toLowerCase() || '';
+ const today = new Date(); today.setHours(0,0,0,0);
- // Stats (always against full list)
- const total = summaryAllUnits.length;
- const deployed = summaryAllUnits.filter(u => u.deployed).length;
- const benched = summaryAllUnits.filter(u => !u.deployed).length;
- const calExpired = summaryAllUnits.filter(u => u.expiry_date && new Date(u.expiry_date + 'T00:00:00') < new Date()).length;
+ // Computed flags for each unit
+ const withFlags = summaryAllUnits.map(u => {
+ const expiry = u.expiry_date ? new Date(u.expiry_date + 'T00:00:00') : null;
+ return {
+ ...u,
+ _calExpired: !u.last_calibrated || (expiry && expiry < today),
+ _calGood: u.last_calibrated && expiry && expiry >= today,
+ _outForCal: !!u.out_for_calibration,
+ _allocated: !!u.allocated,
+ _reserved: (u.reservations || []).length > 0,
+ };
+ });
+
+ // Counts always against full list
+ const counts = {
+ total: withFlags.length,
+ deployed: withFlags.filter(u => u.deployed).length,
+ benched: withFlags.filter(u => !u.deployed).length,
+ cal_expired: withFlags.filter(u => u._calExpired).length,
+ cal_good: withFlags.filter(u => u._calGood).length,
+ out_for_cal: withFlags.filter(u => u._outForCal).length,
+ allocated: withFlags.filter(u => u._allocated).length,
+ reserved: withFlags.filter(u => u._reserved).length,
+ };
+
+ const af = summaryActiveFilters;
+
+ // Stat cards — single-shortcut behavior, highlighted when they're the sole active filter
+ const cardActive = (f) => af.size === 1 && af.has(f);
+ const card = (f, label, count, colorClass, ringColor) => {
+ const isActive = f === null ? af.size === 0 : cardActive(f);
+ return `
+ ${count}
+ ${label}
+ `;
+ };
- const cardBase = 'rounded-lg p-3 text-left w-full cursor-pointer transition-all ring-2';
- const active = summaryActiveFilter;
document.getElementById('fleet-summary-stats').innerHTML = `
-
- ${total}
- Total
-
-
- ${deployed}
- Deployed
-
-
- ${benched}
- Benched
-
-
- ${calExpired}
- Cal Expired
-
- `;
+
+ ${card(null, 'Total', counts.total, 'bg-gray-50 dark:bg-slate-700 text-gray-900 dark:text-white hover:bg-gray-100 dark:hover:bg-slate-600', 'ring-gray-400 dark:ring-gray-300')}
+ ${card('deployed', 'Deployed', counts.deployed, 'bg-green-50 dark:bg-green-900/20 text-green-700 dark:text-green-400 hover:bg-green-100 dark:hover:bg-green-900/40', 'ring-green-500')}
+ ${card('benched', 'Benched', counts.benched, 'bg-blue-50 dark:bg-blue-900/20 text-blue-700 dark:text-blue-400 hover:bg-blue-100 dark:hover:bg-blue-900/40', 'ring-blue-500')}
+ ${card('cal_good', 'Cal Good', counts.cal_good, 'bg-teal-50 dark:bg-teal-900/20 text-teal-700 dark:text-teal-400 hover:bg-teal-100 dark:hover:bg-teal-900/40', 'ring-teal-500')}
+
+
+ ${summaryPill('cal_expired', 'Cal Expired', counts.cal_expired, af)}
+ ${summaryPill('out_for_cal', 'Out for Cal', counts.out_for_cal, af)}
+ ${summaryPill('allocated', 'Allocated', counts.allocated, af)}
+ ${summaryPill('reserved', 'Reserved', counts.reserved, af)}
+
`;
- // Apply filter + search to the list
- let units = summaryAllUnits;
- if (active === 'deployed') units = units.filter(u => u.deployed);
- else if (active === 'benched') units = units.filter(u => !u.deployed);
- else if (active === 'cal_expired') units = units.filter(u => u.expiry_date && new Date(u.expiry_date + 'T00:00:00') < new Date());
+ // Apply all active filters (AND logic) + search
+ const filterFns = {
+ deployed: u => u.deployed,
+ benched: u => !u.deployed,
+ cal_expired: u => u._calExpired,
+ cal_good: u => u._calGood,
+ out_for_cal: u => u._outForCal,
+ allocated: u => u._allocated,
+ reserved: u => u._reserved,
+ };
+ let units = af.size === 0 ? withFlags : withFlags.filter(u => [...af].some(f => filterFns[f](u)));
if (search) units = units.filter(u => u.id.toLowerCase().includes(search));
- // Unit list
const list = document.getElementById('fleet-summary-list');
if (units.length === 0) {
- list.innerHTML = '
No units found
';
+ list.innerHTML = '
No units match
';
return;
}
list.innerHTML = units.map(u => {
const calDate = u.last_calibrated
? new Date(u.last_calibrated + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'})
- : 'No cal date';
- const expired = u.expiry_date && new Date(u.expiry_date + 'T00:00:00') < new Date();
+ : null;
+ const expiryDate = u.expiry_date
+ ? new Date(u.expiry_date + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'})
+ : null;
+
const deployedBadge = u.deployed
? '
Deployed '
: '
Benched ';
- const calBadge = expired
- ? `
Cal expired `
- : `
Cal: ${calDate} `;
+ const outForCalBadge = u._outForCal
+ ? '
Out for Cal '
+ : '';
+ const allocatedBadge = u._allocated
+ ? `
Allocated${u.allocated_to_project_id ? ': ' + u.allocated_to_project_id : ''} `
+ : '';
+ let calBadge;
+ if (!calDate) {
+ calBadge = '
Cal expired ';
+ } else if (u._calExpired) {
+ calBadge = `
Cal expired ${expiryDate} `;
+ } else {
+ calBadge = `
Cal: ${calDate} · exp. ${expiryDate} `;
+ }
+
const resBadges = (u.reservations || []).map(r => {
const s = r.start_date ? new Date(r.start_date + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric'}) : '';
const e = r.end_date ? new Date(r.end_date + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric'}) : 'TBD';
- return `
Reserved: ${r.reservation_name} ${s}–${e}`;
+ return `
${r.reservation_name} ${s}–${e} `;
}).join('');
+
return `
- ${u.id}
- ${deployedBadge}
- ${calBadge}
+ ${deployedBadge}${outForCalBadge}${allocatedBadge}${calBadge}
${resBadges ? `
${resBadges}
` : ''}
`;
}).join('');
}
+function summaryPill(f, label, count, activeSet) {
+ const isActive = activeSet.has(f);
+ const pillColors = {
+ cal_expired: isActive ? 'bg-red-600 text-white border-red-600' : 'bg-transparent border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-400 hover:border-red-500 hover:text-red-600 dark:hover:text-red-400',
+ out_for_cal: isActive ? 'bg-purple-600 text-white border-purple-600' : 'bg-transparent border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-400 hover:border-purple-500 hover:text-purple-600 dark:hover:text-purple-400',
+ allocated: isActive ? 'bg-orange-500 text-white border-orange-500' : 'bg-transparent border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-400 hover:border-orange-500 hover:text-orange-600 dark:hover:text-orange-400',
+ reserved: isActive ? 'bg-indigo-600 text-white border-indigo-600' : 'bg-transparent border-gray-300 dark:border-gray-600 text-gray-600 dark:text-gray-400 hover:border-indigo-500 hover:text-indigo-600 dark:hover:text-indigo-400',
+ };
+ return `
+ ${label} ${count}
+ `;
+}
+
function showRightPanel(panel) {
document.getElementById('right-fleet-summary').classList.toggle('hidden', panel !== 'summary');
document.getElementById('right-available-units').classList.toggle('hidden', panel !== 'available');
@@ -1959,37 +2195,32 @@ function plannerRenderSlots() {
? `
⠿ `
: `
`;
- // Build unit info badges for filled slots
- let unitInfoLine = '';
+ // Build inline cal text for filled slots
+ let calInline = '';
if (slot.unit_id) {
const uData = plannerState.allUnits.find(u => u.id === slot.unit_id);
if (uData) {
- const deployedBadge = uData.deployed
- ? '
Deployed '
- : '
Benched ';
- const outForCalBadge = uData.out_for_calibration
- ? '
Out for Cal '
- : '';
- const calStr = uData.last_calibrated
- ? new Date(uData.last_calibrated + 'T00:00:00').toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'})
- : 'No cal date';
+ const today = new Date(); today.setHours(0,0,0,0);
+ const expiry = uData.expiry_date ? new Date(uData.expiry_date + 'T00:00:00') : null;
+ const calExpired = !uData.last_calibrated || (expiry && expiry < today);
const start = document.getElementById('planner-start').value;
const end = document.getElementById('planner-end').value;
- let expiryBadge = '';
- if (uData.expiry_date) {
- const expiry = new Date(uData.expiry_date + 'T00:00:00');
- const jobStart = start ? new Date(start + 'T00:00:00') : null;
- const jobEnd = end ? new Date(end + 'T00:00:00') : null;
+ const jobStart = start ? new Date(start + 'T00:00:00') : null;
+ const jobEnd = end ? new Date(end + 'T00:00:00') : null;
+ const expiresInJob = expiry && jobStart && jobEnd && expiry >= jobStart && expiry <= jobEnd;
+
+ if (!uData.last_calibrated) {
+ calInline = `
No cal `;
+ } else if (calExpired) {
const expiryStr = expiry.toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'});
- if (jobStart && jobEnd && expiry >= jobStart && expiry <= jobEnd) {
- expiryBadge = `
cal expires ${expiryStr} `;
- } else if (!jobStart || !jobEnd) {
- expiryBadge = `
cal exp. ${expiryStr} `;
- }
+ calInline = `
Cal exp. ${expiryStr} `;
+ } else if (expiresInJob) {
+ const expiryStr = expiry.toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'});
+ calInline = `
Cal exp. ${expiryStr} `;
} else {
- expiryBadge = '
No cal ';
+ const expiryStr = expiry.toLocaleDateString('en-US', {month:'short', day:'numeric', year:'numeric'});
+ calInline = `
Cal exp. ${expiryStr} `;
}
- unitInfoLine = `
${deployedBadge}${outForCalBadge}${expiryBadge}Cal: ${calStr}
`;
}
}
@@ -1998,7 +2229,8 @@ function plannerRenderSlots() {
${dragHandle}
Loc. ${idx + 1}
${slot.unit_id
- ? `
${slot.unit_id}
+ ? `
${slot.unit_id}
+ ${calInline ? `
${calInline} ` : '
'}
${powerSelect}
✕ `
: `
${plannerSelectedSlotIdx === idx ? '← click a unit to assign here' : 'Empty — click to select'}
@@ -2006,7 +2238,6 @@ function plannerRenderSlots() {
✕ `
}
@@ -1352,7 +1353,7 @@
// Toggle health filter visibility (hide for retired/ignored)
const healthGroup = document.getElementById('health-filter-group');
- if (this.dataset.value === 'retired' || this.dataset.value === 'ignored') {
+ if (this.dataset.value === 'retired' || this.dataset.value === 'ignored' || this.dataset.value === 'allocated') {
healthGroup.style.display = 'none';
} else {
healthGroup.style.display = 'flex';
diff --git a/templates/unit_detail.html b/templates/unit_detail.html
index d17345b..d2fbf73 100644
--- a/templates/unit_detail.html
+++ b/templates/unit_detail.html
@@ -562,7 +562,7 @@