diff --git a/src/routes/(print)/print/batch/+page.server.ts b/src/routes/(print)/print/batch/+page.server.ts index e953869..88252f6 100644 --- a/src/routes/(print)/print/batch/+page.server.ts +++ b/src/routes/(print)/print/batch/+page.server.ts @@ -19,7 +19,9 @@ export const load: PageServerLoad = async ({ url }) => { brand: devices.brand, model: devices.model, serialNumber: devices.serialNumber, - category: devices.category + category: devices.category, + voltage: devices.voltage, + frequency: devices.frequency }) .from(devices) .where(sql`${devices.id} IN ${ids}`); diff --git a/src/routes/(print)/print/batch/+page.svelte b/src/routes/(print)/print/batch/+page.svelte index 52a91b8..3f68bb8 100644 --- a/src/routes/(print)/print/batch/+page.svelte +++ b/src/routes/(print)/print/batch/+page.svelte @@ -12,6 +12,9 @@ Batch Print - {data.labels.length} Labels + + +
@@ -29,7 +32,7 @@ {#each data.labels as label}
-
+
{@html label.qrSvg}
@@ -38,13 +41,16 @@ {label.title}
{#if label.brand || label.model} -
+
{[label.brand, label.model].filter(Boolean).join(' ')}
{/if} {#if label.serialNumber} -
- S/N: {label.serialNumber} +
S/N: {label.serialNumber}
+ {/if} + {#if label.voltage || label.frequency} +
+ {[label.voltage, label.frequency].filter(Boolean).join(' / ')}
{/if}
diff --git a/src/routes/(print)/print/component/[id]/+page.svelte b/src/routes/(print)/print/component/[id]/+page.svelte index d8f3064..7a61b12 100644 --- a/src/routes/(print)/print/component/[id]/+page.svelte +++ b/src/routes/(print)/print/component/[id]/+page.svelte @@ -13,6 +13,9 @@ Print - {data.component.title} + + +
@@ -37,7 +40,7 @@ {#each Array(copies) as _}
-
+
{@html data.qrSvg}
diff --git a/src/routes/(print)/print/device/[id]/+page.svelte b/src/routes/(print)/print/device/[id]/+page.svelte index abe9ba0..f00594f 100644 --- a/src/routes/(print)/print/device/[id]/+page.svelte +++ b/src/routes/(print)/print/device/[id]/+page.svelte @@ -13,6 +13,9 @@ Print - {data.device.title} + + +
@@ -37,7 +40,7 @@ {#each Array(copies) as _}
-
+
{@html data.qrSvg}
@@ -46,13 +49,16 @@ {data.device.title}
{#if data.device.brand || data.device.model} -
+
{[data.device.brand, data.device.model].filter(Boolean).join(' ')}
{/if} {#if data.device.serialNumber} -
- S/N: {data.device.serialNumber} +
S/N: {data.device.serialNumber}
+ {/if} + {#if data.device.voltage || data.device.frequency} +
+ {[data.device.voltage, data.device.frequency].filter(Boolean).join(' / ')}
{/if}