⋮⋮
Contacts
@@ -1860,7 +2120,7 @@ function setTheme(t) {{
// ── Drag-and-drop card ordering ──────────────────────────────────────────
const CARD_ORDER_KEY = 'cardOrder';
-const DEFAULT_ORDER = ['audio','recon-queue','ptycho','instrument','contacts'];
+const DEFAULT_ORDER = ['audio','recon-queue','ptycho','instrument','blstates','contacts'];
let _dragSrc = null;
function savedOrder() {{
@@ -1932,6 +2192,9 @@ initDrag();
let audioCtx=null, audioEnabled=false;
let audioArmed=false, warningActive=false, warningTimer=null, lastStatus=null;
let staleActive=false, staleTimer=null, staleConfirmed=false;
+let blockedSince=null, blockedWarningActive=false, blockedChimeTimer=null;
+const BLOCKED_WARNING_DELAY_MS=60*60*1000; // first chime after 60 min continuously blocked
+const BLOCKED_CHIME_REPEAT_MS=60*60*1000; // repeat every 60 min while still blocked
function getCtx(){{
if(!audioCtx) audioCtx=new(window.AudioContext||window.webkitAudioContext)();
@@ -1967,6 +2230,12 @@ function staleChime(){{
setTimeout(()=>beep(1200,0.12,0.35),180);
setTimeout(()=>beep(1200,0.25,0.35),360);
}}
+function blockedChime(){{
+ // Distinct from warningChime/staleChime: a slow low->low->high triple knock.
+ beep(330,0.25,0.4);
+ setTimeout(()=>beep(330,0.25,0.4),300);
+ setTimeout(()=>beep(523,0.4, 0.4),600);
+}}
function testSound(){{
// Gesture handler — unlock first, then delay beeps 80ms for resume().
@@ -1986,8 +2255,10 @@ function toggleAudio(){{
document.getElementById('btn-confirm').style.display='none';
stopStaleWarning(); staleActive=false; staleConfirmed=false;
document.getElementById('btn-confirm-stale').style.display='none';
+ stopBlockedChime(); blockedWarningActive=false;
}} else {{
if(lastStatus==='scanning' && !audioArmed) audioArmed=true;
+ if(blockedSince!==null && blockedChimeTimer===null) scheduleBlockedChime();
}}
updateAudioUI();
}}
@@ -2048,9 +2319,45 @@ function handleStale(isStale){{
}}
}}
+function stopBlockedChime(){{
+ if(blockedChimeTimer){{clearTimeout(blockedChimeTimer);blockedChimeTimer=null;}}
+}}
+
+function scheduleBlockedChime(){{
+ // Fires once after BLOCKED_WARNING_DELAY_MS of continuous 'blocked' status,
+ // then repeats every BLOCKED_CHIME_REPEAT_MS for as long as it stays blocked.
+ // No confirm button — purely informational, auto-clears on recovery, since
+ // blocked states are external (beamline) and typically self-resolve.
+ blockedChimeTimer=setTimeout(()=>{{
+ if(audioEnabled) blockedChime();
+ blockedWarningActive=true;
+ updateAudioUI();
+ scheduleBlockedChime();
+ }}, blockedWarningActive ? BLOCKED_CHIME_REPEAT_MS : BLOCKED_WARNING_DELAY_MS);
+}}
+
+function handleBlocked(isBlocked){{
+ if(isBlocked){{
+ if(blockedSince===null){{
+ blockedSince=Date.now();
+ blockedWarningActive=false;
+ stopBlockedChime();
+ if(audioEnabled) scheduleBlockedChime();
+ }}
+ }}else{{
+ if(blockedSince!==null){{
+ blockedSince=null;
+ blockedWarningActive=false;
+ stopBlockedChime();
+ updateAudioUI();
+ }}
+ }}
+}}
+
function updateAudioUI(){{
const ledSys=document.getElementById('led-system'),
ledWatch=document.getElementById('led-watch'),
+ ledBlocked=document.getElementById('led-blocked'),
ledConn=document.getElementById('led-conn'),
btn=document.getElementById('btn-toggle'),
txt=document.getElementById('audio-text');
@@ -2060,6 +2367,7 @@ function updateAudioUI(){{
btn.classList.toggle('active',audioEnabled);
ledConn.className='led'+(staleActive?' led-warning':' led-live');
+ ledBlocked.className='led'+(blockedSince!==null?' led-blocked':'');
const scanRunning=(lastStatus==='scanning');
if(!audioEnabled){{
@@ -2074,6 +2382,11 @@ function updateAudioUI(){{
}}else if(staleActive){{
ledWatch.className='led';
txt.textContent='Live feed lost \u2014 confirm to silence';
+ }}else if(blockedSince!==null){{
+ ledWatch.className='led';
+ txt.textContent=blockedWarningActive
+ ? 'Beamline blocked \u2014 chiming hourly until cleared'
+ : 'Beamline blocked \u2014 will chime after 60 min if unresolved';
}}else if(audioArmed && scanRunning){{
ledWatch.className='led led-armed';
txt.textContent='Armed \u2014 will warn when measurement stops';
@@ -2107,6 +2420,17 @@ function handleAudioForStatus(status, prevStatus){{
}}
}}
+// ── Help dialog ──────────────────────────────────────────────────────────
+function openHelp(){{
+ document.getElementById('help-dialog').showModal();
+}}
+function closeHelp(){{
+ document.getElementById('help-dialog').close();
+}}
+document.getElementById('help-dialog').addEventListener('click', e=>{{
+ if(e.target.id==='help-dialog') closeHelp(); // click on backdrop area
+}});
+
// ── Ptychography images ────────────────────────────────────────────
let _ptychoScanId = null;
@@ -2157,11 +2481,13 @@ function renderPtycho(ptycho){{
}}
// ── Status rendering ──────────────────────────────────────────────────────
-const LABELS={{scanning:'SCANNING',running:'RUNNING',idle:'IDLE',error:'STOPPED',unknown:'UNKNOWN'}};
+const LABELS={{scanning:'SCANNING',running:'RUNNING',idle:'IDLE',blocked:'BLOCKED',error:'STOPPED',unknown:'UNKNOWN'}};
const DETAILS={{
scanning: d=>'Tomo scan in progress · projection '+(d.progress.projection||0)+' of '+(d.progress.total_projections||0)+' · '+(d.progress.tomo_type||''),
running: d=>'Queue active · outside tomo heartbeat window',
idle: d=>'Idle for
'+d.idle_for_human+'',
+ blocked: d=>'Queue locked'+((d.queue_locks&&d.queue_locks.length>1)?' by multiple locks':'')+':
'
+ +(d.queue_locks||[]).map(l=>esc(l.reason||l.identifier)).join('; ')+'',
error: d=>'Queue stopped unexpectedly · idle for
'+(d.idle_for_human||'?')+'',
unknown: d=>'Waiting for first data\u2026',
}};
@@ -2169,6 +2495,12 @@ const DETAILS={{
function setRing(id,circ,pct){{document.getElementById(id).style.strokeDashoffset=circ*(1-Math.min(Math.max(pct,0),1));}}
function fmtAngle(v){{const n=parseFloat(v);return isNaN(n)?'-':n.toFixed(2)+'\u00b0';}}
function fmtTime(iso){{if(!iso)return'-';try{{return new Date(iso).toLocaleTimeString([],{{hour:'2-digit',minute:'2-digit'}});}}catch{{return iso;}}}}
+function fmtScan(n){{
+ if(n==null) return null;
+ const i=parseInt(n,10);
+ if(isNaN(i)) return null;
+ return 'S'+String(i).padStart(5,'0');
+}}
function esc(s){{return String(s==null?'N/A':s).replace(/&/g,'&').replace(//g,'>');}}
function renderInstrument(setup){{
@@ -2192,6 +2524,39 @@ function renderInstrument(setup){{
grid.innerHTML=html;
}}
+function renderBeamlineStates(bl){{
+ const summary=document.getElementById('blstates-summary'),
+ tbody=document.getElementById('blstates-tbody');
+ const states=(bl&&bl.states)||[];
+ const enabledTxt = bl&&bl.enabled===true ? 'enabled' : (bl&&bl.enabled===false ? 'disabled' : 'unknown');
+ const mismatched = states.filter(s=>s.mismatched);
+
+ if(states.length===0){{
+ summary.innerHTML='Scan interlock
'+enabledTxt+' · no beamline states configured';
+ tbody.innerHTML='
No beamline states configured |
';
+ return;
+ }}
+
+ summary.innerHTML = 'Scan interlock
'+enabledTxt+''
+ + (mismatched.length>0
+ ? ' ·
'+mismatched.length+' watched state'+(mismatched.length>1?'s':'')+' currently blocking'
+ : ' · all watched states OK');
+
+ let html='';
+ states.forEach(s=>{{
+ const statusCls='bl-badge bl-'+(s.status||'unknown');
+ const watchedCls='bl-badge '+(s.watched?'bl-watched-yes':'bl-watched-no');
+ const rowCls=s.mismatched?' class="mismatched"':'';
+ html+='
'
+ +''+esc(s.name)+' | '
+ +''+esc(s.status)+' | '
+ +''+(s.watched?'watched':'not watched')+' | '
+ +''+esc(s.label)+' | '
+ +'';
+ }});
+ tbody.innerHTML=html;
+}}
+
function render(d){{
const s=d.experiment_status||'unknown',p=d.progress||{{}};
document.body.className=s;
@@ -2201,11 +2566,17 @@ function render(d){{
const sPct=p.subtomo_total_projections>0?p.subtomo_projection/p.subtomo_total_projections:0;
setRing('ring-outer',289.03,oPct); setRing('ring-inner',213.63,sPct);
document.getElementById('ring-pct').textContent=Math.round(oPct*100)+'%';
- document.getElementById('pi-proj').textContent=(p.projection||0)+' / '+(p.total_projections||0);
+ let projText=(p.projection||0)+' / '+(p.total_projections||0);
+ const startScan=fmtScan(p.tomo_start_scan_number), curScan=fmtScan(p.current_scan_number);
+ if(startScan && curScan && startScan!==curScan) projText+=' ('+startScan+'\u2192'+curScan+')';
+ else if(curScan) projText+=' ('+curScan+')';
+ else if(startScan) projText+=' ('+startScan+')';
+ document.getElementById('pi-proj').textContent=projText;
document.getElementById('pi-subtomo').textContent=p.subtomo||'-';
document.getElementById('pi-angle').textContent=fmtAngle(p.angle);
document.getElementById('pi-type').textContent=p.tomo_type||'-';
- document.getElementById('pi-eta').textContent=p.estimated_remaining_human||'-';
+ document.getElementById('pi-remaining').textContent=p.estimated_remaining_human||'-';
+ document.getElementById('pi-finish').textContent=fmtTime(p.estimated_finish_time);
document.getElementById('pi-start').textContent=fmtTime(p.tomo_start_time);
if(d.recon){{
@@ -2216,18 +2587,21 @@ function render(d){{
document.getElementById('recon-path').textContent=d.recon.folder_path||'';
}}
renderInstrument(d.setup);
+ renderBeamlineStates(d.beamline_states);
renderPtycho(d.ptycho);
document.getElementById('last-update').textContent='updated '+new Date(d.generated_at).toLocaleTimeString();
const ageS=(Date.now()/1000)-d.generated_at_epoch;
const isStale=ageS>STALE_S;
document.getElementById('outdated-banner').classList.toggle('visible',isStale);
handleStale(isStale);
+ handleBlocked(s==='blocked');
document.getElementById('footer-gen').textContent='generator: '+((d.generator||{{}}).owner_id||'-');
document.getElementById('footer-hb').textContent='tomo_heartbeat: '+(p.tomo_heartbeat_age_s!=null?p.tomo_heartbeat_age_s+'s ago':'none');
const prevStatus=lastStatus;
lastStatus=s;
handleAudioForStatus(s, prevStatus);
+ updateAudioUI();
}}
let _fetchFailCount=0;