@@ -2597,16 +2600,16 @@ input.tfile__name:focus { border-color: var(--primary); background: var(--bg); o
Dragging a file onto a row MATERIALIZES a real "By tracking number"
placement, so Clear keeps every assignment. The left filetree is
the drag source. -->
-
+
-
+
Drag files onto a row to name them; edit the Tracking number / Revision inline (ctrl-shift + ctrl-Enter sets many). Clearing the list keeps every assignment.
-
+
@@ -7470,7 +7473,7 @@ X.B(E,Y);return E}return J}())
transmittalTree: [], // [ { id, kind:'party', name, children:[ slot ] } ]
outputName: null, // remembered output directory display name
config: defaultConfig(), // tracking-number pattern (fields/statuses/modifiers)
- mdlList: [], // loaded MDL deliverables (drop targets): [ { id, party, trackingNumber, title, revisionCell } ]
+ worklist: [], // "From a list" scratch rows: [ { id, trackingNumber, title, revisionCell, source, archiveRevisions } ]
};
// id -> { node, kind:'tracking'|'party'|'slot'|'transmittal', parent }
@@ -7828,7 +7831,7 @@ X.B(E,Y);return E}return J}())
config: state.config,
// Strip the transient row→keys hint (`placed`) — it's rebuilt as
// drops happen and would otherwise bloat every autosave.
- mdlList: state.mdlList.map(function (r) {
+ worklist: state.worklist.map(function (r) {
return { id: r.id, party: r.party, trackingNumber: r.trackingNumber, title: r.title, revisionCell: r.revisionCell, source: r.source, archiveRevisions: r.archiveRevisions };
}),
};
@@ -7840,9 +7843,9 @@ X.B(E,Y);return E}return J}())
state.transmittalTree = obj.transmittalTree || [];
state.outputName = obj.outputName || null;
state.config = normalizeConfig(obj.config);
- state.mdlList = (Array.isArray(obj.mdlList) ? obj.mdlList : []).map(normalizeRow);
+ state.worklist = (Array.isArray(obj.worklist) ? obj.worklist : []).map(normalizeRow);
rebuildIndex();
- migrateLegacyMdl(obj.mdlList); // BEFORE anything can prune; materializes old mdl placements
+ migrateLegacyMdl(obj.worklist); // BEFORE anything can prune; materializes old mdl placements
notify();
}
// Pre-"From a list" workspaces stored a separate `mdlNodeId` axis pointing at
@@ -7910,15 +7913,17 @@ X.B(E,Y);return E}return J}())
id: r.id || uid(), party: r.party || '',
trackingNumber: (r.trackingNumber || '').trim(), title: r.title || '',
revisionCell: r.revisionCell || '',
+ // The file's existing name (pasted col 4) — a join key for name-match.
+ currentName: (r.currentName || '').trim(),
source: rowSource(r),
archiveRevisions: Array.isArray(r.archiveRevisions) ? r.archiveRevisions : [],
placed: Object.create(null),
};
}
- function setMdlList(rows) { state.mdlList = (rows || []).map(normalizeRow); notify(); }
- function appendMdlRows(rows) {
+ function setWorklist(rows) { state.worklist = (rows || []).map(normalizeRow); notify(); }
+ function appendWorklist(rows) {
var byTn = Object.create(null);
- state.mdlList.forEach(function (r) { if (r.trackingNumber) byTn[r.trackingNumber] = r; });
+ state.worklist.forEach(function (r) { if (r.trackingNumber) byTn[r.trackingNumber] = r; });
(rows || []).forEach(function (raw) {
var r = normalizeRow(raw), ex = r.trackingNumber ? byTn[r.trackingNumber] : null;
if (ex) {
@@ -7929,15 +7934,15 @@ X.B(E,Y);return E}return J}())
ex.source.pasted = ex.source.pasted || r.source.pasted;
if (r.archiveRevisions.length && !ex.archiveRevisions.length) ex.archiveRevisions = r.archiveRevisions;
} else {
- state.mdlList.push(r);
+ state.worklist.push(r);
if (r.trackingNumber) byTn[r.trackingNumber] = r;
}
});
notify();
}
- function clearMdlList() { state.mdlList = []; notify(); } // rows only — assignments survive
- function getMdlList() { return state.mdlList; }
- function getMdlRow(id) { return state.mdlList.filter(function (r) { return r.id === id; })[0] || null; }
+ function clearWorklist() { state.worklist = []; notify(); } // rows only — assignments survive
+ function getWorklist() { return state.worklist; }
+ function getWorklistRow(id) { return state.worklist.filter(function (r) { return r.id === id; })[0] || null; }
// Build (creating folders as needed) the tracking-tree leaf a row points at:
// "_". A tracking number's last segment is an
@@ -8004,12 +8009,12 @@ X.B(E,Y);return E}return J}())
if (old) pruneEmptyTrackingChain(old);
}
function setRowTracking(rowId, tn) {
- var r = getMdlRow(rowId); if (!r) return;
+ var r = getWorklistRow(rowId); if (!r) return;
r.trackingNumber = (tn == null ? '' : String(tn)).trim();
restampRow(r); notify();
}
function setRowTitle(rowId, title) {
- var r = getMdlRow(rowId); if (!r) return;
+ var r = getWorklistRow(rowId); if (!r) return;
r.title = (title == null ? '' : String(title));
Object.keys(r.placed || {}).forEach(function (k) { if (state.assignments[k]) setTitleOverride(k, r.title); });
notify();
@@ -8018,7 +8023,7 @@ X.B(E,Y);return E}return J}())
function setRevisionCells(rowIds, value) {
var set = Object.create(null); (rowIds || []).forEach(function (i) { set[i] = true; });
var changed = false;
- state.mdlList.forEach(function (r) {
+ state.worklist.forEach(function (r) {
if (set[r.id]) { r.revisionCell = (value == null ? '' : String(value)); restampRow(r); changed = true; }
});
if (changed) notify();
@@ -8028,6 +8033,9 @@ X.B(E,Y);return E}return J}())
// Parse Excel/TSV text into scratch rows. Columns: Tracking ⇥ Rev(Status) ⇥
// Title; a 4th bare-status column merges into the revision; a lone cell that
// parses as a full ZDDC filename is split; a header row is skipped.
+ // FIXED schema, by column position (no variant detection): a header row is
+ // skipped, then each line is tracking_number ⇥ rev (status) ⇥ title ⇥
+ // current name. Trailing columns may be omitted (currentName/title blank).
function parsePastedRows(text) {
function unq(s) {
s = (s == null ? '' : String(s)).trim();
@@ -8040,43 +8048,82 @@ X.B(E,Y);return E}return J}())
if (!raw.trim()) return;
var cells = raw.split('\t').map(unq);
var c0 = cells[0] || '';
- if (!sawData && cells.length > 1 && /^(tracking|number|no\.?|doc(ument)?|drawing|item)\b/i.test(c0) && c0.indexOf('-') === -1) {
- return; // header row
- }
- var tracking = '', rev = '', title = '';
- if (cells.length === 1) {
- var p = window.zddc.parseFilename(c0);
- if (p && p.valid && p.trackingNumber) { tracking = p.trackingNumber; rev = p.revision + (p.status ? ' (' + p.status + ')' : ''); title = p.title || ''; }
- else tracking = c0;
- } else {
- tracking = c0;
- if (cells.length >= 4 && cells[2] && window.zddc.isValidStatus(cells[2])) { rev = (cells[1] + ' (' + cells[2] + ')').trim(); title = cells[3] || ''; }
- else { rev = cells[1] || ''; title = cells[2] || ''; }
- }
- if (!tracking) { skipped.push({ line: i + 1, reason: 'no tracking number', text: raw }); return; }
+ // Skip a leading header row (first cell is a header word, not a tn).
+ if (!sawData && /^(tracking|number|no\.?|doc(ument)?|drawing|item)\b/i.test(c0) && c0.indexOf('-') === -1) return;
+ if (!c0) { skipped.push({ line: i + 1, reason: 'no tracking number', text: raw }); return; }
sawData = true;
- rows.push({ trackingNumber: tracking, revisionCell: rev.trim(), title: title, source: { pasted: true } });
+ rows.push({
+ trackingNumber: c0,
+ revisionCell: (cells[1] || '').trim(),
+ title: cells[2] || '',
+ currentName: cells[3] || '',
+ source: { pasted: true },
+ });
});
return { rows: rows, skipped: skipped };
}
function normTok(s) { return String(s == null ? '' : s).toUpperCase().replace(/[^A-Z0-9]/g, ''); }
- // Propose row matches for source files by finding a row whose tracking number
- // appears in the filename. opts.fuzzy also matches on the digit-run.
+ function dropExt(s) { return String(s == null ? '' : s).replace(/\.[^.\/\\]+$/, ''); }
+ function nameKey(s) { return dropExt(s).toLowerCase().replace(/[^a-z0-9]+/g, ''); }
+ function nameTokens(s) { return dropExt(s).toLowerCase().split(/[^a-z0-9]+/).filter(Boolean); }
+ // Score a pasted "current name" against a file's name: 1 = exact (normalized,
+ // extension dropped), 0.6–0.95 = token coverage, 0.7 = a clean substring,
+ // 0 = no match. Token-set beats raw substring (survives reordering).
+ function nameScore(rowName, fileFull) {
+ var rk = nameKey(rowName); if (!rk) return 0;
+ var fk = nameKey(fileFull);
+ if (rk === fk) return 1;
+ var rt = nameTokens(rowName);
+ if (rt.length) {
+ var ft = Object.create(null); nameTokens(fileFull).forEach(function (t) { ft[t] = true; });
+ var hit = 0; rt.forEach(function (t) { if (ft[t]) hit++; });
+ var cov = hit / rt.length;
+ if (cov >= 0.6) return Math.min(0.95, 0.6 + 0.35 * cov);
+ }
+ var a = rk.length <= fk.length ? rk : fk, b = rk.length <= fk.length ? fk : rk;
+ if (a.length >= 4 && b.indexOf(a) !== -1) return 0.7;
+ return 0;
+ }
+ // Propose file↔row matches. PRIMARY signal is the pasted "current name"
+ // column (nameScore); FALLBACK is the tracking number embedded in the
+ // filename (opts.fuzzy also tries the digit-run). Each proposal carries a
+ // confidence and an `auto` flag — true only for an exact 1:1 match (conf 1,
+ // the unique conf-1 match for BOTH its file and its row), the only kind safe
+ // to assign without confirmation.
function proposeMatches(files, rows, opts) {
opts = opts || {};
+ var named = (rows || []).filter(function (r) { return (r.currentName || '').trim(); });
var out = [];
(files || []).forEach(function (f) {
var full = zddc.joinExtension(f.originalFilename, f.extension);
- var nameNorm = normTok(full), nameDigits = nameNorm.replace(/[^0-9]/g, ''), best = null;
- (rows || []).forEach(function (r) {
- var tn = r.trackingNumber || ''; if (!tn) return;
- var tnNorm = normTok(tn), conf = 0;
- if (full.indexOf(tn) !== -1) conf = 1;
- else if (tnNorm && nameNorm.indexOf(tnNorm) !== -1) conf = 0.8;
- else if (opts.fuzzy) { var d = tnNorm.replace(/[^0-9]/g, ''); if (d && nameDigits.indexOf(d) !== -1) conf = 0.5; }
- if (conf && (!best || conf > best.confidence)) best = { row: r, confidence: conf };
+ var best = null;
+ named.forEach(function (r) {
+ var s = nameScore(r.currentName, full);
+ if (s > 0 && (!best || s > best.confidence)) best = { row: r, confidence: s, via: 'name' };
});
- if (best) out.push({ file: f, row: best.row, confidence: best.confidence });
+ if (!best) { // fallback: tracking number in the filename
+ var nameNorm = normTok(full), nameDigits = nameNorm.replace(/[^0-9]/g, '');
+ (rows || []).forEach(function (r) {
+ var tn = r.trackingNumber || ''; if (!tn) return;
+ var tnNorm = normTok(tn), conf = 0;
+ if (full.indexOf(tn) !== -1) conf = 1;
+ else if (tnNorm && nameNorm.indexOf(tnNorm) !== -1) conf = 0.8;
+ else if (opts.fuzzy) { var d = tnNorm.replace(/[^0-9]/g, ''); if (d && nameDigits.indexOf(d) !== -1) conf = 0.5; }
+ if (conf && (!best || conf > best.confidence)) best = { row: r, confidence: conf, via: 'tracking' };
+ });
+ }
+ if (best) out.push({ file: f, row: best.row, confidence: best.confidence, via: best.via, auto: false });
+ });
+ // Auto-assignable = exact + unambiguous both ways (so duplicate names
+ // never silently grab the wrong file).
+ var rowEx = Object.create(null), fileEx = Object.create(null);
+ out.forEach(function (p) {
+ if (p.confidence !== 1) return;
+ rowEx[p.row.id || p.row.trackingNumber] = (rowEx[p.row.id || p.row.trackingNumber] || 0) + 1;
+ fileEx[srcKeyForFile(p.file)] = (fileEx[srcKeyForFile(p.file)] || 0) + 1;
+ });
+ out.forEach(function (p) {
+ if (p.confidence === 1) p.auto = rowEx[p.row.id || p.row.trackingNumber] === 1 && fileEx[srcKeyForFile(p.file)] === 1;
});
return out;
}
@@ -8255,8 +8302,8 @@ X.B(E,Y);return E}return J}())
transmittalRecord: transmittalRecord,
findOrAddParty: findOrAddParty, findOrAddTransmittalBin: findOrAddTransmittalBin,
getConfig: getConfig, setConfig: setConfig, getTrackingFields: getTrackingFields,
- setMdlList: setMdlList, appendMdlRows: appendMdlRows, clearMdlList: clearMdlList,
- getMdlList: getMdlList, getMdlRow: getMdlRow,
+ setWorklist: setWorklist, appendWorklist: appendWorklist, clearWorklist: clearWorklist,
+ getWorklist: getWorklist, getWorklistRow: getWorklistRow,
assignFromRow: assignFromRow, unassignRowFile: unassignRowFile,
setRowTracking: setRowTracking, setRowTitle: setRowTitle,
setRevisionCell: setRevisionCell, setRevisionCells: setRevisionCells,
@@ -11015,9 +11062,9 @@ X.B(E,Y);return E}return J}())
var collapsed = {}; // nodeId -> true when collapsed (default expanded)
var openForm = null; // { partyId, slot } when a bin form is open
var initialized = false;
- var currentTab = 'tracking'; // 'tracking' | 'existing' | 'transmittal' — active tab
- var mdlTable = null; // the seltable controller for the "From a list" tab
- var mdlPlaced = {}; // trackingNumber -> placed files (read by the Files cell)
+ var currentTab = 'tracking'; // 'tracking' | 'worklist' | 'transmittal' — active tab
+ var worklistGrid = null; // the seltable controller for the "From a list" tab
+ var worklistPlaced = {}; // trackingNumber -> placed files (read by the Files cell)
var hideAssigned = false; // "Hide assigned" toggle in the From-a-list toolbar
var listScanned = false; // a Load has run this session (drives the "new" badge)
@@ -11026,15 +11073,15 @@ X.B(E,Y);return E}return J}())
initialized = true;
els = {
trackingTab: document.getElementById('trackingTab'),
- existingTab: document.getElementById('existingTab'),
+ worklistTab: document.getElementById('worklistTab'),
transmittalTab: document.getElementById('transmittalTab'),
trackingPanel: document.getElementById('trackingPanel'),
transmittalPanel: document.getElementById('transmittalPanel'),
- mdlPanel: document.getElementById('mdlPanel'),
+ worklistPanel: document.getElementById('worklistPanel'),
trackingTree: document.getElementById('trackingTree'),
transmittalTree: document.getElementById('transmittalTree'),
- mdlTree: document.getElementById('mdlTree'),
- loadMdlBtn: document.getElementById('loadMdlBtn'),
+ worklistTable: document.getElementById('worklistTable'),
+ loadWorklistBtn: document.getElementById('loadWorklistBtn'),
pasteRowsBtn: document.getElementById('pasteRowsBtn'),
matchNamesBtn: document.getElementById('matchNamesBtn'),
clearListBtn: document.getElementById('clearListBtn'),
@@ -11045,13 +11092,13 @@ X.B(E,Y);return E}return J}())
};
els.trackingTab.addEventListener('click', function () { showTab('tracking'); });
- if (els.existingTab) els.existingTab.addEventListener('click', function () { showTab('existing'); });
+ if (els.worklistTab) els.worklistTab.addEventListener('click', function () { showTab('worklist'); });
els.transmittalTab.addEventListener('click', function () { showTab('transmittal'); });
- if (els.loadMdlBtn) els.loadMdlBtn.addEventListener('click', loadMdl);
+ if (els.loadWorklistBtn) els.loadWorklistBtn.addEventListener('click', loadWorklist);
if (els.pasteRowsBtn) els.pasteRowsBtn.addEventListener('click', function () { openPasteDialog(''); });
if (els.matchNamesBtn) els.matchNamesBtn.addEventListener('click', openMatchDialog);
if (els.clearListBtn) els.clearListBtn.addEventListener('click', function () {
- var list = C().getMdlList();
+ var list = C().getWorklist();
if (!list.length) return;
// Warn before stranding files that still need a revision: they stay
// assigned (on a "pending" leaf under By tracking number), but the
@@ -11059,16 +11106,16 @@ X.B(E,Y);return E}return J}())
var pending = 0;
list.forEach(function (r) { if (!(r.revisionCell || '').trim()) pending += Object.keys(r.placed || {}).length; });
if (pending && !confirm(pending + ' file' + (pending === 1 ? '' : 's') + ' still need a revision. They stay assigned (a “pending” folder under By tracking number), but the list row to finish them here goes away. Clear anyway?')) return;
- C().clearMdlList();
+ C().clearWorklist();
window.zddc.toast('List cleared — every assignment is kept (see By tracking number).', 'info');
});
if (els.hideAssignedToggle) els.hideAssignedToggle.addEventListener('change', function () {
hideAssigned = !!els.hideAssignedToggle.checked;
- if (mdlTable) mdlTable.renderBody();
+ if (worklistGrid) worklistGrid.renderBody();
});
// Ctrl-V anywhere on the From-a-list panel opens the paste dialog prefilled.
- if (els.mdlPanel) els.mdlPanel.addEventListener('paste', function (e) {
- if (currentTab !== 'existing') return;
+ if (els.worklistPanel) els.worklistPanel.addEventListener('paste', function (e) {
+ if (currentTab !== 'worklist') return;
if (e.target && e.target.closest('input, textarea')) return; // let real inputs paste
var t = (e.clipboardData || window.clipboardData);
var text = t ? t.getData('text') : '';
@@ -11131,12 +11178,12 @@ X.B(E,Y);return E}return J}())
}
function showTab(which) {
- currentTab = (which === 'transmittal' || which === 'existing') ? which : 'tracking';
+ currentTab = (which === 'transmittal' || which === 'worklist') ? which : 'tracking';
els.trackingTab.classList.toggle('active', currentTab === 'tracking');
- if (els.existingTab) els.existingTab.classList.toggle('active', currentTab === 'existing');
+ if (els.worklistTab) els.worklistTab.classList.toggle('active', currentTab === 'worklist');
els.transmittalTab.classList.toggle('active', currentTab === 'transmittal');
els.trackingPanel.hidden = currentTab !== 'tracking';
- if (els.mdlPanel) els.mdlPanel.hidden = currentTab !== 'existing';
+ if (els.worklistPanel) els.worklistPanel.hidden = currentTab !== 'worklist';
els.transmittalPanel.hidden = currentTab !== 'transmittal';
render();
// The source-tree Show filters are per-axis, so the visible set changes
@@ -11170,7 +11217,7 @@ X.B(E,Y);return E}return J}())
var placed = buildPlaced(files);
renderTrackingInto(els.trackingTree, C().getTrackingTree(), placed.tracking);
renderTransmittalInto(els.transmittalTree, C().getTransmittalTree(), placed.transmittal);
- renderMdlInto(placed.byTracking);
+ renderWorklist(placed.byTracking);
renderStats(files);
}
@@ -11505,51 +11552,52 @@ X.B(E,Y);return E}return J}())
}
// ── "From a list" (scratch worklist via the shared seltable) ────────────
- function renderMdlInto(placedByTracking) {
- mdlPlaced = placedByTracking || {};
- if (!C().getMdlList().length) {
- mdlTable = null;
- els.mdlTree.textContent = '';
- els.mdlTree.appendChild(el('div', 'target-empty', 'Empty — “Load…” numbers from the archive/MDL, “Paste rows…” from Excel, or “⚡ Match names”. Then drag files onto a row to name them. The list is a scratch pad — clearing it keeps every assignment (see By tracking number).'));
+ function renderWorklist(placedByTracking) {
+ worklistPlaced = placedByTracking || {};
+ if (!C().getWorklist().length) {
+ worklistGrid = null;
+ els.worklistTable.textContent = '';
+ els.worklistTable.appendChild(el('div', 'target-empty', 'Empty — “Load…” numbers from the archive/MDL, “Paste rows…” from Excel, or “⚡ Match names”. Then drag files onto a row to name them. The list is a scratch pad — clearing it keeps every assignment (see By tracking number).'));
return;
}
- ensureMdlTable();
- mdlTable.renderBody();
+ ensureWorklistGrid();
+ worklistGrid.renderBody();
}
- function rowPlaced(r) { var f = mdlPlaced[r.trackingNumber]; return f && f.length ? f : null; }
- function ensureMdlTable() {
- if (mdlTable) return mdlTable;
+ function rowPlaced(r) { var f = worklistPlaced[r.trackingNumber]; return f && f.length ? f : null; }
+ function ensureWorklistGrid() {
+ if (worklistGrid) return worklistGrid;
var c = C();
var cols = [
- { key: 'tn', title: 'Tracking number', cls: 'fromlist-tn', get: function (r) { return r.trackingNumber || ''; },
- render: function (r, td) { editCell(td, 'fromlist-tn__input', r.trackingNumber, 'ACME-…-0001', function (v) { c.setRowTracking(r.id, v); }, tnWarn(r)); } },
- { key: 'title', title: 'Title', cls: 'fromlist-title', get: function (r) { return r.title || ''; },
- render: function (r, td) { editCell(td, 'fromlist-title__input', r.title, 'title', function (v) { c.setRowTitle(r.id, v); }); } },
- { key: 'src', title: 'Source', cls: 'fromlist-src', get: function (r) { var s = r.source || {}; return [s.mdl ? 'mdl' : '', s.archive ? 'arch' : '', s.pasted ? 'pasted' : ''].filter(Boolean).join(' '); },
+ { key: 'tn', title: 'Tracking number', cls: 'worklist-tn', get: function (r) { return r.trackingNumber || ''; },
+ render: function (r, td) { editCell(td, 'worklist-tn__input', r.trackingNumber, 'ACME-…-0001', function (v) { c.setRowTracking(r.id, v); }, tnWarn(r)); } },
+ { key: 'title', title: 'Title', cls: 'worklist-title', get: function (r) { return r.title || ''; },
+ render: function (r, td) { editCell(td, 'worklist-title__input', r.title, 'title', function (v) { c.setRowTitle(r.id, v); }); } },
+ { key: 'cur', title: 'Current name', cls: 'worklist-cur', get: function (r) { return r.currentName || ''; } },
+ { key: 'src', title: 'Source', cls: 'worklist-src', get: function (r) { var s = r.source || {}; return [s.mdl ? 'mdl' : '', s.archive ? 'arch' : '', s.pasted ? 'pasted' : ''].filter(Boolean).join(' '); },
render: function (r, td) { renderSource(r, td); } },
{ key: 'latest', title: 'Latest rev', get: function (r) { return latestRevOf(r.archiveRevisions); } },
- { key: 'rev', title: 'Revision', cls: 'mdl-rev', get: function (r) { return r.revisionCell; },
- render: function (r, td) { editCell(td, 'mdl-rev__input', r.revisionCell, 'A (IFR)', function (v) { c.setRevisionCell(r.id, v); }); } },
+ { key: 'rev', title: 'Revision', cls: 'worklist-rev', get: function (r) { return r.revisionCell; },
+ render: function (r, td) { editCell(td, 'worklist-rev__input', r.revisionCell, 'A (IFR)', function (v) { c.setRevisionCell(r.id, v); }); } },
];
- mdlTable = window.app.modules.seltable.create({
- container: els.mdlTree,
+ worklistGrid = window.app.modules.seltable.create({
+ container: els.worklistTable,
extraTitle: 'Files',
rows: function () {
- var list = c.getMdlList();
+ var list = c.getWorklist();
return hideAssigned ? list.filter(function (r) { return !rowPlaced(r); }) : list;
},
rowId: function (r) { return r.id; },
columns: cols,
- onRowDrop: function (rowId, keys) { var row = c.getMdlRow(rowId); if (row) c.assignFromRow(keys, row); },
+ onRowDrop: function (rowId, keys) { var row = c.getWorklistRow(rowId); if (row) c.assignFromRow(keys, row); },
onActivate: function (ids) {
if (!ids.length) return;
var v = prompt('Set the revision on ' + ids.length + ' selected row(s) (e.g. "A (IFR)"):', '');
if (v != null) c.setRevisionCells(ids, v.trim());
},
- rowExtra: function (r, td) { renderMdlPlaced(r, td); },
+ rowExtra: function (r, td) { renderWorklistFiles(r, td); },
});
- mdlTable.render();
- return mdlTable;
+ worklistGrid.render();
+ return worklistGrid;
}
// An editable seltable cell: an that commits on change. `warn` is an
// optional tooltip that flags (without blocking) a questionable value.
@@ -11580,7 +11628,7 @@ X.B(E,Y);return E}return J}())
td.appendChild(el('span', 'src-badge src-badge--pasted', 'pasted'));
}
}
- function renderMdlPlaced(row, td) {
+ function renderWorklistFiles(row, td) {
var c = C(), files = rowPlaced(row) || [];
files.forEach(function (f) {
var d = c.deriveTarget(f);
@@ -11651,7 +11699,7 @@ X.B(E,Y);return E}return J}())
}
return [{ label: scope.one, handle: archiveOf('/' + scope.one + '/') }];
}
- async function loadMdl() {
+ async function loadWorklist() {
var roots = await buildRoots();
if (!roots) return;
var picked = await window.app.modules.dirPicker.pick(roots);
@@ -11702,8 +11750,8 @@ X.B(E,Y);return E}return J}())
}
function finishLoad(rows) {
listScanned = true;
- C().appendMdlRows(rows); // APPEND — the list accumulates across batches
- showTab('existing');
+ C().appendWorklist(rows); // APPEND — the list accumulates across batches
+ showTab('worklist');
window.zddc.toast(rows.length
? ('Added ' + rows.length + ' tracking number' + (rows.length === 1 ? '' : 's') + ' from the selected directories. Drag files on, set revisions.')
: 'No files or deliverables in the selected directories.', rows.length ? 'success' : 'warning');
@@ -11726,12 +11774,29 @@ X.B(E,Y);return E}return J}())
document.body.appendChild(back);
return { body: body, foot: foot, close: close };
}
+ function unassignedFiles() {
+ var c = C();
+ return allFiles().filter(function (f) {
+ var a = c.getAssignment(c.srcKeyForFile(f));
+ return !(a && (a.trackingNodeId || a.excluded));
+ });
+ }
+ // Assign every exact, unambiguous (1:1) current-name match without prompting;
+ // returns the count. Lower-confidence / ambiguous matches are left for the
+ // user to review via "Match names".
+ function autoAssignByName() {
+ var c = C(), n = 0;
+ c.proposeMatches(unassignedFiles(), c.getWorklist(), {}).forEach(function (p) {
+ if (p.auto) { c.assignFromRow([c.srcKeyForFile(p.file)], p.row); n++; }
+ });
+ return n;
+ }
function openPasteDialog(prefill) {
var c = C();
- var m = scratchModal('Paste rows from Excel', 'Columns: Tracking · Rev (Status) · Title — tab-separated, as Excel copies. A header row is skipped; a pasted full filename is split.');
+ var m = scratchModal('Paste rows from Excel', 'Fixed columns, tab-separated as Excel copies: Tracking number · Rev (Status) · Title · Current name. A header row is skipped. The current name is matched against your files — exact matches are assigned automatically.');
var ta = document.createElement('textarea');
ta.className = 'scratch-paste__ta'; ta.rows = 6; ta.spellcheck = false;
- ta.placeholder = 'ACME-AR-DWG-0001\tA (IFR)\tFloor plan';
+ ta.placeholder = 'ACME-AR-DWG-0001\tA (IFR)\tFloor plan\tIMG_4471.pdf';
ta.value = prefill || '';
m.body.appendChild(ta);
var preview = el('div', 'scratch-paste__preview'); m.body.appendChild(preview);
@@ -11744,12 +11809,13 @@ X.B(E,Y);return E}return J}())
preview.textContent = '';
if (parsed.rows.length) {
var tbl = el('table', 'scratch-preview__table');
- var head = el('tr'); ['Tracking number', 'Revision', 'Title'].forEach(function (h) { head.appendChild(el('th', null, h)); }); tbl.appendChild(head);
+ var head = el('tr'); ['Tracking number', 'Revision', 'Title', 'Current name'].forEach(function (h) { head.appendChild(el('th', null, h)); }); tbl.appendChild(head);
parsed.rows.slice(0, 50).forEach(function (r) {
var tr = el('tr');
tr.appendChild(el('td', null, r.trackingNumber));
tr.appendChild(el('td', null, r.revisionCell || ''));
tr.appendChild(el('td', null, r.title || ''));
+ tr.appendChild(el('td', null, r.currentName || ''));
tbl.appendChild(tr);
});
preview.appendChild(tbl);
@@ -11761,23 +11827,23 @@ X.B(E,Y);return E}return J}())
}
add.addEventListener('click', function () {
var n = parsed.rows.length;
- c.appendMdlRows(parsed.rows);
- m.close(); showTab('existing');
- window.zddc.toast('Added ' + n + ' pasted row' + (n === 1 ? '' : 's') + '.', 'success');
+ c.appendWorklist(parsed.rows);
+ m.close(); showTab('worklist');
+ var assigned = autoAssignByName();
+ var msg = 'Added ' + n + ' pasted row' + (n === 1 ? '' : 's') + '.';
+ if (assigned) msg += ' Auto-assigned ' + assigned + ' file' + (assigned === 1 ? '' : 's') + ' by current name.';
+ window.zddc.toast(msg + (assigned ? ' Review the rest with ⚡ Match names.' : ''), 'success');
});
ta.addEventListener('input', refresh);
refresh(); ta.focus();
}
function openMatchDialog() {
var c = C();
- var rows = c.getMdlList();
+ var rows = c.getWorklist();
if (!rows.length) { window.zddc.toast('Load or paste some tracking numbers first.', 'warning'); return; }
- var files = allFiles().filter(function (f) {
- var a = c.getAssignment(c.srcKeyForFile(f));
- return !(a && (a.trackingNodeId || a.excluded));
- });
+ var files = unassignedFiles();
if (!files.length) { window.zddc.toast('No unassigned files to match.', 'info'); return; }
- var m = scratchModal('Match names', 'Files whose name contains a known tracking number. Review, then assign the checked matches.');
+ var m = scratchModal('Match names', 'Each unassigned file matched to a row by its “Current name” (or the tracking number in its filename). Exact matches are pre-checked; review the rest, then Assign.');
var opts = { fuzzy: false };
var fuzzyLbl = el('label', 'scratch-match__fuzzy');
var fuzzy = document.createElement('input'); fuzzy.type = 'checkbox';
@@ -11793,16 +11859,19 @@ X.B(E,Y);return E}return J}())
list.textContent = '';
if (!proposals.length) { list.appendChild(el('div', 'scratch-preview__skip', 'No matches found.')); accept.disabled = true; accept.textContent = 'Assign'; return; }
proposals.forEach(function (p, i) {
- var rowEl = el('label', 'scratch-match__row');
- var cb = document.createElement('input'); cb.type = 'checkbox'; cb.checked = true; cb.dataset.i = i;
+ var rowEl = el('label', 'scratch-match__row' + (p.auto ? '' : ' scratch-match__row--review'));
+ var cb = document.createElement('input'); cb.type = 'checkbox';
+ cb.checked = !!p.auto; // pre-check only exact 1:1 matches; opt in to the rest
+ cb.dataset.i = i;
rowEl.appendChild(cb);
- rowEl.appendChild(el('span', 'scratch-match__file', zddc.joinExtension(p.file.originalFilename, p.file.extension)));
+ rowEl.appendChild(el('span', 'scratch-match__file', window.zddc.joinExtension(p.file.originalFilename, p.file.extension)));
rowEl.appendChild(el('span', 'scratch-match__arrow', '→'));
rowEl.appendChild(el('span', 'scratch-match__tn', p.row.trackingNumber));
- rowEl.appendChild(el('span', 'scratch-match__conf', Math.round(p.confidence * 100) + '%'));
+ var tag = el('span', 'scratch-match__conf', Math.round(p.confidence * 100) + '% · ' + (p.via === 'name' ? 'name' : 'tracking#'));
+ rowEl.appendChild(tag);
list.appendChild(rowEl);
});
- accept.disabled = false; accept.textContent = 'Assign ' + proposals.length;
+ accept.disabled = false; accept.textContent = 'Assign checked';
}
accept.addEventListener('click', function () {
var n = 0;
@@ -11811,7 +11880,7 @@ X.B(E,Y);return E}return J}())
var p = proposals[Number(cb.dataset.i)];
if (p) { c.assignFromRow([c.srcKeyForFile(p.file)], p.row); n++; }
});
- m.close(); showTab('existing');
+ m.close(); showTab('worklist');
window.zddc.toast('Assigned ' + n + ' file' + (n === 1 ? '' : 's') + ' by name match.', n ? 'success' : 'info');
});
fuzzy.addEventListener('change', function () { opts.fuzzy = fuzzy.checked; refresh(); });
diff --git a/zddc/internal/apps/embedded/index.html b/zddc/internal/apps/embedded/index.html
index 25eaffb..d613a86 100644
--- a/zddc/internal/apps/embedded/index.html
+++ b/zddc/internal/apps/embedded/index.html
@@ -1793,7 +1793,7 @@ body {