diff --git a/CHANGELOG.md b/CHANGELOG.md index 9dcac75..1933d80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,14 @@ ADR-007 and ADR-002. has no value (e.g. serial number on an asset with none), the label states so instead of rendering an empty code. Asset payloads now carry a derived `locationcode` (leading token of the resolved own/inherited location name). +- Batch label sheets: a "Print Labels" button on each asset list page opens + `/print/asset-label-batch/`, a multi-select sheet that lays the + chosen assets onto ULINE label pages (6-up 3 in x 3 in, or a dense 72-up + mini-label format), with a start-cell offset to reuse partial sheets. Shares + the same code-type and encode settings/defaults as the single label, so a + batch of measuring tools encodes each tool's inspection location code just + like the single label does. Restores the ULINE batch printing the legacy + shopdb had, generalized across all asset types. - Support-team contact UX: the settings Support Teams page now manages each team's contacts in a per-team "Contacts (N)" modal (name, SSO, active, plus Add/Edit/Delete) instead of an inline row expander, and the application diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 1f7fc34..33eca53 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -184,6 +184,8 @@ them under `instance/branding/`. The shared asset-label generator lives at `/print/asset-label//` (public, like the other `/print/*` pages; `assettype` is one of `machine`, `computer`, `printer`, `network_device`, `measuring_tool`, and `id` is the asset's plugin id). It can encode the asset page link, the asset number, the serial number, a custom `qr_target_` template, or - for measuring tools by default - the asset's inspection location code (the leading token of the location name, e.g. `0615`). A measuring tool with no location falls back to its asset page. +The batch generator at `/print/asset-label-batch/` (reached from the "Print Labels" button on each asset list page) lays a multi-selection of one type onto ULINE label sheets: a 6-up 3 in x 3 in format or a dense 72-up mini-label format, with a start-cell offset for reusing partial sheets. It reuses the same code-type and `label_default_encodes_` defaults as the single label. + ### map | Key | Default | Notes | diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 9d1e097..43cac00 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -85,6 +85,12 @@ const routes = [ name: 'print-asset-label', component: () => import('../views/print/AssetLabel.vue') }, + // Batch label sheets (ULINE 6-up / mini 72-up) for one asset type. + { + path: '/print/asset-label-batch/:assettype', + name: 'print-asset-label-batch', + component: () => import('../views/print/AssetLabelBatch.vue') + }, { path: '/print/printer-qr', name: 'print-printer-qr-batch', diff --git a/frontend/src/views/machines/MachinesList.vue b/frontend/src/views/machines/MachinesList.vue index 3147e8f..322c2e5 100644 --- a/frontend/src/views/machines/MachinesList.vue +++ b/frontend/src/views/machines/MachinesList.vue @@ -2,6 +2,7 @@
diff --git a/frontend/src/views/measuringtools/MeasuringToolsList.vue b/frontend/src/views/measuringtools/MeasuringToolsList.vue index 05f4d80..9dacb51 100644 --- a/frontend/src/views/measuringtools/MeasuringToolsList.vue +++ b/frontend/src/views/measuringtools/MeasuringToolsList.vue @@ -2,6 +2,7 @@
diff --git a/frontend/src/views/network/NetworkDevicesList.vue b/frontend/src/views/network/NetworkDevicesList.vue index 948a569..91aa7d4 100644 --- a/frontend/src/views/network/NetworkDevicesList.vue +++ b/frontend/src/views/network/NetworkDevicesList.vue @@ -2,6 +2,7 @@
@@ -117,7 +118,7 @@ + + diff --git a/frontend/src/views/printers/PrintersList.vue b/frontend/src/views/printers/PrintersList.vue index 5d6e115..bc39ed4 100644 --- a/frontend/src/views/printers/PrintersList.vue +++ b/frontend/src/views/printers/PrintersList.vue @@ -4,6 +4,7 @@

Printers

Batch Print QR + Print Labels Add Printer