⋮⋮
Contacts
@@ -2119,7 +2178,7 @@ function setTheme(t) {{
// ── Drag-and-drop card ordering ──────────────────────────────────────────
const CARD_ORDER_KEY = 'cardOrder';
-const DEFAULT_ORDER = ['audio','recon-queue','ptycho','instrument','blstates','contacts'];
+const DEFAULT_ORDER = ['audio','recon-queue','ptycho','instrument','blstates','tomo-queue','contacts'];
let _dragSrc = null;
function savedOrder() {{
@@ -2555,6 +2614,61 @@ function renderBeamlineStates(bl){{
tbody.innerHTML=html;
}}
+// Key params to show in expanded job detail, in display order.
+const TQ_PARAM_DISPLAY = [
+ ['tomo_type', 'Type'],
+ ['tomo_countingtime', 'Exposure (s)'],
+ ['fovx', 'FOV x (\u00b5m)'],
+ ['fovy', 'FOV y (\u00b5m)'],
+ ['tomo_angle_stepsize', 'Angle step (\u00b0)'],
+ ['tomo_angle_range', 'Angle range (\u00b0)'],
+ ['tomo_shellstep', 'Shell step (\u00b5m)'],
+ ['stitch_x', 'Stitch x'],
+ ['stitch_y', 'Stitch y'],
+ ['ptycho_reconstruct_foldername','Recon folder'],
+];
+
+function fmtTqParam(key, val){{
+ if(val==null) return '-';
+ if(typeof val==='number') return Number.isInteger(val)?String(val):val.toFixed(3).replace(/\\.?0+$/,'');
+ return String(val);
+}}
+
+function renderTomoQueue(jobs){{
+ const el=document.getElementById('tomo-queue-content');
+ if(!jobs||jobs.length===0){{
+ el.innerHTML='
No jobs queued
';
+ return;
+ }}
+ let html='';
+ jobs.forEach((job,i)=>{{
+ const status=job.status||'pending';
+ const label=job.label||('Job '+(i+1));
+ const params=job.params||{{}};
+ let paramRows='';
+ TQ_PARAM_DISPLAY.forEach(([key,dispLabel])=>{{
+ if(key in params){{
+ paramRows+='
| '+dispLabel+' | '+esc(fmtTqParam(key,params[key]))+' |
';
+ }}
+ }});
+ const addedAt=job.added_at
+ ?'Added '+new Date(job.added_at).toLocaleString([],{{month:'short',day:'numeric',hour:'2-digit',minute:'2-digit'}})
+ :'';
+ html+='
'
+ +''
+ +'#'+(i+1)+''
+ +''+esc(label)+''
+ +''+esc(status)+''
+ +'
'
+ +''
+ +(paramRows?'
':'')
+ +(addedAt?'
'+esc(addedAt)+'
':'')
+ +'
';
+ }});
+ el.innerHTML=html;
+}}
+
function render(d){{
const s=d.experiment_status||'unknown',p=d.progress||{{}};
document.body.className=s;
@@ -2576,6 +2690,14 @@ function render(d){{
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);
+ const runningJob=(d.tomo_queue||[]).find(j=>j.status==='running');
+ const queueItem=document.getElementById('pi-queue-item');
+ if(runningJob){{
+ document.getElementById('pi-queue-label').textContent=runningJob.label||'-';
+ queueItem.style.display='';
+ }}else{{
+ queueItem.style.display='none';
+ }}
if(d.recon){{
document.getElementById('recon-waiting').textContent=d.recon.waiting;
@@ -2586,6 +2708,7 @@ function render(d){{
}}
renderInstrument(d.setup);
renderBeamlineStates(d.beamline_states);
+ renderTomoQueue(d.tomo_queue);
renderPtycho(d.ptycho);
document.getElementById('last-update').textContent='updated '+new Date(d.generated_at).toLocaleTimeString();
const ageS=(Date.now()/1000)-d.generated_at_epoch;