`:''}
@@ -1829,6 +1842,8 @@ function loadPackageIntoForm(p){
pkgKind = (p.kind === 'ewp') ? 'ewp' : 'iwp'; // set before type/constraint pickers so they filter correctly
const set=(id,v)=>{const el=document.getElementById(id); if(el) el.value=v||'';};
set('wp_subject',p.subject); set('wp_system',p.system); set('wp_location',p.location);
+ set('wp_p6_id',p.p6Id); set('wp_p6_desc',p.p6Desc); // CR-001
+ set('wp_priority', wpPriorityOf(p)); // CR-003
set('wp_assignees',p.assignees); set('wp_distribution',p.distribution);
loadPeopleFromPkg(p);
set('wp_assignee',p.assigneeId);
@@ -1914,8 +1929,9 @@ function newPackage(){
// to return to.
if(typeof WPUrl !== 'undefined' && window.wpCreatorReady && WPUrl.get('wp')) urlSyncPackage('', {replace:true});
editingId=null;
- ['wp_subject','wp_system','wp_location','wp_wbs','wp_assignee','wp_assignees','wp_distribution','wp_due','wp_spec','wp_desc','wp_hours','wp_kit_owner','wp_kit_date','wp_mimo_time','wp_mimo_loc','wp_actual_hrs','wp_installed_qty','wp_redlines','wp_lessons','wp_bimlink','wp_model_area','wp_scan_link'].forEach(id=>{const el=document.getElementById(id); if(el) el.value='';});
+ ['wp_subject','wp_system','wp_location','wp_p6_id','wp_p6_desc','wp_wbs','wp_assignee','wp_assignees','wp_distribution','wp_due','wp_spec','wp_desc','wp_hours','wp_kit_owner','wp_kit_date','wp_mimo_time','wp_mimo_loc','wp_actual_hrs','wp_installed_qty','wp_redlines','wp_lessons','wp_bimlink','wp_model_area','wp_scan_link'].forEach(id=>{const el=document.getElementById(id); if(el) el.value='';});
document.getElementById('wp_type').value=''; document.getElementById('wp_kit_status').value=''; document.getElementById('wp_cost').value='';
+ const prio=document.getElementById('wp_priority'); if(prio) prio.value=WP_PRIORITY_DEFAULT; // CR-003
['wp_iff','wp_clash'].forEach(id=>{const el=document.getElementById(id); if(el) el.value='';});
onClashChange();
pkgKind='iwp'; applyKind();
@@ -1957,7 +1973,7 @@ const WPData = {
if(typeof ProjectData!=='undefined' && ProjectData.pushWP) ProjectData.pushWP(p, activeProjectId); return true; },
};
-let dashFilter={status:'',discipline:'',q:'',flag:''};
+let dashFilter={status:'',discipline:'',q:'',flag:'',priority:''};
// A write has to reach the server before the server can count it. The outbox is
// the only path writes take, so flush it and then re-read - otherwise the refresh
// races the push and shows the pre-write totals, which is the same stale number
@@ -1979,7 +1995,7 @@ function dashRefreshAfterWrite(){
const DASH_FLAGS = ['ready', 'onhold', 'overdue', 'mine'];
function dashToggleFlag(f, opts){
- if(f==='all'){ dashFilter={status:'',discipline:'',q:'',flag:''}; }
+ if(f==='all'){ dashFilter={status:'',discipline:'',q:'',flag:'',priority:''}; }
else { dashFilter.flag = dashFilter.flag===f ? '' : f; }
dashPage=0;
// S3: which slice of the board you are looking at is state, so it belongs in
@@ -2009,6 +2025,84 @@ function dashApplyFlag(f){
}
function dashSetStatus(s){ dashFilter.status = dashFilter.status===s ? '' : s; dashPage=0; renderDashboard(); }
+// ── Board sorting (CR-001 / T6.1) ────────────────────────────────────────────
+// The board had no sorting at all. CR-001 asks for a sortable P6 activity column
+// and CR-003 asks for a sortable priority one, so the mechanism is built once and
+// declared as data — a column added later is a row in this table, not another
+// hand-written
and another comparator.
+//
+// EMPTIES SORT LAST, in both directions. That is the whole of "sorts correctly,
+// including with empty values": ascending by P6 activity means "the ones with an
+// activity, in order, then the ones without", because nobody sorts by a column in
+// order to look at the rows that have nothing in it. Reversing the direction
+// reverses the filled rows and leaves the blanks where they are.
+const DASH_COLUMNS = [
+ {key:'number', label:'WP #', get:p => p.number || ''},
+ {key:'subject', label:'Subject', get:p => p.subject || ''},
+ {key:'type', label:'Type', get:p => p.type || ''},
+ {key:'disciplines', label:'Discipline', get:p => (p.disciplines || []).join(', ')},
+ {key:'p6Id', label:'P6 activity',get:p => p.p6Id || ''},
+ // Sorted by the ESCALATION order, not alphabetically: High, Normal, Urgent
+ // would put the most urgent last, which is the one thing the column is for.
+ {key:'priority', label:'Priority', numeric:true,
+ get:p => WP_PRIORITIES.indexOf(wpPriorityOf(p))},
+ {key:'status', label:'Status', get:p => p.status || ''},
+ {key:'gates', label:'Gates', sortable:false},
+ {key:'due', label:'Due', get:p => p.due || ''},
+ {key:'hours', label:'Hrs', numeric:true, get:p => p.hours},
+ {key:'actions', label:'', sortable:false},
+];
+
+let dashSort = {key:'', dir:1};
+
+function dashSetSort(key){
+ const col = DASH_COLUMNS.find(c => c.key === key);
+ if(!col || col.sortable === false) return;
+ dashSort = (dashSort.key === key) ? {key: key, dir: -dashSort.dir} : {key: key, dir: 1};
+ dashPage = 0;
+ renderDashboard();
+}
+
+function dashSortRows(rows){
+ const col = DASH_COLUMNS.find(c => c.key === dashSort.key);
+ if(!col || col.sortable === false) return rows;
+ const blank = v => v === null || v === undefined || String(v).trim() === '';
+ // A copy: `rows` is derived from the live list and sorting it in place would
+ // reorder the board's own source.
+ return rows.slice().sort((a, b) => {
+ const va = col.get(a), vb = col.get(b);
+ const ea = blank(va), eb = blank(vb);
+ if(ea && eb) return 0;
+ if(ea) return 1; // empties last, whichever way the arrow points
+ if(eb) return -1;
+ if(col.numeric){
+ const na = parseFloat(va), nb = parseFloat(vb);
+ // A non-numeric value in a numeric column is not an empty and is not a
+ // number either; it sorts after the numbers rather than as NaN, which
+ // compares false against everything and leaves the order undefined.
+ if(isNaN(na) && isNaN(nb)) return 0;
+ if(isNaN(na)) return 1;
+ if(isNaN(nb)) return -1;
+ return (na - nb) * dashSort.dir;
+ }
+ return String(va).localeCompare(String(vb), undefined, {numeric:true, sensitivity:'base'})
+ * dashSort.dir;
+ });
+}
+
+function dashHeaderCells(){
+ return DASH_COLUMNS.map(c => {
+ if(c.sortable === false) return `
${esc(c.label)}
`;
+ const on = dashSort.key === c.key;
+ const aria = on ? (dashSort.dir > 0 ? 'ascending' : 'descending') : 'none';
+ const arrow = on ? (dashSort.dir > 0 ? ' ▲' : ' ▼') : '';
+ // A real button inside the th, so it is in the tab order and Enter/Space work
+ // for free (C1). The direction is said by aria-sort as well as by the arrow.
+ return `
`;
+ }).join('');
+}
+
// ── Phase 2: pagination, progress %, and archived view ──────────────────────
let dashPage=0, dashShowArchived=false, dashArchived=[];
const DASH_PAGE_SIZE=25;
@@ -2043,6 +2137,22 @@ function statusPill(s){
const label = s==='Issue' ? 'Issue (Hold)' : (s||'—');
return `${esc(label)}`;
}
+// A package saved before CR-003 has no priority at all, and so does one whose
+// value has been hand-edited to something not on the list. Both mean Normal —
+// the baseline — rather than blank, which would sort and filter as its own
+// invisible fourth level.
+function wpPriorityOf(p){
+ const v = (p && p.priority) || '';
+ return WP_PRIORITIES.indexOf(v) >= 0 ? v : WP_PRIORITY_DEFAULT;
+}
+
+function priorityPill(p){
+ const v = wpPriorityOf(p);
+ // The LABEL is always present. The colour is a second channel, never the only
+ // one (C1 / X7), and every one of them is a canonical token.
+ return `${esc(v)}`;
+}
+
function myUserId(){ try { return (window.WP_USER && window.WP_USER.id) || ''; } catch(e){ return ''; } }
function wpOpenConstraints(p){ return (p.constraints||[]).filter(c=>c.status==='open'); }
// Predecessor packages of `p` that aren't Closed. Deleted ones don't block.
@@ -2174,10 +2284,12 @@ function renderDashboard(){
const statusOpts=[''].concat(STATUS_ORDER.concat(['Issue']).map(s=>``)).join('');
const discList=Object.keys(byDisc);
const discOpts=[''].concat(discList.map(d=>``)).join('');
+ const prioOpts=[''].concat(WP_PRIORITIES.map(v=>``)).join('');
h+=`
+
`;
@@ -2187,6 +2299,7 @@ function renderDashboard(){
const rows=boardSource.filter(p=>{
if(dashFilter.status && p.status!==dashFilter.status) return false;
if(dashFilter.discipline && !((p.disciplines||[]).includes(dashFilter.discipline))) return false;
+ if(dashFilter.priority && wpPriorityOf(p)!==dashFilter.priority) return false;
if(q && !((p.number||'')+' '+(p.subject||'')+' '+(p.type||'')).toLowerCase().includes(q)) return false;
if(dashFilter.flag==='mine' && p.assigneeId!==myUserId()) return false;
if(dashFilter.flag==='ready' && !(!p.split && !wpReleaseBlocked(p) && p.status!=='Closed' && p.status!=='Issue')) return false;
@@ -2194,11 +2307,12 @@ function renderDashboard(){
if(dashFilter.flag==='overdue' && !isOverdue(p)) return false;
return true;
});
- const totalRows=rows.length;
+ const sorted=dashSortRows(rows);
+ const totalRows=sorted.length;
const pages=Math.max(1, Math.ceil(totalRows/DASH_PAGE_SIZE));
if(dashPage>=pages) dashPage=pages-1;
if(dashPage<0) dashPage=0;
- const pageRows=rows.slice(dashPage*DASH_PAGE_SIZE, dashPage*DASH_PAGE_SIZE+DASH_PAGE_SIZE);
+ const pageRows=sorted.slice(dashPage*DASH_PAGE_SIZE, dashPage*DASH_PAGE_SIZE+DASH_PAGE_SIZE);
// The board is a LIST, not a rollup: it renders the packages this browser holds,
// which is what keeps the field view usable offline. Its header is therefore the
// only count on this page not computed by the server — so it is reconciled against
@@ -2211,8 +2325,8 @@ function renderDashboard(){
? ` this browser has ${localCountable} of ${m.total}`
: '';
h+=`