Add scanner utility, modal, and stock scan page implementation #9

Merged
bblaz merged 2 commits from codex/plan-item-scanning-flows into main 2026-05-01 21:36:41 +00:00
17 changed files with 1966 additions and 367 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "lonc-web", "name": "lonc-web",
"version": "0.2.4", "version": "0.2.5",
"private": true, "private": true,
"type": "module", "type": "module",
"scripts": { "scripts": {
+52 -1
View File
@@ -230,7 +230,58 @@ export async function updateStockItem(store, uuidB64, body) {
method: 'POST', method: 'POST',
body, body,
}); });
return getStockEntry(store, uuidB64); return getStockEntry(store, uuidB64, {
allowInactive: body?.level === 'gone' || Number(body?.quantity) <= 0,
});
}
export async function createStockEvent(store, uuidB64, body) {
const payload = await apiRequest(store, `${getPath('items')}/${uuidB64}/stock`, {
method: 'POST',
body,
});
return payload?.stock || payload;
}
export async function listStockEvents(store, uuidB64, options = {}) {
const query = {};
if (options.allowInactive) {
query.allow_inactive = 1;
}
if (options.limit !== undefined && options.limit !== null) {
query.limit = options.limit;
}
if (options.offset !== undefined && options.offset !== null) {
query.offset = options.offset;
}
if (options.orderBy || options.order_by) {
query.order_by = options.orderBy || options.order_by;
}
if (options.orderDir || options.order_dir) {
query.order_dir = options.orderDir || options.order_dir;
}
const payload = await apiRequest(store, `${getPath('items')}/${uuidB64}/stock`, {
query,
});
return unwrapListPayload(payload);
}
export async function markStockGone(store, uuidB64, reason = 'consumed') {
try {
await createStockEvent(store, uuidB64, {
level: 'gone',
gone_reason: reason,
});
return { status: 'gone', reason };
} catch (error) {
const status = error?.status || error?.cause?.status;
if (status === 409 || status === 404) {
return { status: 'already_gone', reason };
}
throw error;
}
} }
export async function deleteStockItem(store, uuidB64) { export async function deleteStockItem(store, uuidB64) {
+2 -1
View File
@@ -1,5 +1,5 @@
export const APP_NAME = 'Lonc'; export const APP_NAME = 'Lonc';
export const APP_VERSION = typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '0.2.4'; export const APP_VERSION = typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '0.2.5';
export const TRYTON_APPLICATION = 'kitchen'; export const TRYTON_APPLICATION = 'kitchen';
export const CONNECTION_STATES = { export const CONNECTION_STATES = {
@@ -33,6 +33,7 @@ export const API_PATHS = {
export const ROUTES = { export const ROUTES = {
login: '/login', login: '/login',
home: '/', home: '/',
scan: '/scan',
stock: '/stock', stock: '/stock',
stockNew: '/stock/new', stockNew: '/stock/new',
stockDetail: '/stock/:id', stockDetail: '/stock/:id',
+15 -5
View File
@@ -6,10 +6,12 @@ import { renderLabelCreatePage } from '../features/labels/label-create-page.js';
import { renderSettingsPage } from '../features/auth/settings-page.js'; import { renderSettingsPage } from '../features/auth/settings-page.js';
import { renderStockDetailPage } from '../features/stock/stock-detail-page.js'; import { renderStockDetailPage } from '../features/stock/stock-detail-page.js';
import { renderStockListPage } from '../features/stock/stock-list-page.js'; import { renderStockListPage } from '../features/stock/stock-list-page.js';
import { renderStockScanPage } from '../features/stock/stock-scan-page.js';
const routeDefinitions = [ const routeDefinitions = [
{ path: ROUTES.login, render: renderLoginPage, protected: false }, { path: ROUTES.login, render: renderLoginPage, protected: false },
{ path: ROUTES.home, render: renderDashboardPage, protected: true }, { path: ROUTES.home, render: renderDashboardPage, protected: true },
{ path: ROUTES.scan, render: renderStockScanPage, protected: true },
{ path: ROUTES.stock, render: renderStockListPage, protected: true }, { path: ROUTES.stock, render: renderStockListPage, protected: true },
{ path: ROUTES.stockNew, render: renderLabelCreatePage, protected: true }, { path: ROUTES.stockNew, render: renderLabelCreatePage, protected: true },
{ path: ROUTES.stockDetail, render: renderStockDetailPage, protected: true }, { path: ROUTES.stockDetail, render: renderStockDetailPage, protected: true },
@@ -17,9 +19,13 @@ const routeDefinitions = [
{ path: ROUTES.settings, render: renderSettingsPage, protected: false }, { path: ROUTES.settings, render: renderSettingsPage, protected: false },
]; ];
function normalizeHashRoute() { function parseHashRoute() {
const route = window.location.hash.replace(/^#/, '') || ROUTES.home; const route = window.location.hash.replace(/^#/, '') || ROUTES.home;
return route.startsWith('/') ? route : `/${route}`; const normalized = route.startsWith('/') ? route : `/${route}`;
const [pathnameRaw, search = ''] = normalized.split('?');
const pathname = pathnameRaw || ROUTES.home;
const query = Object.fromEntries(new URLSearchParams(search).entries());
return { pathname, query };
} }
function matchRoute(pathname) { function matchRoute(pathname) {
@@ -52,12 +58,12 @@ export function navigate(path) {
} }
export function getRouteContext() { export function getRouteContext() {
return window.__loncRouteContext || { path: ROUTES.home, params: {} }; return window.__loncRouteContext || { path: ROUTES.home, params: {}, query: {} };
} }
export function createRouter({ Alpine, store, outlet }) { export function createRouter({ Alpine, store, outlet }) {
const render = async () => { const render = async () => {
const pathname = normalizeHashRoute(); const { pathname, query } = parseHashRoute();
const match = matchRoute(pathname); const match = matchRoute(pathname);
if (!match) { if (!match) {
@@ -81,7 +87,11 @@ export function createRouter({ Alpine, store, outlet }) {
return; return;
} }
window.__loncRouteContext = { path: pathname, params: match.params }; window.__loncRouteContext = {
path: pathname,
params: match.params,
query,
};
outlet.innerHTML = match.render(); outlet.innerHTML = match.render();
Alpine.initTree(outlet); Alpine.initTree(outlet);
}; };
+3
View File
@@ -17,6 +17,9 @@ export function navBar(appName) {
<li class="nav-item" x-show="$store.app.session?.state === 'connected'"> <li class="nav-item" x-show="$store.app.session?.state === 'connected'">
<a class="nav-link" href="#/labels/new">New Label</a> <a class="nav-link" href="#/labels/new">New Label</a>
</li> </li>
<li class="nav-item" x-show="$store.app.session?.state === 'connected'">
<a class="nav-link" href="#/scan">Scan</a>
</li>
<li class="nav-item" x-show="$store.app.session?.state === 'connected'"> <li class="nav-item" x-show="$store.app.session?.state === 'connected'">
<a class="nav-link" href="#/stock">Stock</a> <a class="nav-link" href="#/stock">Stock</a>
</li> </li>
+5 -4
View File
@@ -15,6 +15,7 @@ export function renderDashboardPage() {
</p> </p>
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
<a href="#/labels/new" class="btn btn-primary btn-lg">Create label</a> <a href="#/labels/new" class="btn btn-primary btn-lg">Create label</a>
<a href="#/scan" class="btn btn-outline-primary btn-lg">Scan item</a>
<a href="#/stock" class="btn btn-outline-primary btn-lg">Browse stock</a> <a href="#/stock" class="btn btn-outline-primary btn-lg">Browse stock</a>
</div> </div>
</div> </div>
@@ -70,10 +71,10 @@ export function renderDashboardPage() {
</a> </a>
</div> </div>
<div class="col-12 col-md-6 col-xl-3"> <div class="col-12 col-md-6 col-xl-3">
<a class="quick-card" href="#/stock"> <a class="quick-card" href="#/scan">
<span class="quick-card-label">Adjustments</span> <span class="quick-card-label">Scanning</span>
<strong>Fast quantity updates</strong> <strong>Use, spoil, or inspect</strong>
<span class="text-body-secondary">Apply increments, decrements, or exact counts with clear feedback.</span> <span class="text-body-secondary">Scan a label or barcode and act on the matching item.</span>
</a> </a>
</div> </div>
<div class="col-12 col-md-6 col-xl-3"> <div class="col-12 col-md-6 col-xl-3">
+384 -182
View File
@@ -1,10 +1,10 @@
import { import {
applyItemUpsert, applyItemUpsert,
getStockEntry,
lookupItemByIdentifier, lookupItemByIdentifier,
previewItemUpsert, previewItemUpsert,
searchItemDefinitions, searchItemDefinitions,
} from '../../api/stock.js'; } from '../../api/stock.js';
import { BrowserMultiFormatReader } from '@zxing/browser';
import { mapLookupItemToForm } from './identifier-lookup-mapper.js'; import { mapLookupItemToForm } from './identifier-lookup-mapper.js';
import { fetchLocations } from '../../api/locations.js'; import { fetchLocations } from '../../api/locations.js';
import { import {
@@ -15,6 +15,16 @@ import {
import { STORAGE_KEYS } from '../../app/config.js'; import { STORAGE_KEYS } from '../../app/config.js';
import { debounce, normalizeValidationError } from '../shared/form-utils.js'; import { debounce, normalizeValidationError } from '../shared/form-utils.js';
import { loadStoredValue, saveStoredValue } from '../shared/storage.js'; import { loadStoredValue, saveStoredValue } from '../shared/storage.js';
import { renderScannerModal } from '../shared/scanner-modal.js';
import {
canUseCameraScanner,
createScannerReader,
normalizeIdentifierCode,
parseKitchenScanPayload,
normalizeScannerError,
startCameraScanner,
stopCameraScanner,
} from '../shared/scanner.js';
import { createAsyncState, runAsyncState } from '../shared/ui-state.js'; import { createAsyncState, runAsyncState } from '../shared/ui-state.js';
const STOCK_TYPE_OPTIONS = [ const STOCK_TYPE_OPTIONS = [
@@ -35,8 +45,41 @@ const STOCK_LEVEL_OPTIONS = [
const QUANTITY_UNIT_OPTIONS = ['g', 'ml', 'pc']; const QUANTITY_UNIT_OPTIONS = ['g', 'ml', 'pc'];
const EXPIRATION_DAY_OPTIONS = ['3', '5', '8', '10', '15', '20', '25', '30', '45', '60', '90', '120', '150', '180']; const EXPIRATION_DAY_OPTIONS = ['3', '5', '8', '10', '15', '20', '25', '30', '45', '60', '90', '120', '150', '180'];
const LABEL_DRAFT_STALE_MS = 30 * 60 * 1000; const LABEL_DRAFT_STALE_MS = 30 * 60 * 1000;
const SCANNER_ACTION_OPTIONS = [
{
key: 'lookup',
label: 'Lookup',
description: 'Lookup identifier data and prefill the label form.',
},
{
key: 'create',
label: 'Create',
description: 'Lookup data and create label immediately when required fields are complete.',
},
{
key: 'create_print',
label: 'Create & print',
description: 'Lookup data, create label, and print when required fields are complete.',
},
];
export function renderLabelCreatePage() { export function renderLabelCreatePage() {
const scannerOptionsMarkup = `
<div class="scan-label-mode-list mb-3">
<template x-for="action in scannerActionOptions" :key="'label-scanner-' + action.key">
<button
class="btn btn-sm scan-label-mode-btn"
type="button"
:class="scannerAction === action.key ? 'scan-label-mode-btn-active' : 'btn-outline-secondary'"
@click="scannerAction = action.key"
>
<span x-text="action.label"></span>
</button>
</template>
</div>
<div class="small text-body-secondary mb-3" x-text="activeScannerActionDescription()"></div>
`;
return ` return `
<section class="container-xxl py-4 py-lg-5" x-data="labelCreatePage()" x-init="init()"> <section class="container-xxl py-4 py-lg-5" x-data="labelCreatePage()" x-init="init()">
<div class="d-flex flex-column flex-lg-row justify-content-between gap-3 align-items-lg-end mb-4"> <div class="d-flex flex-column flex-lg-row justify-content-between gap-3 align-items-lg-end mb-4">
@@ -121,7 +164,7 @@ export function renderLabelCreatePage() {
</button> </button>
</div> </div>
<div class="form-text"> <div class="form-text">
Optional. Scan with camera or enter manually. Optional. Scan with camera, use a hardware scanner, or enter manually.
</div> </div>
<template x-if="lookupState.error"> <template x-if="lookupState.error">
<div class="small text-danger mt-1" x-text="lookupState.error"></div> <div class="small text-danger mt-1" x-text="lookupState.error"></div>
@@ -468,7 +511,19 @@ export function renderLabelCreatePage() {
</template> </template>
<template x-if="printIssue"> <template x-if="printIssue">
<div class="alert alert-warning mb-0 py-2" x-text="printIssue"></div> <div class="alert alert-warning mb-0 py-2 d-flex flex-wrap align-items-center justify-content-between gap-2">
<span x-text="printIssue"></span>
<button
class="btn btn-sm btn-outline-secondary"
type="button"
x-show="canRetryLastLabelPrint()"
@click="retryLastLabelPrint()"
:disabled="printState.isLoading"
>
<span x-show="!printState.isLoading">Reprint label</span>
<span x-show="printState.isLoading">Printing...</span>
</button>
</div>
</template> </template>
<div class="d-flex flex-wrap justify-content-between align-items-center gap-2 label-actions-row"> <div class="d-flex flex-wrap justify-content-between align-items-center gap-2 label-actions-row">
@@ -522,38 +577,16 @@ export function renderLabelCreatePage() {
</div> </div>
</div> </div>
<div ${renderScannerModal({
class="scanner-modal-backdrop" title: 'Scan barcode',
x-show="scannerState.isOpen" subtitle: 'Point your camera at a product barcode or kitchen DataMatrix label.',
@click.self="closeScanner()" optionsMarkup: scannerOptionsMarkup,
@keydown.escape.window="closeScanner()" manualCodeModel: 'scannerManualCode',
> manualSubmitAction: 'processScannerManualCode()',
<div class="scanner-modal card border-0 shadow-lg"> manualPlaceholder: 'Scan with hardware reader or paste code',
<div class="card-body p-3 p-md-4"> manualHelp: 'Use this with keyboard-style barcode scanners or for manual paste.',
<div class="d-flex align-items-center justify-content-between gap-3 mb-3"> manualDisabledExpression: 'lookupState.isLoading || createState.isLoading || scannerState.isLoading || scannerState.isProcessing',
<div> })}
<h2 class="h5 mb-1">Scan barcode</h2>
<p class="text-body-secondary small mb-0">Point your camera at the barcode to fill the identifier field.</p>
</div>
<button class="btn btn-sm btn-outline-secondary" type="button" @click="closeScanner()">Close</button>
</div>
<div class="scanner-video-shell mb-3">
<video class="scanner-video" x-ref="scannerVideo" autoplay muted playsinline></video>
</div>
<div class="d-flex flex-wrap align-items-center gap-2">
<div class="small text-body-secondary" x-show="scannerState.isLoading">Starting camera...</div>
<div class="small text-success" x-show="scannerState.lastDetectedCode" x-text="'Detected: ' + scannerState.lastDetectedCode"></div>
<button class="btn btn-outline-secondary btn-sm" type="button" @click="startScanner()" :disabled="scannerState.isLoading">Retry</button>
</div>
<template x-if="scannerState.error">
<div class="alert alert-warning py-2 mt-3 mb-0" x-text="scannerState.error"></div>
</template>
</div>
</div>
</div>
</section> </section>
`; `;
} }
@@ -677,6 +710,10 @@ export function labelCreatePageData(store) {
previewState: createAsyncState(), previewState: createAsyncState(),
createState: createAsyncState(), createState: createAsyncState(),
lookupState: createAsyncState(), lookupState: createAsyncState(),
printState: createAsyncState(),
scannerActionOptions: SCANNER_ACTION_OPTIONS,
scannerAction: 'lookup',
scannerManualCode: '',
stockTypeOptions: STOCK_TYPE_OPTIONS, stockTypeOptions: STOCK_TYPE_OPTIONS,
stockLevelOptions: STOCK_LEVEL_OPTIONS, stockLevelOptions: STOCK_LEVEL_OPTIONS,
quantityUnitOptions: QUANTITY_UNIT_OPTIONS, quantityUnitOptions: QUANTITY_UNIT_OPTIONS,
@@ -695,11 +732,14 @@ export function labelCreatePageData(store) {
upsertPreview: null, upsertPreview: null,
printLabelOnSave: true, printLabelOnSave: true,
printIssue: '', printIssue: '',
lastCreatedLabelUuidB64: '',
lastCreatedLabelName: '',
scannerReader: null, scannerReader: null,
scannerControls: null, scannerControls: null,
scannerState: { scannerState: {
isOpen: false, isOpen: false,
isLoading: false, isLoading: false,
isProcessing: false,
hasCamera: false, hasCamera: false,
error: '', error: '',
lastDetectedCode: '', lastDetectedCode: '',
@@ -746,14 +786,10 @@ export function labelCreatePageData(store) {
this.stopScanner(); this.stopScanner();
}, },
canUseCameraScanner() { canUseCameraScanner() {
return Boolean( return canUseCameraScanner();
typeof navigator !== 'undefined'
&& navigator.mediaDevices
&& typeof navigator.mediaDevices.getUserMedia === 'function',
);
}, },
normalizeIdentifierCode(value) { normalizeIdentifierCode(value) {
return String(value || '').replace(/\s+/g, '').trim(); return normalizeIdentifierCode(value);
}, },
hasLookupIdentifierCode() { hasLookupIdentifierCode() {
return Boolean(this.normalizeIdentifierCode(this.form.identifierCode)); return Boolean(this.normalizeIdentifierCode(this.form.identifierCode));
@@ -835,26 +871,16 @@ export function labelCreatePageData(store) {
return `${parts.join(' ')}.`; return `${parts.join(' ')}.`;
}, },
normalizeScannerError(error) { normalizeScannerError(error) {
const message = String(error?.message || ''); return normalizeScannerError(error);
const normalized = message.toLowerCase(); },
activeScannerActionDescription() {
if (error?.name === 'NotAllowedError' || normalized.includes('permission')) { return this.scannerActionOptions.find((action) => action.key === this.scannerAction)?.description || '';
return 'Camera access was denied. Allow access to scan, or enter the code manually.';
}
if (error?.name === 'NotFoundError' || normalized.includes('requested device not found')) {
return 'No camera was found on this device. Enter the identifier code manually.';
}
if (error?.name === 'NotReadableError' || normalized.includes('could not start video source')) {
return 'Camera is busy in another app. Close it there and try scanning again.';
}
return 'Could not start barcode scanning. Enter the identifier code manually.';
}, },
async openScanner() { async openScanner() {
this.scannerState.error = ''; this.scannerState.error = '';
this.scannerState.lastDetectedCode = ''; this.scannerState.lastDetectedCode = '';
this.scannerState.isProcessing = false;
this.scannerManualCode = this.form.identifierCode || '';
this.scannerState.isOpen = true; this.scannerState.isOpen = true;
await this.$nextTick(); await this.$nextTick();
await this.startScanner(); await this.startScanner();
@@ -877,45 +903,19 @@ export function labelCreatePageData(store) {
this.stopScanner(); this.stopScanner();
this.scannerState.isLoading = true; this.scannerState.isLoading = true;
const shouldLogDecodeErrors = import.meta.env.DEV;
let lastDecodeErrorName = '';
let lastDecodeErrorAt = 0;
try { try {
if (!this.scannerReader) { if (!this.scannerReader) {
this.scannerReader = new BrowserMultiFormatReader(); this.scannerReader = createScannerReader();
} }
this.scannerControls = await this.scannerReader.decodeFromConstraints( const session = await startCameraScanner({
{ reader: this.scannerReader,
audio: false,
video: {
facingMode: { ideal: 'environment' },
},
},
videoElement, videoElement,
(result, error) => { onDetected: (code) => this.onBarcodeDetected(code),
if (result) { });
this.onBarcodeDetected(result.getText?.() || ''); this.scannerReader = session.reader;
return; this.scannerControls = session.controls;
}
if (error) {
// Continuous decode emits expected per-frame misses/errors before a valid barcode is found.
// Keep the modal quiet and only surface startup failures from the outer catch block.
if (shouldLogDecodeErrors) {
const errorName = String(error?.name || 'UnknownError');
const now = Date.now();
if (errorName !== lastDecodeErrorName || now - lastDecodeErrorAt > 2000) {
console.debug('[scanner] Ignoring frame decode error while scanning:', errorName, error?.message || '');
lastDecodeErrorName = errorName;
lastDecodeErrorAt = now;
}
}
return;
}
},
);
} catch (error) { } catch (error) {
this.scannerState.error = this.normalizeScannerError(error); this.scannerState.error = this.normalizeScannerError(error);
} finally { } finally {
@@ -923,27 +923,12 @@ export function labelCreatePageData(store) {
} }
}, },
stopScanner() { stopScanner() {
try { stopCameraScanner({
this.scannerControls?.stop?.(); reader: this.scannerReader,
} catch { controls: this.scannerControls,
// Ignore cleanup errors when scanner is already stopped. videoElement: this.$refs.scannerVideo,
} });
this.scannerControls = null; this.scannerControls = null;
try {
this.scannerReader?.reset?.();
} catch {
// Ignore cleanup errors from stale reader state.
}
const videoElement = this.$refs.scannerVideo;
const stream = videoElement?.srcObject;
if (stream && typeof stream.getTracks === 'function') {
stream.getTracks().forEach((track) => track.stop());
}
if (videoElement) {
videoElement.srcObject = null;
}
}, },
closeScanner() { closeScanner() {
this.stopScanner(); this.stopScanner();
@@ -951,18 +936,293 @@ export function labelCreatePageData(store) {
this.scannerState.isLoading = false; this.scannerState.isLoading = false;
this.scannerState.error = ''; this.scannerState.error = '';
}, },
onBarcodeDetected(rawCode) { async resolveIdentifierCodeFromScan(rawCode) {
const code = this.normalizeIdentifierCode(rawCode); const parsed = parseKitchenScanPayload(rawCode);
if (!code || !this.scannerState.isOpen) { if (parsed.type === 'empty' || parsed.type === 'unknown') {
return {
identifierCode: '',
message: 'Scanned code could not be interpreted.',
level: 'warning',
};
}
if (parsed.type === 'item') {
const item = await getStockEntry(store, parsed.uuidB64, { allowInactive: true });
const itemIdentifierCode = this.normalizeIdentifierCode(item?.identifier_code);
if (!itemIdentifierCode) {
return {
identifierCode: '',
message: `${item?.name || 'Scanned item'} has no identifier code. Add one first, then scan again.`,
level: 'info',
};
}
return {
identifierCode: itemIdentifierCode,
message: `Resolved identifier ${itemIdentifierCode} from ${item?.name || 'scanned item'}.`,
level: 'success',
};
}
return {
identifierCode: this.normalizeIdentifierCode(parsed.identifierCode),
message: '',
level: 'success',
};
},
applyLookupResult(response, identifierCode, { announceSuccess = true } = {}) {
if (response.status !== 'ok') {
const message = this.lookupStatusMessageWithDetails(response, identifierCode);
this.lookupState.error = message;
store.addAlert({
type: response.status === 'not_found' ? 'info' : 'warning',
message,
});
return false;
}
if (!response.item || typeof response.item !== 'object') {
const message = 'Lookup returned no item payload to apply.';
this.lookupState.error = message;
store.addAlert({
type: 'warning',
message,
});
return false;
}
const mapped = mapLookupItemToForm({
form: this.form,
lookupItem: response.item,
locations: this.locations,
});
if (!mapped.didUpdate) {
const message = 'Lookup finished, but no compatible fields were returned.';
this.lookupState.error = message;
store.addAlert({
type: 'info',
message,
});
return false;
}
this.form = {
...mapped.form,
itemId: '',
itemUuidB64: '',
};
if (mapped.locationSearch !== null) {
this.locationSearch = mapped.locationSearch;
}
this.syncStockTypeState(this.form.stockType);
this.syncStockTypeSelect();
this.syncStockLevelSelect();
this.syncLocationValidity();
this.upsertPreview = null;
this.previewState.error = '';
this.submitError = '';
if (this.previewUrl.startsWith('blob:')) {
URL.revokeObjectURL(this.previewUrl);
}
this.previewUrl = '';
this.suggestions = [];
this.persistDraft();
if (announceSuccess) {
store.addAlert({
type: 'success',
message: this.lookupSuccessMessage(response),
});
}
return true;
},
async lookupIdentifierDetailsByCode(identifierCode, { announceSuccess = true } = {}) {
const normalizedCode = this.normalizeIdentifierCode(identifierCode);
this.form.identifierCode = normalizedCode;
this.lookupState.error = '';
if (!normalizedCode) {
this.lookupState.error = 'Provide an identifier code before lookup.';
return false;
}
const response = await lookupItemByIdentifier(store, normalizedCode);
return this.applyLookupResult(response, normalizedCode, { announceSuccess });
},
canAutoCreateFromForm() {
if (!String(this.form.name || '').trim()) {
return false;
}
if (!this.form.productionDate) {
return false;
}
if (!this.selectedLocation?.uuid_b64) {
return false;
}
if (this.form.stockType === 'measured') {
const quantity = Number(this.form.quantity);
if (Number.isNaN(quantity) || quantity <= 0) {
return false;
}
}
return true;
},
async createFromScannerAction({ shouldPrint = false } = {}) {
const entry = await applyItemUpsert(store, this.buildUpsertPayload());
const entryName = entry.item?.name || this.form.name;
const operationVerb = entry.operation === 'update' ? 'updated' : 'created';
const createdUuidB64 = entry.item?.uuid_b64 || null;
this.lastCreatedLabelUuidB64 = createdUuidB64 || '';
this.lastCreatedLabelName = entryName;
this.successMessage = `${entryName} was ${operationVerb} successfully.`;
this.upsertPreview = entry;
saveLabelDraft(this.form);
if (shouldPrint) {
if (!createdUuidB64) {
const message = `${entryName} was ${operationVerb}, but label printing is unavailable for this entry.`;
this.printIssue = message;
store.addAlert({
type: 'warning',
message,
});
return true;
}
try {
await printItemLabel(store, createdUuidB64);
const message = `${entryName} was ${operationVerb} and printed. Ready for next scan.`;
store.addAlert({
type: 'success',
message,
});
void this.openScanner().catch(() => {});
} catch (printError) {
const parsedPrintMessage = formatPrintErrorMessage(printError);
this.printIssue = `${entryName} was ${operationVerb}, but printing failed: ${parsedPrintMessage}`;
store.addAlert({
type: 'warning',
message: this.printIssue,
});
}
return true;
}
const message = `${entryName} was ${operationVerb}. Ready for next scan.`;
store.addAlert({
type: 'success',
message,
});
void this.openScanner().catch(() => {});
return true;
},
canRetryLastLabelPrint() {
return Boolean(this.lastCreatedLabelUuidB64);
},
async retryLastLabelPrint() {
if (!this.canRetryLastLabelPrint()) {
return; return;
} }
this.form.identifierCode = code; await runAsyncState(this.printState, async () => {
await printItemLabel(store, this.lastCreatedLabelUuidB64);
this.printIssue = '';
store.addAlert({
type: 'success',
message: `${this.lastCreatedLabelName || 'Label'} sent to printer.`,
});
}).catch((printError) => {
const parsedPrintMessage = formatPrintErrorMessage(printError);
const itemName = this.lastCreatedLabelName || 'Label';
this.printIssue = `Could not print ${itemName}: ${parsedPrintMessage}`;
});
},
async runScannerActionForCode(rawCode) {
try {
const resolved = await this.resolveIdentifierCodeFromScan(rawCode);
if (!resolved.identifierCode) {
store.addAlert({
type: resolved.level || 'warning',
message: resolved.message || 'Scanned code could not be used for lookup.',
});
return;
}
this.form.identifierCode = resolved.identifierCode;
if (resolved.message) {
store.addAlert({
type: resolved.level || 'info',
message: resolved.message,
});
}
const didLookupApply = await this.lookupIdentifierDetailsByCode(resolved.identifierCode, {
announceSuccess: this.scannerAction === 'lookup',
});
if (!didLookupApply) {
return;
}
if (this.scannerAction === 'lookup') {
return;
}
if (!this.canAutoCreateFromForm()) {
const message = 'Lookup filled part of the form. Complete required fields, then save or print.';
this.lookupState.error = message;
store.addAlert({
type: 'info',
message,
});
return;
}
this.submitError = '';
this.fieldErrors = {};
this.printIssue = '';
await runAsyncState(this.createState, async () => {
await this.createFromScannerAction({
shouldPrint: this.scannerAction === 'create_print',
});
}).catch((error) => {
this.fieldErrors = normalizeValidationError(error);
this.submitError = error.message || 'Could not create from scanned lookup.';
});
} catch (error) {
store.addAlert({
type: 'warning',
message: `Scanner action failed: ${error.message || 'Unknown error.'}`,
});
}
},
processScannerManualCode() {
const code = this.normalizeIdentifierCode(this.scannerManualCode);
if (!code) {
this.scannerState.error = 'Scan or enter a code first.';
return;
}
this.scannerState.lastDetectedCode = code; this.scannerState.lastDetectedCode = code;
this.scannerState.isProcessing = true;
this.closeScanner(); this.closeScanner();
store.addAlert({ this.runScannerActionForCode(code).finally(() => {
type: 'success', this.scannerState.isProcessing = false;
message: `Scanned identifier code: ${code}`, });
},
onBarcodeDetected(rawCode) {
const code = this.normalizeIdentifierCode(rawCode);
if (!code || !this.scannerState.isOpen || this.scannerState.isProcessing) {
return;
}
this.scannerState.lastDetectedCode = code;
this.scannerManualCode = code;
this.scannerState.isProcessing = true;
this.closeScanner();
this.runScannerActionForCode(rawCode).finally(() => {
this.scannerState.isProcessing = false;
}); });
}, },
async lookupIdentifierDetails() { async lookupIdentifierDetails() {
@@ -976,69 +1236,7 @@ export function labelCreatePageData(store) {
} }
await runAsyncState(this.lookupState, async () => { await runAsyncState(this.lookupState, async () => {
const response = await lookupItemByIdentifier(store, identifierCode); await this.lookupIdentifierDetailsByCode(identifierCode, { announceSuccess: true });
if (response.status !== 'ok') {
const message = this.lookupStatusMessageWithDetails(response, identifierCode);
this.lookupState.error = message;
store.addAlert({
type: response.status === 'not_found' ? 'info' : 'warning',
message,
});
return;
}
if (!response.item || typeof response.item !== 'object') {
const message = 'Lookup returned no item payload to apply.';
this.lookupState.error = message;
store.addAlert({
type: 'warning',
message,
});
return;
}
const mapped = mapLookupItemToForm({
form: this.form,
lookupItem: response.item,
locations: this.locations,
});
if (!mapped.didUpdate) {
const message = 'Lookup finished, but no compatible fields were returned.';
this.lookupState.error = message;
store.addAlert({
type: 'info',
message,
});
return;
}
this.form = {
...mapped.form,
itemId: '',
itemUuidB64: '',
};
if (mapped.locationSearch !== null) {
this.locationSearch = mapped.locationSearch;
}
this.syncStockTypeState(this.form.stockType);
this.syncStockTypeSelect();
this.syncStockLevelSelect();
this.syncLocationValidity();
this.upsertPreview = null;
this.previewState.error = '';
this.submitError = '';
if (this.previewUrl.startsWith('blob:')) {
URL.revokeObjectURL(this.previewUrl);
}
this.previewUrl = '';
this.suggestions = [];
this.persistDraft();
store.addAlert({
type: 'success',
message: this.lookupSuccessMessage(response),
});
}).catch((error) => { }).catch((error) => {
store.addAlert({ store.addAlert({
type: 'warning', type: 'warning',
@@ -1501,16 +1699,18 @@ export function labelCreatePageData(store) {
const entryName = entry.item?.name || this.form.name; const entryName = entry.item?.name || this.form.name;
const operationVerb = entry.operation === 'update' ? 'updated' : 'created'; const operationVerb = entry.operation === 'update' ? 'updated' : 'created';
const createdUuidB64 = entry.item?.uuid_b64 || null; const createdUuidB64 = entry.item?.uuid_b64 || null;
this.lastCreatedLabelUuidB64 = createdUuidB64 || '';
this.lastCreatedLabelName = entryName;
if (this.printLabelOnSave && createdUuidB64) { if (this.printLabelOnSave && createdUuidB64) {
try { try {
await printItemLabel(store, createdUuidB64); await printItemLabel(store, createdUuidB64);
} catch (printError) { } catch (printError) {
const parsedPrintMessage = formatPrintErrorMessage(printError); const parsedPrintMessage = formatPrintErrorMessage(printError);
this.printIssue = parsedPrintMessage; this.printIssue = `${entryName} was ${operationVerb}, but printing failed: ${parsedPrintMessage}`;
store.addAlert({ store.addAlert({
type: 'warning', type: 'warning',
message: `${entryName} was ${operationVerb}, but printing has an issue: ${parsedPrintMessage}`, message: this.printIssue,
}); });
} }
} }
@@ -1542,6 +1742,8 @@ export function labelCreatePageData(store) {
this.fieldErrors = {}; this.fieldErrors = {};
this.upsertPreview = null; this.upsertPreview = null;
this.printIssue = ''; this.printIssue = '';
this.lastCreatedLabelUuidB64 = '';
this.lastCreatedLabelName = '';
saveLabelDraft(this.form); saveLabelDraft(this.form);
if (revokePreview && this.previewUrl.startsWith('blob:')) { if (revokePreview && this.previewUrl.startsWith('blob:')) {
URL.revokeObjectURL(this.previewUrl); URL.revokeObjectURL(this.previewUrl);
+2
View File
@@ -6,6 +6,7 @@ import { kitchenSelectorData } from './kitchens/kitchen-selector.js';
import { labelCreatePageData } from './labels/label-create-page.js'; import { labelCreatePageData } from './labels/label-create-page.js';
import { stockDetailPageData } from './stock/stock-detail-page.js'; import { stockDetailPageData } from './stock/stock-detail-page.js';
import { stockListPageData } from './stock/stock-list-page.js'; import { stockListPageData } from './stock/stock-list-page.js';
import { stockScanPageData } from './stock/stock-scan-page.js';
export function registerFeatureData(Alpine, store) { export function registerFeatureData(Alpine, store) {
Alpine.data('alertsData', () => alertsData(store)); Alpine.data('alertsData', () => alertsData(store));
@@ -14,6 +15,7 @@ export function registerFeatureData(Alpine, store) {
Alpine.data('dashboardPage', () => dashboardPageData(store)); Alpine.data('dashboardPage', () => dashboardPageData(store));
Alpine.data('kitchenSelector', () => kitchenSelectorData(store)); Alpine.data('kitchenSelector', () => kitchenSelectorData(store));
Alpine.data('labelCreatePage', () => labelCreatePageData(store)); Alpine.data('labelCreatePage', () => labelCreatePageData(store));
Alpine.data('stockScanPage', () => stockScanPageData(store));
Alpine.data('stockListPage', () => stockListPageData(store)); Alpine.data('stockListPage', () => stockListPageData(store));
Alpine.data('stockDetailPage', () => stockDetailPageData(store)); Alpine.data('stockDetailPage', () => stockDetailPageData(store));
} }
+65
View File
@@ -0,0 +1,65 @@
export function renderScannerModal({
title = 'Scan barcode',
subtitle = 'Point your camera at the barcode.',
optionsMarkup = '',
manualCodeModel = 'scannerManualCode',
manualSubmitAction = 'processScannerManualCode()',
manualPlaceholder = 'Scan with hardware reader or paste code',
manualHelp = 'Manual entry works with keyboard-style barcode scanners.',
manualButtonLabel = 'Run',
manualDisabledExpression = 'scannerState.isLoading',
}) {
return `
<div
class="scanner-modal-backdrop"
x-show="scannerState.isOpen"
@click.self="closeScanner()"
@keydown.escape.window="closeScanner()"
>
<div class="scanner-modal card border-0 shadow-lg">
<div class="card-body p-3 p-md-4">
<div class="d-flex align-items-center justify-content-between gap-3 mb-3">
<div>
<h2 class="h5 mb-1">${title}</h2>
<p class="text-body-secondary small mb-0">${subtitle}</p>
</div>
<button class="btn btn-sm btn-outline-secondary" type="button" @click="closeScanner()">Close</button>
</div>
${optionsMarkup}
<form class="mb-3" @submit.prevent="${manualSubmitAction}">
<label class="form-label">Manual scan code</label>
<div class="input-group">
<input
class="form-control"
type="text"
x-model="${manualCodeModel}"
placeholder="${manualPlaceholder}"
autocomplete="off"
/>
<button class="btn btn-outline-primary" type="submit" :disabled="${manualDisabledExpression}">
${manualButtonLabel}
</button>
</div>
<div class="form-text">${manualHelp}</div>
</form>
<div class="scanner-video-shell mb-3">
<video class="scanner-video" x-ref="scannerVideo" autoplay muted playsinline></video>
</div>
<div class="d-flex flex-wrap align-items-center gap-2">
<div class="small text-body-secondary" x-show="scannerState.isLoading">Starting camera...</div>
<div class="small text-success" x-show="scannerState.lastDetectedCode" x-text="'Detected: ' + scannerState.lastDetectedCode"></div>
<button class="btn btn-outline-secondary btn-sm" type="button" @click="startScanner()" :disabled="scannerState.isLoading">Retry</button>
</div>
<template x-if="scannerState.error">
<div class="alert alert-warning py-2 mt-3 mb-0" x-text="scannerState.error"></div>
</template>
</div>
</div>
</div>
`;
}
+151
View File
@@ -0,0 +1,151 @@
import {
BarcodeFormat,
BrowserMultiFormatReader,
} from '@zxing/browser';
import { DecodeHintType } from '@zxing/library';
const KITCHEN_ITEM_PREFIX = 'kitchen:item::';
const UUID_B64_PATTERN = /^[A-Za-z0-9_-]{22}$/;
const UUID_B64_WITH_PADDING_PATTERN = /^[A-Za-z0-9_-]{22}={0,2}$/;
const SCANNER_FORMATS = [
BarcodeFormat.DATA_MATRIX,
BarcodeFormat.EAN_13,
BarcodeFormat.EAN_8,
BarcodeFormat.UPC_A,
BarcodeFormat.UPC_E,
BarcodeFormat.CODE_128,
BarcodeFormat.CODE_39,
BarcodeFormat.QR_CODE,
];
export function normalizeIdentifierCode(value) {
return String(value || '').replace(/\s+/g, '').trim();
}
export function parseKitchenScanPayload(rawValue) {
const value = normalizeIdentifierCode(rawValue);
if (!value) {
return { type: 'empty', raw: '' };
}
if (value.toLowerCase().startsWith(KITCHEN_ITEM_PREFIX)) {
const uuidB64 = value.slice(KITCHEN_ITEM_PREFIX.length).trim();
return uuidB64
? { type: 'item', uuidB64, raw: value }
: { type: 'unknown', raw: value };
}
// Backward compatibility: some labels/scanners provide the raw base64 UUID only.
if (UUID_B64_PATTERN.test(value) || UUID_B64_WITH_PADDING_PATTERN.test(value)) {
return {
type: 'item',
uuidB64: value.replace(/=+$/g, ''),
raw: value,
};
}
return { type: 'identifier', identifierCode: value, raw: value };
}
export function canUseCameraScanner() {
return Boolean(
typeof navigator !== 'undefined'
&& navigator.mediaDevices
&& typeof navigator.mediaDevices.getUserMedia === 'function',
);
}
export function createScannerReader() {
const hints = new Map();
hints.set(DecodeHintType.POSSIBLE_FORMATS, SCANNER_FORMATS);
return new BrowserMultiFormatReader(hints);
}
export function normalizeScannerError(error) {
const message = String(error?.message || '');
const normalized = message.toLowerCase();
if (error?.name === 'NotAllowedError' || normalized.includes('permission')) {
return 'Camera access was denied. Allow access to scan, or enter the code manually.';
}
if (error?.name === 'NotFoundError' || normalized.includes('requested device not found')) {
return 'No camera was found on this device. Enter the code manually.';
}
if (error?.name === 'NotReadableError' || normalized.includes('could not start video source')) {
return 'Camera is busy in another app. Close it there and try scanning again.';
}
return 'Could not start scanning. Enter the code manually.';
}
export async function startCameraScanner({
reader,
videoElement,
onDetected,
onDecodeError,
}) {
const activeReader = reader || createScannerReader();
const shouldLogDecodeErrors = import.meta.env.DEV;
let lastDecodeErrorName = '';
let lastDecodeErrorAt = 0;
const controls = await activeReader.decodeFromConstraints(
{
audio: false,
video: {
facingMode: { ideal: 'environment' },
},
},
videoElement,
(result, error) => {
if (result) {
onDetected?.(result.getText?.() || '');
return;
}
if (!error) {
return;
}
onDecodeError?.(error);
if (!shouldLogDecodeErrors) {
return;
}
const errorName = String(error?.name || 'UnknownError');
const now = Date.now();
if (errorName !== lastDecodeErrorName || now - lastDecodeErrorAt > 2000) {
console.debug('[scanner] Ignoring frame decode error while scanning:', errorName, error?.message || '');
lastDecodeErrorName = errorName;
lastDecodeErrorAt = now;
}
},
);
return { reader: activeReader, controls };
}
export function stopCameraScanner({ reader, controls, videoElement }) {
try {
controls?.stop?.();
} catch {
// Ignore cleanup errors when scanner is already stopped.
}
try {
reader?.reset?.();
} catch {
// Ignore cleanup errors from stale reader state.
}
const stream = videoElement?.srcObject;
if (stream && typeof stream.getTracks === 'function') {
stream.getTracks().forEach((track) => track.stop());
}
if (videoElement) {
videoElement.srcObject = null;
}
}
+77
View File
@@ -0,0 +1,77 @@
const LEVEL_TO_FACTOR = {
plenty: 0.75,
good: 0.50,
some: 0.25,
low: 0.10,
trace: 0.05,
gone: 0,
};
function levelFromRatio(ratio) {
if (ratio <= 0) {
return 'gone';
}
if (ratio >= 0.75) {
return 'plenty';
}
if (ratio >= 0.50) {
return 'good';
}
if (ratio >= 0.25) {
return 'some';
}
if (ratio >= 0.10) {
return 'low';
}
return 'trace';
}
export function buildGoneStockPayload(reason = 'consumed') {
return {
level: 'gone',
gone_reason: reason,
};
}
export function buildConsumeOneStockPayload(item) {
if (!item || item.active === false) {
return buildGoneStockPayload('consumed');
}
if (item.stock_type === 'binary') {
return buildGoneStockPayload('consumed');
}
const currentQuantity = Number(item.quantity || 0);
const nextQuantity = Math.max(currentQuantity - 1, 0);
if (item.stock_type === 'measured') {
return nextQuantity <= 0
? { quantity: 0, level: 'gone', gone_reason: 'consumed' }
: { quantity: nextQuantity };
}
if (item.stock_type === 'descriptive') {
const initialQuantity = Number(item.quantity_initial || 0);
if (!initialQuantity) {
return buildGoneStockPayload('consumed');
}
const nextLevel = levelFromRatio(nextQuantity / initialQuantity);
return nextLevel === 'gone'
? buildGoneStockPayload('consumed')
: { level: nextLevel };
}
const currentLevel = item.level || 'plenty';
const currentFactor = LEVEL_TO_FACTOR[currentLevel] ?? 1;
const initialQuantity = Number(item.quantity_initial || item.quantity || 1);
const estimatedQuantity = currentQuantity || currentFactor * initialQuantity;
const nextLevel = levelFromRatio(Math.max(estimatedQuantity - 1, 0) / initialQuantity);
return nextLevel === 'gone'
? buildGoneStockPayload('consumed')
: { level: nextLevel };
}
export function isGonePayload(payload) {
return payload?.level === 'gone' || Number(payload?.quantity) <= 0;
}
+238 -139
View File
@@ -1,14 +1,24 @@
import { import {
adjustStockEntry, adjustStockEntry,
getStockEntry, getStockEntry,
listStockEvents,
lookupItemDetails, lookupItemDetails,
markStockGone,
patchStockItem, patchStockItem,
useStockItem,
} from '../../api/stock.js'; } from '../../api/stock.js';
import { BrowserMultiFormatReader } from '@zxing/browser';
import { formatPrintErrorMessage, printItemLabel } from '../../api/labels.js'; import { formatPrintErrorMessage, printItemLabel } from '../../api/labels.js';
import { fetchLocations } from '../../api/locations.js'; import { fetchLocations } from '../../api/locations.js';
import { getRouteContext } from '../../app/router.js'; import { getRouteContext } from '../../app/router.js';
import { renderScannerModal } from '../shared/scanner-modal.js';
import {
canUseCameraScanner,
createScannerReader,
normalizeIdentifierCode,
normalizeScannerError,
parseKitchenScanPayload,
startCameraScanner,
stopCameraScanner,
} from '../shared/scanner.js';
import { createAsyncState, runAsyncState } from '../shared/ui-state.js'; import { createAsyncState, runAsyncState } from '../shared/ui-state.js';
import { formatDate } from '../shared/date-utils.js'; import { formatDate } from '../shared/date-utils.js';
@@ -30,10 +40,6 @@ function parseDateValue(value) {
return new Date(year, month - 1, day); return new Date(year, month - 1, day);
} }
function normalizeIdentifierCode(value) {
return String(value || '').replace(/\s+/g, '').trim();
}
function expirationInfo(entry) { function expirationInfo(entry) {
if (!entry?.expire_date) { if (!entry?.expire_date) {
return { return {
@@ -95,7 +101,7 @@ export function renderStockDetailPage() {
<section class="container-xxl py-4 py-lg-5" x-data="stockDetailPage()" x-init="init()"> <section class="container-xxl py-4 py-lg-5" x-data="stockDetailPage()" x-init="init()">
<div class="d-flex flex-column flex-lg-row justify-content-between gap-3 align-items-lg-center mb-4"> <div class="d-flex flex-column flex-lg-row justify-content-between gap-3 align-items-lg-center mb-4">
<div> <div>
<a href="#/stock" class="link-secondary text-decoration-none small">&larr; Back to stock</a> <a :href="backHref" class="link-secondary text-decoration-none small">&larr; <span x-text="backLabel"></span></a>
<h1 class="h3 mb-1 mt-2">Stock detail</h1> <h1 class="h3 mb-1 mt-2">Stock detail</h1>
<p class="text-body-secondary mb-0">Inspect the entry and update its quantity without leaving the workflow.</p> <p class="text-body-secondary mb-0">Inspect the entry and update its quantity without leaving the workflow.</p>
</div> </div>
@@ -283,8 +289,12 @@ export function renderStockDetailPage() {
<span x-show="!printState.isLoading">Print label</span> <span x-show="!printState.isLoading">Print label</span>
<span x-show="printState.isLoading">Printing...</span> <span x-show="printState.isLoading">Printing...</span>
</button> </button>
<button class="btn btn-outline-danger" type="button" @click="markGone()" :disabled="adjustmentState.isLoading"> <button class="btn btn-outline-danger" type="button" @click="markGone('consumed')" :disabled="adjustmentState.isLoading">
<span x-show="!adjustmentState.isLoading">Mark gone</span> <span x-show="!adjustmentState.isLoading">Mark used</span>
<span x-show="adjustmentState.isLoading">Removing...</span>
</button>
<button class="btn btn-outline-danger" type="button" @click="markGone('spoiled')" :disabled="adjustmentState.isLoading">
<span x-show="!adjustmentState.isLoading">Spoilt</span>
<span x-show="adjustmentState.isLoading">Removing...</span> <span x-show="adjustmentState.isLoading">Removing...</span>
</button> </button>
</div> </div>
@@ -325,8 +335,12 @@ export function renderStockDetailPage() {
<span x-show="!printState.isLoading">Print label</span> <span x-show="!printState.isLoading">Print label</span>
<span x-show="printState.isLoading">Printing...</span> <span x-show="printState.isLoading">Printing...</span>
</button> </button>
<button class="btn btn-outline-danger" type="button" @click="markGone()" :disabled="adjustmentState.isLoading"> <button class="btn btn-outline-danger" type="button" @click="markGone('consumed')" :disabled="adjustmentState.isLoading">
<span x-show="!adjustmentState.isLoading">Mark gone</span> <span x-show="!adjustmentState.isLoading">Mark used</span>
<span x-show="adjustmentState.isLoading">Removing...</span>
</button>
<button class="btn btn-outline-danger" type="button" @click="markGone('spoiled')" :disabled="adjustmentState.isLoading">
<span x-show="!adjustmentState.isLoading">Spoilt</span>
<span x-show="adjustmentState.isLoading">Removing...</span> <span x-show="adjustmentState.isLoading">Removing...</span>
</button> </button>
</div> </div>
@@ -336,7 +350,7 @@ export function renderStockDetailPage() {
<template x-if="entry.stock_type === 'binary'"> <template x-if="entry.stock_type === 'binary'">
<div class="vstack gap-3"> <div class="vstack gap-3">
<p class="text-body-secondary mb-0"> <p class="text-body-secondary mb-0">
Binary stock items can be marked gone from this screen. Binary stock items can be marked used or spoilt from this screen.
</p> </p>
<template x-if="adjustmentState.error"> <template x-if="adjustmentState.error">
@@ -350,14 +364,54 @@ export function renderStockDetailPage() {
></div> ></div>
</template> </template>
<button class="btn btn-outline-danger align-self-start" type="button" @click="markGone()" :disabled="adjustmentState.isLoading"> <div class="d-flex flex-wrap gap-2">
<span x-show="!adjustmentState.isLoading">Mark gone</span> <button class="btn btn-outline-danger" type="button" @click="markGone('consumed')" :disabled="adjustmentState.isLoading">
<span x-show="adjustmentState.isLoading">Removing...</span> <span x-show="!adjustmentState.isLoading">Mark used</span>
</button> <span x-show="adjustmentState.isLoading">Removing...</span>
<button class="btn btn-outline-secondary align-self-start" type="button" @click="printLabel()" :disabled="printState.isLoading"> </button>
<span x-show="!printState.isLoading">Print label</span> <button class="btn btn-outline-danger" type="button" @click="markGone('spoiled')" :disabled="adjustmentState.isLoading">
<span x-show="printState.isLoading">Printing...</span> <span x-show="!adjustmentState.isLoading">Spoilt</span>
</button> <span x-show="adjustmentState.isLoading">Removing...</span>
</button>
<button class="btn btn-outline-secondary" type="button" @click="printLabel()" :disabled="printState.isLoading">
<span x-show="!printState.isLoading">Print label</span>
<span x-show="printState.isLoading">Printing...</span>
</button>
</div>
</div>
</template>
</div>
</div>
<div class="card border-0 shadow-sm mt-4">
<div class="card-body p-4">
<div class="d-flex justify-content-between align-items-center gap-2 mb-3">
<div>
<p class="eyebrow mb-2">History</p>
<h2 class="h5 mb-0">Recent stock events</h2>
</div>
<button class="btn btn-sm btn-outline-secondary" type="button" @click="loadStockHistory()" :disabled="stockHistoryState.isLoading">
<span x-show="!stockHistoryState.isLoading">Refresh</span>
<span x-show="stockHistoryState.isLoading">Refreshing...</span>
</button>
</div>
<template x-if="stockHistoryState.error">
<div class="alert alert-warning py-2" x-text="stockHistoryState.error"></div>
</template>
<template x-if="!stockHistoryState.error && !stockEvents.length">
<div class="text-body-secondary small">No stock events yet.</div>
</template>
<template x-if="stockEvents.length">
<div class="list-group list-group-flush">
<template x-for="event in stockEvents" :key="event.id">
<div class="list-group-item px-0">
<div class="d-flex justify-content-between gap-2">
<div class="fw-semibold" x-text="stockEventLabel(event)"></div>
<div class="small text-body-secondary" x-text="formatDate(event.date)"></div>
</div>
<div class="small text-body-secondary" x-text="stockEventDetail(event)"></div>
</div>
</template>
</div> </div>
</template> </template>
</div> </div>
@@ -366,38 +420,15 @@ export function renderStockDetailPage() {
</div> </div>
</template> </template>
<div ${renderScannerModal({
class="scanner-modal-backdrop" title: 'Scan barcode',
x-show="scannerState.isOpen" subtitle: 'Point your camera at a product barcode or kitchen DataMatrix label.',
@click.self="closeScanner()" manualCodeModel: 'scannerManualCode',
@keydown.escape.window="closeScanner()" manualSubmitAction: 'processScannerManualCode()',
> manualPlaceholder: 'Scan with hardware reader or paste code',
<div class="scanner-modal card border-0 shadow-lg"> manualHelp: 'Use this with keyboard-style barcode scanners or manual entry.',
<div class="card-body p-3 p-md-4"> manualDisabledExpression: 'identifierState.isLoading || scannerState.isLoading || scannerState.isProcessing',
<div class="d-flex align-items-center justify-content-between gap-3 mb-3"> })}
<div>
<h2 class="h5 mb-1">Scan barcode</h2>
<p class="text-body-secondary small mb-0">Point your camera at the barcode to fill the identifier field.</p>
</div>
<button class="btn btn-sm btn-outline-secondary" type="button" @click="closeScanner()">Close</button>
</div>
<div class="scanner-video-shell mb-3">
<video class="scanner-video" x-ref="scannerVideo" autoplay muted playsinline></video>
</div>
<div class="d-flex flex-wrap align-items-center gap-2">
<div class="small text-body-secondary" x-show="scannerState.isLoading">Starting camera...</div>
<div class="small text-success" x-show="scannerState.lastDetectedCode" x-text="'Detected: ' + scannerState.lastDetectedCode"></div>
<button class="btn btn-outline-secondary btn-sm" type="button" @click="startScanner()" :disabled="scannerState.isLoading">Retry</button>
</div>
<template x-if="scannerState.error">
<div class="alert alert-warning py-2 mt-3 mb-0" x-text="scannerState.error"></div>
</template>
</div>
</div>
</div>
</section> </section>
`; `;
} }
@@ -408,11 +439,13 @@ export function stockDetailPageData(store) {
adjustmentState: createAsyncState(), adjustmentState: createAsyncState(),
printState: createAsyncState(), printState: createAsyncState(),
identifierState: createAsyncState(), identifierState: createAsyncState(),
stockHistoryState: createAsyncState(),
scannerReader: null, scannerReader: null,
scannerControls: null, scannerControls: null,
scannerState: { scannerState: {
isOpen: false, isOpen: false,
isLoading: false, isLoading: false,
isProcessing: false,
hasCamera: false, hasCamera: false,
error: '', error: '',
lastDetectedCode: '', lastDetectedCode: '',
@@ -426,9 +459,13 @@ export function stockDetailPageData(store) {
type: '', type: '',
message: '', message: '',
}, },
backHref: '#/stock',
backLabel: 'Back to stock',
entry: null, entry: null,
stockEvents: [],
locationPathByUuid: {}, locationPathByUuid: {},
identifierDraft: '', identifierDraft: '',
scannerManualCode: '',
adjustment: { adjustment: {
mode: 'increment', mode: 'increment',
quantity: '1', quantity: '1',
@@ -436,6 +473,11 @@ export function stockDetailPageData(store) {
}, },
async init() { async init() {
this.scannerState.hasCamera = this.canUseCameraScanner(); this.scannerState.hasCamera = this.canUseCameraScanner();
const routeContext = getRouteContext();
if (routeContext?.query?.from === 'scan') {
this.backHref = '#/scan';
this.backLabel = 'Back to scan';
}
if (!store.isConnected) { if (!store.isConnected) {
return; return;
} }
@@ -455,38 +497,22 @@ export function stockDetailPageData(store) {
); );
this.adjustment.level = this.entry?.level || 'plenty'; this.adjustment.level = this.entry?.level || 'plenty';
}).catch(() => {}); }).catch(() => {});
this.loadStockHistory().catch(() => {});
}, },
destroy() { destroy() {
this.stopScanner(); this.stopScanner();
}, },
canUseCameraScanner() { canUseCameraScanner() {
return Boolean( return canUseCameraScanner();
typeof navigator !== 'undefined'
&& navigator.mediaDevices
&& typeof navigator.mediaDevices.getUserMedia === 'function',
);
}, },
normalizeScannerError(error) { normalizeScannerError(error) {
const message = String(error?.message || ''); return normalizeScannerError(error);
const normalized = message.toLowerCase();
if (error?.name === 'NotAllowedError' || normalized.includes('permission')) {
return 'Camera access was denied. Allow access to scan, or enter the code manually.';
}
if (error?.name === 'NotFoundError' || normalized.includes('requested device not found')) {
return 'No camera was found on this device. Enter the identifier code manually.';
}
if (error?.name === 'NotReadableError' || normalized.includes('could not start video source')) {
return 'Camera is busy in another app. Close it there and try scanning again.';
}
return 'Could not start barcode scanning. Enter the identifier code manually.';
}, },
async openScanner() { async openScanner() {
this.scannerState.error = ''; this.scannerState.error = '';
this.scannerState.lastDetectedCode = ''; this.scannerState.lastDetectedCode = '';
this.scannerState.isProcessing = false;
this.scannerManualCode = normalizeIdentifierCode(this.identifierDraft);
this.scannerState.isOpen = true; this.scannerState.isOpen = true;
await this.$nextTick(); await this.$nextTick();
await this.startScanner(); await this.startScanner();
@@ -509,45 +535,19 @@ export function stockDetailPageData(store) {
this.stopScanner(); this.stopScanner();
this.scannerState.isLoading = true; this.scannerState.isLoading = true;
const shouldLogDecodeErrors = import.meta.env.DEV;
let lastDecodeErrorName = '';
let lastDecodeErrorAt = 0;
try { try {
if (!this.scannerReader) { if (!this.scannerReader) {
this.scannerReader = new BrowserMultiFormatReader(); this.scannerReader = createScannerReader();
} }
this.scannerControls = await this.scannerReader.decodeFromConstraints( const session = await startCameraScanner({
{ reader: this.scannerReader,
audio: false,
video: {
facingMode: { ideal: 'environment' },
},
},
videoElement, videoElement,
(result, error) => { onDetected: (code) => this.onBarcodeDetected(code),
if (result) { });
this.onBarcodeDetected(result.getText?.() || ''); this.scannerReader = session.reader;
return; this.scannerControls = session.controls;
}
if (error) {
// Continuous decode emits expected per-frame misses/errors before a valid barcode is found.
// Keep the modal quiet and only surface startup failures from the outer catch block.
if (shouldLogDecodeErrors) {
const errorName = String(error?.name || 'UnknownError');
const now = Date.now();
if (errorName !== lastDecodeErrorName || now - lastDecodeErrorAt > 2000) {
console.debug('[scanner] Ignoring frame decode error while scanning:', errorName, error?.message || '');
lastDecodeErrorName = errorName;
lastDecodeErrorAt = now;
}
}
return;
}
},
);
} catch (error) { } catch (error) {
this.scannerState.error = this.normalizeScannerError(error); this.scannerState.error = this.normalizeScannerError(error);
} finally { } finally {
@@ -555,27 +555,12 @@ export function stockDetailPageData(store) {
} }
}, },
stopScanner() { stopScanner() {
try { stopCameraScanner({
this.scannerControls?.stop?.(); reader: this.scannerReader,
} catch { controls: this.scannerControls,
// Ignore cleanup errors when scanner is already stopped. videoElement: this.$refs.scannerVideo,
} });
this.scannerControls = null; this.scannerControls = null;
try {
this.scannerReader?.reset?.();
} catch {
// Ignore cleanup errors from stale reader state.
}
const videoElement = this.$refs.scannerVideo;
const stream = videoElement?.srcObject;
if (stream && typeof stream.getTracks === 'function') {
stream.getTracks().forEach((track) => track.stop());
}
if (videoElement) {
videoElement.srcObject = null;
}
}, },
closeScanner() { closeScanner() {
this.stopScanner(); this.stopScanner();
@@ -583,18 +568,75 @@ export function stockDetailPageData(store) {
this.scannerState.isLoading = false; this.scannerState.isLoading = false;
this.scannerState.error = ''; this.scannerState.error = '';
}, },
onBarcodeDetected(rawCode) { async applyScannedCode(rawCode) {
const code = normalizeIdentifierCode(rawCode); const parsed = parseKitchenScanPayload(rawCode);
if (!code || !this.scannerState.isOpen) { if (parsed.type === 'empty' || parsed.type === 'unknown') {
store.addAlert({
type: 'warning',
message: 'Scanned code could not be interpreted.',
});
return; return;
} }
this.identifierDraft = code; let identifierCode = '';
this.scannerState.lastDetectedCode = code; if (parsed.type === 'item') {
this.closeScanner(); const scannedItem = await getStockEntry(store, parsed.uuidB64, { allowInactive: true });
identifierCode = normalizeIdentifierCode(scannedItem?.identifier_code);
if (!identifierCode) {
store.addAlert({
type: 'info',
message: `${scannedItem?.name || 'Scanned item'} has no identifier code saved.`,
});
return;
}
store.addAlert({
type: 'success',
message: `Loaded identifier ${identifierCode} from ${scannedItem?.name || 'scanned item'}.`,
});
} else {
identifierCode = normalizeIdentifierCode(parsed.identifierCode);
}
if (!identifierCode) {
store.addAlert({
type: 'warning',
message: 'No identifier code found in scan.',
});
return;
}
this.identifierDraft = identifierCode;
this.scannerManualCode = identifierCode;
store.addAlert({ store.addAlert({
type: 'success', type: 'success',
message: `Scanned identifier code: ${code}`, message: `Scanned identifier code: ${identifierCode}`,
});
},
processScannerManualCode() {
const code = normalizeIdentifierCode(this.scannerManualCode);
if (!code) {
this.scannerState.error = 'Scan or enter a code first.';
return;
}
this.scannerState.lastDetectedCode = code;
this.scannerState.isProcessing = true;
this.closeScanner();
this.applyScannedCode(code).finally(() => {
this.scannerState.isProcessing = false;
});
},
onBarcodeDetected(rawCode) {
const code = normalizeIdentifierCode(rawCode);
if (!code || !this.scannerState.isOpen || this.scannerState.isProcessing) {
return;
}
this.scannerState.lastDetectedCode = code;
this.scannerManualCode = code;
this.scannerState.isProcessing = true;
this.closeScanner();
this.applyScannedCode(rawCode).finally(() => {
this.scannerState.isProcessing = false;
}); });
}, },
async saveIdentifierCode() { async saveIdentifierCode() {
@@ -761,6 +803,7 @@ export function stockDetailPageData(store) {
}); });
this.identifierDraft = normalizeIdentifierCode(this.entry?.identifier_code); this.identifierDraft = normalizeIdentifierCode(this.entry?.identifier_code);
store.addAlert({ type: 'success', message: 'Stock quantity updated.' }); store.addAlert({ type: 'success', message: 'Stock quantity updated.' });
this.loadStockHistory().catch(() => {});
}).catch(() => {}); }).catch(() => {});
}, },
async submitLevelAdjustment() { async submitLevelAdjustment() {
@@ -771,8 +814,13 @@ export function stockDetailPageData(store) {
await runAsyncState(this.adjustmentState, async () => { await runAsyncState(this.adjustmentState, async () => {
if (this.adjustment.level === 'gone') { if (this.adjustment.level === 'gone') {
const entryName = this.entry.name; const entryName = this.entry.name;
await useStockItem(store, this.entry.uuid_b64); const result = await markStockGone(store, this.entry.uuid_b64, 'consumed');
store.addAlert({ type: 'success', message: `${entryName} was marked gone.` }); store.addAlert({
type: result.status === 'already_gone' ? 'info' : 'success',
message: result.status === 'already_gone'
? `${entryName} was already out of stock.`
: `${entryName} was marked used.`,
});
window.__loncApp.navigate('/stock'); window.__loncApp.navigate('/stock');
return; return;
} }
@@ -782,25 +830,76 @@ export function stockDetailPageData(store) {
}); });
this.identifierDraft = normalizeIdentifierCode(this.entry?.identifier_code); this.identifierDraft = normalizeIdentifierCode(this.entry?.identifier_code);
store.addAlert({ type: 'success', message: 'Stock level updated.' }); store.addAlert({ type: 'success', message: 'Stock level updated.' });
this.loadStockHistory().catch(() => {});
}).catch(() => {}); }).catch(() => {});
}, },
async markGone() { async markGone(reason = 'consumed') {
if (!this.entry) { if (!this.entry) {
return; return;
} }
await runAsyncState(this.adjustmentState, async () => { await runAsyncState(this.adjustmentState, async () => {
const result = await useStockItem(store, this.entry.uuid_b64); const entryName = this.entry.name;
const result = await markStockGone(store, this.entry.uuid_b64, reason);
const alreadyGone = result.status === 'already_gone'; const alreadyGone = result.status === 'already_gone';
const actionLabel = reason === 'spoiled' ? 'marked spoilt' : 'marked used';
store.addAlert({ store.addAlert({
type: alreadyGone ? 'info' : 'success', type: alreadyGone ? 'info' : 'success',
message: alreadyGone message: alreadyGone
? `${this.entry.name} was already out of stock.` ? `${entryName} was already out of stock.`
: `${this.entry.name} was marked gone.`, : `${entryName} was ${actionLabel}.`,
}); });
window.__loncApp.navigate('/stock'); window.__loncApp.navigate('/stock');
}).catch(() => {}); }).catch(() => {});
}, },
async loadStockHistory() {
if (!this.entry?.uuid_b64) {
return;
}
await runAsyncState(this.stockHistoryState, async () => {
this.stockEvents = await listStockEvents(store, this.entry.uuid_b64, {
allowInactive: true,
limit: 8,
orderBy: 'date',
orderDir: 'desc',
});
}).catch(() => {});
},
goneReasonLabel(reason) {
if (reason === 'consumed') {
return 'Consumed';
}
if (reason === 'spoiled') {
return 'Spoilt';
}
if (reason === 'other') {
return 'Other removal';
}
return '';
},
stockEventLabel(event) {
if (event?.level === 'gone') {
return this.goneReasonLabel(event.gone_reason) || 'Gone';
}
if (event?.level) {
return `Level: ${event.level}`;
}
return 'Quantity updated';
},
stockEventDetail(event) {
const parts = [];
if (event?.quantity !== null && event?.quantity !== undefined) {
parts.push(`Quantity: ${event.quantity}${event.uom_symbol ? ` ${event.uom_symbol}` : ''}`);
}
if (event?.level && event.level !== 'gone') {
parts.push(`Level: ${event.level}`);
}
if (event?.gone_reason) {
parts.push(`Reason: ${this.goneReasonLabel(event.gone_reason).toLowerCase()}`);
}
return parts.join(' · ') || 'Stock event saved.';
},
async printLabel() { async printLabel() {
if (!this.entry?.uuid_b64) { if (!this.entry?.uuid_b64) {
return; return;
+29 -20
View File
@@ -3,8 +3,8 @@ import {
listGroupedStockEntries, listGroupedStockEntries,
listKitchenChanges, listKitchenChanges,
listStockEntries, listStockEntries,
markStockGone,
updateStockItem, updateStockItem,
useStockItem,
} from '../../api/stock.js'; } from '../../api/stock.js';
import { fetchLocations } from '../../api/locations.js'; import { fetchLocations } from '../../api/locations.js';
import { STORAGE_KEYS } from '../../app/config.js'; import { STORAGE_KEYS } from '../../app/config.js';
@@ -578,7 +578,8 @@ export function renderStockListPage() {
<div class="quick-edit-stack"> <div class="quick-edit-stack">
<template x-if="entry.stock_type === 'binary'"> <template x-if="entry.stock_type === 'binary'">
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="updateBinary(entry, 'gone')">Mark gone</button> <button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'spoiled')">Spoilt</button>
</div> </div>
</template> </template>
<template x-if="entry.stock_type === 'descriptive'"> <template x-if="entry.stock_type === 'descriptive'">
@@ -589,14 +590,16 @@ export function renderStockListPage() {
</template> </template>
</select> </select>
<button class="btn btn-sm btn-primary" type="button" @click="saveLevel(entry)">Save</button> <button class="btn btn-sm btn-primary" type="button" @click="saveLevel(entry)">Save</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry)">Mark gone</button> <button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'spoiled')">Spoilt</button>
</div> </div>
</template> </template>
<template x-if="entry.stock_type === 'measured'"> <template x-if="entry.stock_type === 'measured'">
<div class="d-flex flex-wrap gap-2 align-items-center"> <div class="d-flex flex-wrap gap-2 align-items-center">
<input class="form-control form-control-sm quick-number" type="number" step="0.01" min="0" x-model="editForms[entry.id].quantity" /> <input class="form-control form-control-sm quick-number" type="number" step="0.01" min="0" x-model="editForms[entry.id].quantity" />
<button class="btn btn-sm btn-primary" type="button" @click="saveQuantity(entry)">Save qty</button> <button class="btn btn-sm btn-primary" type="button" @click="saveQuantity(entry)">Save qty</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry)">Mark gone</button> <button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'spoiled')">Spoilt</button>
</div> </div>
</template> </template>
<template x-if="editErrors[entry.id]"> <template x-if="editErrors[entry.id]">
@@ -660,7 +663,8 @@ export function renderStockListPage() {
<div class="quick-edit-stack"> <div class="quick-edit-stack">
<template x-if="entry.stock_type === 'binary'"> <template x-if="entry.stock_type === 'binary'">
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="updateBinary(entry, 'gone')">Mark gone</button> <button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'spoiled')">Spoilt</button>
</div> </div>
</template> </template>
<template x-if="entry.stock_type === 'descriptive'"> <template x-if="entry.stock_type === 'descriptive'">
@@ -672,7 +676,8 @@ export function renderStockListPage() {
</select> </select>
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
<button class="btn btn-sm btn-primary" type="button" @click="saveLevel(entry)">Save stock level</button> <button class="btn btn-sm btn-primary" type="button" @click="saveLevel(entry)">Save stock level</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry)">Mark gone</button> <button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'spoiled')">Spoilt</button>
</div> </div>
</div> </div>
</template> </template>
@@ -681,7 +686,8 @@ export function renderStockListPage() {
<input class="form-control form-control-sm" type="number" step="0.01" min="0" x-model="editForms[entry.id].quantity" /> <input class="form-control form-control-sm" type="number" step="0.01" min="0" x-model="editForms[entry.id].quantity" />
<div class="d-flex flex-wrap gap-2"> <div class="d-flex flex-wrap gap-2">
<button class="btn btn-sm btn-primary" type="button" @click="saveQuantity(entry)">Save quantity</button> <button class="btn btn-sm btn-primary" type="button" @click="saveQuantity(entry)">Save quantity</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry)">Mark gone</button> <button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger" type="button" :disabled="isItemRefreshing(entry)" @click="markGone(entry, 'spoiled')">Spoilt</button>
</div> </div>
</div> </div>
</template> </template>
@@ -796,7 +802,8 @@ export function renderStockListPage() {
> >
Details Details
</a> </a>
<button class="btn btn-sm btn-outline-danger grouped-stock-mark-gone" type="button" :disabled="isItemRefreshing(item)" @click="markGoneFromGroup(item, group)">Mark gone</button> <button class="btn btn-sm btn-outline-danger grouped-stock-mark-gone" type="button" :disabled="isItemRefreshing(item)" @click="markGoneFromGroup(item, group, 'consumed')">Mark used</button>
<button class="btn btn-sm btn-outline-danger grouped-stock-mark-gone" type="button" :disabled="isItemRefreshing(item)" @click="markGoneFromGroup(item, group, 'spoiled')">Spoilt</button>
<div class="small text-body-secondary stock-item-refresh-indicator" x-show="isItemRefreshing(item)"> <div class="small text-body-secondary stock-item-refresh-indicator" x-show="isItemRefreshing(item)">
Refreshing... Refreshing...
</div> </div>
@@ -2202,12 +2209,12 @@ export function stockListPageData(store) {
return; return;
} }
await this.useEntry(entry); await this.useEntry(entry, 'consumed');
}, },
async saveLevel(entry) { async saveLevel(entry) {
const level = this.editForms[entry.id]?.level || 'plenty'; const level = this.editForms[entry.id]?.level || 'plenty';
if (level === 'gone') { if (level === 'gone') {
await this.useEntry(entry); await this.useEntry(entry, 'consumed');
return; return;
} }
@@ -2234,14 +2241,14 @@ export function stockListPageData(store) {
{ quantity }, { quantity },
); );
}, },
async markGone(entry) { async markGone(entry, reason = 'consumed') {
if (this.isItemRefreshing(entry)) { if (this.isItemRefreshing(entry)) {
return; return;
} }
await this.useEntry(entry); await this.useEntry(entry, reason);
}, },
async markGoneFromGroup(item, group) { async markGoneFromGroup(item, group, reason = 'consumed') {
if (this.isItemRefreshing(item)) { if (this.isItemRefreshing(item)) {
return; return;
} }
@@ -2249,8 +2256,9 @@ export function stockListPageData(store) {
this.editErrors[item.id] = ''; this.editErrors[item.id] = '';
try { try {
const result = await useStockItem(store, item.uuid_b64); const result = await markStockGone(store, item.uuid_b64, reason);
const alreadyGone = result.status === 'already_gone'; const alreadyGone = result.status === 'already_gone';
const actionLabel = reason === 'spoiled' ? 'marked spoilt' : 'marked used';
this.removeGroupedItem(group.id, item.id); this.removeGroupedItem(group.id, item.id);
this.removeEntryLocally(item.id); this.removeEntryLocally(item.id);
delete this.editForms[item.id]; delete this.editForms[item.id];
@@ -2259,11 +2267,11 @@ export function stockListPageData(store) {
type: alreadyGone ? 'info' : 'success', type: alreadyGone ? 'info' : 'success',
message: alreadyGone message: alreadyGone
? `${item.name} was already out of stock and removed from the group.` ? `${item.name} was already out of stock and removed from the group.`
: `${item.name} was marked gone and removed from the group.`, : `${item.name} was ${actionLabel} and removed from the group.`,
}); });
this.loadGroupedEntries({ expanded: 0, background: true }).catch(() => {}); this.loadGroupedEntries({ expanded: 0, background: true }).catch(() => {});
} catch (error) { } catch (error) {
this.editErrors[item.id] = error.message || 'Mark gone failed.'; this.editErrors[item.id] = error.message || 'Removal failed.';
} }
}, },
async saveEntryUpdate(entry, payload, localPatch) { async saveEntryUpdate(entry, payload, localPatch) {
@@ -2281,7 +2289,7 @@ export function stockListPageData(store) {
this.editErrors[entry.id] = error.message || 'Update failed.'; this.editErrors[entry.id] = error.message || 'Update failed.';
} }
}, },
async useEntry(entry) { async useEntry(entry, reason = 'consumed') {
if (this.isItemRefreshing(entry)) { if (this.isItemRefreshing(entry)) {
return; return;
} }
@@ -2289,8 +2297,9 @@ export function stockListPageData(store) {
this.editErrors[entry.id] = ''; this.editErrors[entry.id] = '';
try { try {
const result = await useStockItem(store, entry.uuid_b64); const result = await markStockGone(store, entry.uuid_b64, reason);
const alreadyGone = result.status === 'already_gone'; const alreadyGone = result.status === 'already_gone';
const actionLabel = reason === 'spoiled' ? 'marked spoilt' : 'marked used';
this.removeEntryLocally(entry.id); this.removeEntryLocally(entry.id);
delete this.editForms[entry.id]; delete this.editForms[entry.id];
delete this.editErrors[entry.id]; delete this.editErrors[entry.id];
@@ -2298,11 +2307,11 @@ export function stockListPageData(store) {
type: alreadyGone ? 'info' : 'success', type: alreadyGone ? 'info' : 'success',
message: alreadyGone message: alreadyGone
? `${entry.name} was already out of stock and removed from the list.` ? `${entry.name} was already out of stock and removed from the list.`
: `${entry.name} was marked gone and removed from the list.`, : `${entry.name} was ${actionLabel} and removed from the list.`,
}); });
this.refreshLoadedViewsInBackground().catch(() => {}); this.refreshLoadedViewsInBackground().catch(() => {});
} catch (error) { } catch (error) {
this.editErrors[entry.id] = error.message || 'Mark gone failed.'; this.editErrors[entry.id] = error.message || 'Removal failed.';
} }
}, },
removeEntryLocally(entryId) { removeEntryLocally(entryId) {
+825
View File
@@ -0,0 +1,825 @@
import {
applyItemUpsert,
createStockEvent,
getStockEntry,
listStockEntries,
lookupItemByIdentifier,
markStockGone,
} from '../../api/stock.js';
import { formatPrintErrorMessage, printItemLabel } from '../../api/labels.js';
import { fetchLocations } from '../../api/locations.js';
import { STORAGE_KEYS } from '../../app/config.js';
import { mapLookupItemToForm } from '../labels/identifier-lookup-mapper.js';
import { saveStoredValue } from '../shared/storage.js';
import { createAsyncState, runAsyncState } from '../shared/ui-state.js';
import { formatDate } from '../shared/date-utils.js';
import { renderScannerModal } from '../shared/scanner-modal.js';
import {
canUseCameraScanner,
createScannerReader,
normalizeIdentifierCode,
normalizeScannerError,
parseKitchenScanPayload,
startCameraScanner,
stopCameraScanner,
} from '../shared/scanner.js';
import {
buildConsumeOneStockPayload,
isGonePayload,
} from '../shared/stock-actions.js';
const SCAN_MODES = [
{
key: 'details',
label: 'Open details',
description: 'Scan and inspect the exact item.',
},
{
key: 'consume',
label: 'Consume standard unit',
description: 'Reduce stock by one standard unit.',
},
{
key: 'used',
label: 'Mark used',
description: 'Mark the item gone because it was consumed.',
},
{
key: 'spoiled',
label: 'Mark spoiled',
description: 'Mark the item gone because it spoiled.',
},
{
key: 'label',
label: 'Label workflow',
description: 'Lookup product data and continue to label creation.',
},
];
const LABEL_SCAN_ACTIONS = [
{
key: 'lookup',
label: 'Lookup',
description: 'Open label form with prefilled lookup data.',
},
{
key: 'create',
label: 'Create',
description: 'Create stock label directly when lookup has enough data.',
},
{
key: 'create_print',
label: 'Create & print',
description: 'Create and print when data is sufficient.',
},
];
function parseDateValue(value) {
if (!value) {
return null;
}
const [year, month, day] = String(value).split('-').map(Number);
if (!year || !month || !day) {
return null;
}
return new Date(year, month - 1, day);
}
function sortByOperationalPriority(entries, locationMap) {
return [...entries].sort((left, right) => {
const leftDate = parseDateValue(left.expire_date)?.getTime() ?? Number.MAX_SAFE_INTEGER;
const rightDate = parseDateValue(right.expire_date)?.getTime() ?? Number.MAX_SAFE_INTEGER;
if (leftDate !== rightDate) {
return leftDate - rightDate;
}
const leftLocation = locationMap[left.location_initial_uuid_b64] || '';
const rightLocation = locationMap[right.location_initial_uuid_b64] || '';
if (leftLocation !== rightLocation) {
return leftLocation.localeCompare(rightLocation);
}
return (left.name || '').localeCompare(right.name || '');
});
}
function quantityLabel(entry) {
if (!entry) {
return '';
}
if (entry.stock_type === 'binary') {
return entry.level === 'gone' ? 'Gone' : 'Available';
}
const quantity = entry.quantity ?? null;
const uom = entry.uom_symbol || '';
const measured = quantity !== null && quantity !== undefined ? `${quantity} ${uom}`.trim() : '';
return measured || entry.level || 'No quantity';
}
function todayIsoDate() {
const now = new Date();
const year = now.getFullYear();
const month = String(now.getMonth() + 1).padStart(2, '0');
const day = String(now.getDate()).padStart(2, '0');
return `${year}-${month}-${day}`;
}
function createLabelDraftBase() {
return {
itemId: '',
itemUuidB64: '',
identifierCode: '',
externalSource: '',
externalId: '',
search: '',
name: '',
description: '',
quantity: '',
uom: 'g',
stockType: 'binary',
level: 'plenty',
energy: '',
energyUnit: 'kcal (100g/ml)',
productionDate: todayIsoDate(),
expireDays: '',
expirationDate: '',
locationId: '',
};
}
export function renderStockScanPage() {
const scannerOptionsMarkup = `
<div class="scan-modal-mode-list mb-3">
<template x-for="mode in scanModes" :key="'modal-' + mode.key">
<button
class="btn btn-sm scan-modal-mode-btn"
type="button"
:class="scanMode === mode.key ? 'scan-modal-mode-btn-active' : 'btn-outline-secondary'"
@click="scanMode = mode.key"
>
<span x-text="mode.label"></span>
</button>
</template>
</div>
<template x-if="scanMode === 'label'">
<div class="scan-label-mode-list mb-3">
<template x-for="action in labelScanActions" :key="'modal-label-' + action.key">
<button
class="btn btn-sm scan-label-mode-btn"
type="button"
:class="labelScanAction === action.key ? 'scan-label-mode-btn-active' : 'btn-outline-secondary'"
@click="labelScanAction = action.key"
>
<span x-text="action.label"></span>
</button>
</template>
</div>
</template>
`;
return `
<section class="container-xxl py-4 py-lg-5" x-data="stockScanPage()" x-init="init()">
<div class="scan-hero card border-0 shadow-sm mb-4">
<div class="card-body p-4 p-lg-5">
<div class="d-flex flex-column flex-lg-row justify-content-between gap-4">
<div>
<p class="eyebrow mb-2">Scan operations</p>
<h1 class="h3 mb-2">Scan a label or barcode and act immediately.</h1>
<p class="text-body-secondary mb-0">
DataMatrix labels open the exact stock item. Product barcodes resolve matching active stock and ask when there is ambiguity.
</p>
</div>
<div class="d-flex align-items-start gap-2">
<button class="btn btn-primary btn-lg" type="button" @click="openScanner()" :disabled="!scannerState.hasCamera || actionState.isLoading">
Start camera
</button>
<a class="btn btn-outline-secondary btn-lg" href="#/stock">Browse stock</a>
</div>
</div>
</div>
</div>
<div class="row g-4">
<div class="col-12 col-xl-5">
<div class="card border-0 shadow-sm h-100">
<div class="card-body p-4">
<h2 class="h5 mb-3">Choose scan action</h2>
<div class="scan-mode-grid">
<template x-for="mode in scanModes" :key="mode.key">
<button
class="scan-mode-card"
type="button"
:class="scanMode === mode.key ? 'scan-mode-card-active' : ''"
@click="scanMode = mode.key"
>
<span class="fw-semibold" x-text="mode.label"></span>
<span class="small text-body-secondary" x-text="mode.description"></span>
</button>
</template>
</div>
<template x-if="scanMode === 'label'">
<div class="mt-3">
<label class="form-label mb-2">Label action</label>
<div class="scan-label-mode-list">
<template x-for="action in labelScanActions" :key="action.key">
<button
class="btn btn-sm scan-label-mode-btn"
type="button"
:class="labelScanAction === action.key ? 'scan-label-mode-btn-active' : 'btn-outline-secondary'"
@click="labelScanAction = action.key"
>
<span x-text="action.label"></span>
</button>
</template>
</div>
<div class="small text-body-secondary mt-2" x-text="activeLabelActionDescription()"></div>
</div>
</template>
<div class="mt-4">
<label class="form-label">Manual scan code</label>
<div class="input-group">
<input class="form-control" type="text" x-model="manualCode" placeholder="Scan with hardware reader or paste code" autocomplete="off" />
<button class="btn btn-outline-primary" type="button" @click="processManualCode()" :disabled="actionState.isLoading">Run</button>
</div>
<div class="form-text">Works with keyboard-style barcode scanners and manual paste.</div>
</div>
<template x-if="!scannerState.hasCamera">
<div class="alert alert-warning mt-4 mb-0">
Camera scanning is not available in this browser. Manual entry still works.
</div>
</template>
</div>
</div>
</div>
<div class="col-12 col-xl-7">
<div class="card border-0 shadow-sm h-100">
<div class="card-body p-4">
<div class="d-flex justify-content-between gap-3 align-items-start mb-3">
<div>
<h2 class="h5 mb-1">Scan result</h2>
<p class="text-body-secondary small mb-0">Last scanned code and the action outcome.</p>
</div>
<button class="btn btn-sm btn-outline-secondary" type="button" @click="clearResult()" x-show="result.item || result.message || candidateItems.length">Clear</button>
</div>
<template x-if="actionState.error">
<div class="alert alert-danger" x-text="actionState.error"></div>
</template>
<template x-if="result.message">
<div class="alert" :class="result.type === 'success' ? 'alert-success' : 'alert-info'" x-text="result.message"></div>
</template>
<template x-if="candidateItems.length">
<div>
<h3 class="h6 mb-2">Choose matching stock item</h3>
<div class="list-group scan-candidate-list">
<template x-for="item in candidateItems" :key="item.uuid_b64">
<button class="list-group-item list-group-item-action" type="button" @click="selectCandidate(item)">
<div class="d-flex justify-content-between gap-3">
<div>
<div class="fw-semibold" x-text="item.name"></div>
<div class="small text-body-secondary" x-text="locationLabel(item)"></div>
</div>
<div class="small text-end">
<div class="fw-semibold" x-text="quantityLabel(item)"></div>
<div class="text-body-secondary" x-text="formatDate(item.expire_date)"></div>
</div>
</div>
</button>
</template>
</div>
</div>
</template>
<template x-if="result.item">
<div class="scan-result-card">
<div class="d-flex flex-column flex-md-row justify-content-between gap-3">
<div>
<p class="eyebrow mb-2">Item</p>
<h3 class="h5 mb-1" x-text="result.item.name"></h3>
<p class="text-body-secondary mb-2" x-text="result.item.description || 'No description'"></p>
<div class="small text-body-secondary">
<span x-text="quantityLabel(result.item)"></span>
<span aria-hidden="true"> · </span>
<span x-text="locationLabel(result.item)"></span>
</div>
</div>
<div class="d-flex flex-wrap align-content-start gap-2">
<a class="btn btn-outline-primary btn-sm" :href="detailHref(result.item)">View item</a>
<button class="btn btn-outline-secondary btn-sm" type="button" @click="printResultLabel()" :disabled="printState.isLoading">
<span x-show="!printState.isLoading">Print label</span>
<span x-show="printState.isLoading">Printing...</span>
</button>
<button class="btn btn-primary btn-sm" type="button" @click="openScanner()" :disabled="!scannerState.hasCamera">Scan another</button>
</div>
</div>
</div>
</template>
<template x-if="!actionState.error && !result.message && !result.item && !candidateItems.length">
<div class="empty-state-inline">
Pick an action, scan a kitchen label or barcode, and the result will appear here.
</div>
</template>
</div>
</div>
</div>
</div>
${renderScannerModal({
title: 'Scan for <span x-text="activeModeLabel()"></span>',
subtitle: 'Point your camera at a DataMatrix label or product barcode.',
optionsMarkup: scannerOptionsMarkup,
manualCodeModel: 'scannerManualCode',
manualSubmitAction: 'processScannerManualCode()',
manualPlaceholder: 'Scan with hardware reader or paste code',
manualHelp: 'Works with keyboard-style barcode scanners and manual paste.',
manualDisabledExpression: 'actionState.isLoading || scannerState.isLoading',
})}
</section>
`;
}
export function stockScanPageData(store) {
return {
scanModes: SCAN_MODES,
labelScanActions: LABEL_SCAN_ACTIONS,
scanMode: 'details',
labelScanAction: 'lookup',
manualCode: '',
scannerManualCode: '',
scannerReader: null,
scannerControls: null,
scannerState: {
isOpen: false,
isLoading: false,
hasCamera: false,
error: '',
lastDetectedCode: '',
},
actionState: createAsyncState(),
printState: createAsyncState(),
result: {
type: '',
message: '',
item: null,
},
candidateItems: [],
locations: [],
locationPathByUuid: {},
async init() {
this.scannerState.hasCamera = canUseCameraScanner();
if (!store.isConnected) {
return;
}
const locations = await fetchLocations(store).catch(() => ({ flat: [] }));
this.locations = locations.flat || [];
this.locationPathByUuid = Object.fromEntries(
this.locations
.filter((location) => location.uuid_b64)
.map((location) => [location.uuid_b64, location.pathLabel || location.name]),
);
},
destroy() {
this.stopScanner();
},
activeModeLabel() {
return this.scanModes.find((mode) => mode.key === this.scanMode)?.label || 'scan';
},
activeLabelActionDescription() {
return this.labelScanActions.find((action) => action.key === this.labelScanAction)?.description || '';
},
async openScanner() {
this.scannerState.error = '';
this.scannerState.lastDetectedCode = '';
this.scannerManualCode = this.manualCode;
this.scannerState.isOpen = true;
await this.$nextTick();
await this.startScanner();
},
async startScanner() {
this.scannerState.error = '';
this.scannerState.lastDetectedCode = '';
if (!canUseCameraScanner()) {
this.scannerState.hasCamera = false;
this.scannerState.error = 'Camera scanning is not supported in this browser. Enter the code manually.';
return;
}
const videoElement = this.$refs.scannerVideo;
if (!videoElement) {
this.scannerState.error = 'Scanner video element is unavailable. Close and reopen scanner.';
return;
}
this.stopScanner();
this.scannerState.isLoading = true;
try {
if (!this.scannerReader) {
this.scannerReader = createScannerReader();
}
const session = await startCameraScanner({
reader: this.scannerReader,
videoElement,
onDetected: (code) => this.onScanDetected(code),
});
this.scannerReader = session.reader;
this.scannerControls = session.controls;
} catch (error) {
this.scannerState.error = normalizeScannerError(error);
} finally {
this.scannerState.isLoading = false;
}
},
stopScanner() {
stopCameraScanner({
reader: this.scannerReader,
controls: this.scannerControls,
videoElement: this.$refs.scannerVideo,
});
this.scannerControls = null;
},
closeScanner() {
this.stopScanner();
this.scannerState.isOpen = false;
this.scannerState.isLoading = false;
this.scannerState.error = '';
},
onScanDetected(rawCode) {
const code = normalizeIdentifierCode(rawCode);
if (!code || !this.scannerState.isOpen) {
return;
}
this.scannerState.lastDetectedCode = code;
this.scannerManualCode = code;
this.closeScanner();
this.processScannedCode(code);
},
processScannerManualCode() {
const code = normalizeIdentifierCode(this.scannerManualCode);
if (!code) {
this.scannerState.error = 'Scan or enter a code first.';
return;
}
this.scannerState.lastDetectedCode = code;
this.manualCode = code;
this.closeScanner();
this.processScannedCode(code);
},
processManualCode() {
this.processScannedCode(this.manualCode);
},
async processScannedCode(rawCode) {
const parsed = parseKitchenScanPayload(rawCode);
this.clearResult();
if (parsed.type === 'empty') {
this.actionState.error = 'Scan or enter a code first.';
return;
}
if (this.scanMode === 'label') {
await runAsyncState(this.actionState, async () => {
await this.processLabelScan(parsed);
}).catch(() => {});
return;
}
await runAsyncState(this.actionState, async () => {
if (parsed.type === 'item') {
const item = await getStockEntry(store, parsed.uuidB64, { allowInactive: true });
await this.executeAction(item);
return;
}
const matches = await this.resolveIdentifierMatches(parsed.identifierCode);
if (!matches.length) {
this.result = {
type: 'info',
message: `No active stock item matched ${parsed.identifierCode}.`,
item: null,
};
return;
}
if (matches.length > 1) {
this.candidateItems = matches;
this.result = {
type: 'info',
message: `${matches.length} stock items match this barcode. Choose the one to ${this.activeModeLabel().toLowerCase()}.`,
item: null,
};
return;
}
await this.executeAction(matches[0]);
}).catch(() => {});
},
buildLabelDraftFromLookup(lookupItem, identifierCode) {
const mapped = mapLookupItemToForm({
form: {
...createLabelDraftBase(),
identifierCode: identifierCode || '',
},
lookupItem,
locations: this.locations,
});
const stockType = ['measured', 'descriptive', 'binary'].includes(lookupItem?.stock_type)
? lookupItem.stock_type
: mapped.form.stockType || 'binary';
const level = stockType === 'measured'
? ''
: (mapped.form.level || 'plenty');
return {
form: {
...mapped.form,
stockType,
level,
identifierCode: normalizeIdentifierCode(identifierCode || mapped.form.identifierCode),
},
locationSearch: mapped.locationSearch || '',
};
},
locationUuidFromDraft(form) {
const location = this.locations.find((entry) => String(entry.id) === String(form.locationId));
return location?.uuid_b64 || null;
},
canAutoCreateLabel(form) {
if (!String(form.name || '').trim()) {
return false;
}
if (!this.locationUuidFromDraft(form)) {
return false;
}
if (!form.productionDate) {
return false;
}
if (form.stockType === 'measured') {
const quantity = Number(form.quantity);
if (Number.isNaN(quantity) || quantity <= 0) {
return false;
}
}
return true;
},
buildUpsertPayloadFromDraft(form) {
const locationUuidB64 = this.locationUuidFromDraft(form);
const quantity = form.quantity === ''
? form.stockType === 'binary'
? 1
: null
: Number(form.quantity);
return {
uuid_b64: form.itemUuidB64 || null,
identifier_code: form.identifierCode || null,
external_source: form.externalSource || null,
external_id: form.externalId || null,
item: {
name: String(form.name || '').trim(),
description: String(form.description || '').trim(),
quantity_initial: Number.isNaN(quantity) ? null : quantity,
uom_symbol: String(form.uom || '').trim() || null,
calories: form.energy === '' ? null : Number(form.energy),
calories_unit: String(form.energyUnit || '').trim() || null,
stock_type: form.stockType,
level: form.stockType === 'measured' ? null : (form.level || null),
date: form.productionDate || null,
expire_date: form.expirationDate || null,
location_initial: locationUuidB64,
},
};
},
saveLabelDraftAndOpenForm(form) {
saveStoredValue(STORAGE_KEYS.labelDraft, {
form,
savedAt: Date.now(),
});
window.__loncApp.navigate('/labels/new');
},
async processLabelScan(parsed) {
let identifierCode = '';
if (parsed.type === 'item') {
const item = await getStockEntry(store, parsed.uuidB64, { allowInactive: true });
identifierCode = normalizeIdentifierCode(item?.identifier_code);
if (!identifierCode) {
this.result = {
type: 'info',
message: `${item?.name || 'Item'} has no identifier code. Open label form to complete it first.`,
item: item || null,
};
return;
}
} else {
identifierCode = normalizeIdentifierCode(parsed.identifierCode);
}
if (!identifierCode) {
throw new Error('No identifier code found in scan.');
}
const lookup = await lookupItemByIdentifier(store, identifierCode);
if (lookup.status !== 'ok' || !lookup.item) {
this.result = {
type: 'info',
message: `Lookup did not return a usable item for ${identifierCode}.`,
item: null,
};
return;
}
const draft = this.buildLabelDraftFromLookup(lookup.item, identifierCode);
if (this.labelScanAction === 'lookup') {
this.saveLabelDraftAndOpenForm(draft.form);
store.addAlert({
type: 'success',
message: `Lookup loaded for ${identifierCode}. Continue in label form.`,
});
return;
}
if (!this.canAutoCreateLabel(draft.form)) {
this.saveLabelDraftAndOpenForm(draft.form);
store.addAlert({
type: 'info',
message: 'Lookup data is incomplete for direct create. Please complete required fields in label form.',
});
return;
}
const upsertPayload = this.buildUpsertPayloadFromDraft(draft.form);
const entry = await applyItemUpsert(store, upsertPayload);
const entryName = entry.item?.name || draft.form.name;
const operationVerb = entry.operation === 'update' ? 'updated' : 'created';
if (this.labelScanAction === 'create_print') {
const createdUuidB64 = entry.item?.uuid_b64 || '';
if (!createdUuidB64) {
const message = `${entryName} was ${operationVerb}, but label printing is unavailable for this entry.`;
this.result = {
type: 'info',
message,
item: entry.item || null,
};
store.addAlert({
type: 'warning',
message,
});
return;
}
try {
await printItemLabel(store, createdUuidB64);
const message = `${entryName} was ${operationVerb} and printed. Ready for next scan.`;
this.result = {
type: 'success',
message,
item: entry.item || null,
};
store.addAlert({
type: 'success',
message,
});
void this.openScanner().catch(() => {});
} catch (error) {
const parsed = formatPrintErrorMessage(error);
const message = `${entryName} was ${operationVerb}, but printing failed: ${parsed} Use "Print label" to retry.`;
this.result = {
type: 'info',
message,
item: entry.item || null,
};
store.addAlert({
type: 'warning',
message: `${entryName} was ${operationVerb}, but printing failed: ${parsed}`,
});
}
return;
}
const message = `${entryName} was ${operationVerb}. Ready for next scan.`;
this.result = {
type: 'success',
message,
item: entry.item || null,
};
store.addAlert({
type: 'success',
message,
});
void this.openScanner().catch(() => {});
},
async resolveIdentifierMatches(identifierCode) {
const normalizedCode = normalizeIdentifierCode(identifierCode);
if (!normalizedCode) {
return [];
}
const entries = await listStockEntries(store).catch(() => []);
const matches = entries.filter((entry) =>
normalizeIdentifierCode(entry.identifier_code) === normalizedCode,
);
return sortByOperationalPriority(matches, this.locationPathByUuid);
},
async selectCandidate(item) {
this.candidateItems = [];
await runAsyncState(this.actionState, async () => {
await this.executeAction(item);
}).catch(() => {});
},
async executeAction(item) {
if (!item?.uuid_b64) {
throw new Error('Scanned item could not be resolved.');
}
if (this.scanMode === 'details') {
window.__loncApp.navigate(`/stock/${item.uuid_b64}?from=scan`);
return;
}
if (item.active === false) {
this.result = {
type: 'info',
message: `${item.name} is already out of stock.`,
item,
};
return;
}
if (this.scanMode === 'used' || this.scanMode === 'spoiled') {
const reason = this.scanMode === 'spoiled' ? 'spoiled' : 'consumed';
const result = await markStockGone(store, item.uuid_b64, reason);
const label = reason === 'spoiled' ? 'marked spoilt' : 'marked used';
this.result = {
type: result.status === 'already_gone' ? 'info' : 'success',
message: result.status === 'already_gone'
? `${item.name} was already out of stock.`
: `${item.name} was ${label}.`,
item: { ...item, active: false, level: 'gone', gone_reason: reason },
};
return;
}
const payload = buildConsumeOneStockPayload(item);
await createStockEvent(store, item.uuid_b64, payload);
const refreshed = await getStockEntry(store, item.uuid_b64, {
allowInactive: isGonePayload(payload),
}).catch(() => ({
...item,
active: false,
level: 'gone',
}));
this.result = {
type: 'success',
message: `${item.name} stock was reduced by one standard unit.`,
item: refreshed,
};
},
async printResultLabel() {
if (!this.result.item?.uuid_b64) {
return;
}
await runAsyncState(this.printState, async () => {
try {
await printItemLabel(store, this.result.item.uuid_b64);
store.addAlert({
type: 'success',
message: `${this.result.item.name} label sent to printer.`,
});
} catch (error) {
const parsed = formatPrintErrorMessage(error);
store.addAlert({
type: 'warning',
message: `Could not print ${this.result.item.name} label: ${parsed}`,
});
}
}).catch(() => {});
},
clearResult() {
this.actionState.error = '';
this.result = {
type: '',
message: '',
item: null,
};
this.candidateItems = [];
},
detailHref(item) {
return `#/stock/${item.uuid_b64}?from=scan`;
},
locationLabel(item) {
return this.locationPathByUuid[item?.location_initial_uuid_b64] || 'No location assigned';
},
quantityLabel,
formatDate,
};
}
+103
View File
@@ -1099,6 +1099,109 @@ button.legend-card:focus-visible {
object-fit: cover; object-fit: cover;
} }
.scan-hero {
background:
radial-gradient(circle at 15% 20%, rgba(80, 180, 140, 0.18), transparent 28rem),
linear-gradient(145deg, rgba(255, 255, 255, 0.96), rgba(245, 250, 255, 0.92));
}
.scan-mode-grid {
display: grid;
grid-template-columns: repeat(2, minmax(0, 1fr));
gap: 0.8rem;
}
.scan-mode-card {
display: grid;
gap: 0.25rem;
min-height: 6rem;
padding: 1rem;
text-align: left;
color: inherit;
background: rgba(255, 255, 255, 0.74);
border: 1px solid var(--lonc-border);
border-radius: 1rem;
transition:
transform 160ms ease,
box-shadow 160ms ease,
border-color 160ms ease,
background-color 160ms ease;
}
.scan-mode-card:hover {
transform: translateY(-1px);
box-shadow: 0 12px 24px rgba(24, 42, 79, 0.08);
}
.scan-mode-card-active {
border-color: rgba(31, 75, 153, 0.42);
background: rgba(31, 75, 153, 0.1);
box-shadow: inset 0 0 0 1px rgba(31, 75, 153, 0.18);
}
.scan-candidate-list {
max-height: 24rem;
overflow-y: auto;
}
.scan-modal-mode-list {
display: flex;
flex-wrap: wrap;
gap: 0.45rem;
}
.scan-modal-mode-btn {
border-radius: 999px;
}
.scan-modal-mode-btn-active {
color: #fff;
background: var(--lonc-primary);
border-color: var(--lonc-primary);
}
.scan-label-mode-list {
display: flex;
flex-wrap: wrap;
gap: 0.45rem;
}
.scan-label-mode-btn {
border-radius: 999px;
}
.scan-label-mode-btn-active {
color: #fff;
background: var(--lonc-primary-dark);
border-color: var(--lonc-primary-dark);
}
.scan-result-card {
padding: 1.25rem;
border-radius: 1.25rem;
border: 1px solid var(--lonc-border);
background:
linear-gradient(135deg, rgba(235, 243, 255, 0.78), rgba(255, 255, 255, 0.92));
}
.empty-state-inline {
display: grid;
min-height: 12rem;
place-items: center;
padding: 2rem;
color: var(--lonc-muted);
text-align: center;
border: 1px dashed rgba(31, 75, 153, 0.22);
border-radius: 1.25rem;
background: rgba(255, 255, 255, 0.58);
}
@media (max-width: 575.98px) {
.scan-mode-grid {
grid-template-columns: 1fr;
}
}
@media (max-width: 991.98px) { @media (max-width: 991.98px) {
.navbar { .navbar {
backdrop-filter: blur(10px); backdrop-filter: blur(10px);
+2 -2
View File
@@ -299,10 +299,10 @@ describe('label create upsert-first submit', () => {
await data.create(); await data.create();
expect(data.printIssue).toBe('Printer is unavailable.'); expect(data.printIssue).toBe('Beans was created, but printing failed: Printer is unavailable.');
expect(addAlert).toHaveBeenCalledWith({ expect(addAlert).toHaveBeenCalledWith({
type: 'warning', type: 'warning',
message: 'Beans was created, but printing has an issue: Printer is unavailable.', message: 'Beans was created, but printing failed: Printer is unavailable.',
}); });
expect(localStorageMock.setItem).toHaveBeenCalled(); expect(localStorageMock.setItem).toHaveBeenCalled();
}); });
+12 -12
View File
@@ -1,11 +1,11 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
const useStockItemMock = vi.fn(); const markStockGoneMock = vi.fn();
const getStockEntryMock = vi.fn(); const getStockEntryMock = vi.fn();
const listGroupedStockEntriesMock = vi.fn(); const listGroupedStockEntriesMock = vi.fn();
vi.mock('../../../src/api/stock.js', () => ({ vi.mock('../../../src/api/stock.js', () => ({
useStockItem: (...args) => useStockItemMock(...args), markStockGone: (...args) => markStockGoneMock(...args),
getStockEntry: (...args) => getStockEntryMock(...args), getStockEntry: (...args) => getStockEntryMock(...args),
adjustStockEntry: vi.fn(), adjustStockEntry: vi.fn(),
lookupItemDetails: vi.fn(), lookupItemDetails: vi.fn(),
@@ -24,7 +24,7 @@ const { stockListPageData } = await import('../../../src/features/stock/stock-li
describe('stock mark-gone behavior', () => { describe('stock mark-gone behavior', () => {
beforeEach(() => { beforeEach(() => {
useStockItemMock.mockReset(); markStockGoneMock.mockReset();
getStockEntryMock.mockReset(); getStockEntryMock.mockReset();
listGroupedStockEntriesMock.mockReset(); listGroupedStockEntriesMock.mockReset();
globalThis.window = { globalThis.window = {
@@ -39,15 +39,15 @@ describe('stock mark-gone behavior', () => {
delete globalThis.window; delete globalThis.window;
}); });
it('stock detail markGone uses /use and shows info for already gone', async () => { it('stock detail markGone posts gone event and shows info for already gone', async () => {
useStockItemMock.mockResolvedValueOnce({ status: 'already_gone' }); markStockGoneMock.mockResolvedValueOnce({ status: 'already_gone' });
const addAlert = vi.fn(); const addAlert = vi.fn();
const data = stockDetailPageData({ addAlert }); const data = stockDetailPageData({ addAlert });
data.entry = { uuid_b64: 'item-1', name: 'Rice' }; data.entry = { uuid_b64: 'item-1', name: 'Rice' };
await data.markGone(); await data.markGone();
expect(useStockItemMock).toHaveBeenCalledWith({ addAlert }, 'item-1'); expect(markStockGoneMock).toHaveBeenCalledWith({ addAlert }, 'item-1', 'consumed');
expect(addAlert).toHaveBeenCalledWith({ expect(addAlert).toHaveBeenCalledWith({
type: 'info', type: 'info',
message: 'Rice was already out of stock.', message: 'Rice was already out of stock.',
@@ -55,8 +55,8 @@ describe('stock mark-gone behavior', () => {
expect(globalThis.window.__loncApp.navigate).toHaveBeenCalledWith('/stock'); expect(globalThis.window.__loncApp.navigate).toHaveBeenCalledWith('/stock');
}); });
it('stock list markGone removes entry and uses /use path', async () => { it('stock list markGone removes entry and posts gone event', async () => {
useStockItemMock.mockResolvedValueOnce({ status: 'used' }); markStockGoneMock.mockResolvedValueOnce({ status: 'ok' });
const addAlert = vi.fn(); const addAlert = vi.fn();
const data = stockListPageData({ addAlert, isConnected: false }); const data = stockListPageData({ addAlert, isConnected: false });
data.entries = [{ id: 1, uuid_b64: 'item-1', name: 'Flour' }]; data.entries = [{ id: 1, uuid_b64: 'item-1', name: 'Flour' }];
@@ -65,16 +65,16 @@ describe('stock mark-gone behavior', () => {
await data.markGone(data.entries[0]); await data.markGone(data.entries[0]);
expect(useStockItemMock).toHaveBeenCalledWith({ addAlert, isConnected: false }, 'item-1'); expect(markStockGoneMock).toHaveBeenCalledWith({ addAlert, isConnected: false }, 'item-1', 'consumed');
expect(data.entries).toEqual([]); expect(data.entries).toEqual([]);
expect(addAlert).toHaveBeenCalledWith({ expect(addAlert).toHaveBeenCalledWith({
type: 'success', type: 'success',
message: 'Flour was marked gone and removed from the list.', message: 'Flour was marked used and removed from the list.',
}); });
}); });
it('stock list grouped markGone removes item from grouped and flat collections', async () => { it('stock list grouped markGone removes item from grouped and flat collections', async () => {
useStockItemMock.mockResolvedValueOnce({ status: 'used' }); markStockGoneMock.mockResolvedValueOnce({ status: 'ok' });
listGroupedStockEntriesMock.mockResolvedValueOnce([]); listGroupedStockEntriesMock.mockResolvedValueOnce([]);
const addAlert = vi.fn(); const addAlert = vi.fn();
const store = { addAlert, isConnected: true }; const store = { addAlert, isConnected: true };
@@ -127,7 +127,7 @@ describe('stock mark-gone behavior', () => {
expect(data.groupedEntries).toEqual([]); expect(data.groupedEntries).toEqual([]);
expect(addAlert).toHaveBeenCalledWith({ expect(addAlert).toHaveBeenCalledWith({
type: 'success', type: 'success',
message: 'Beans was marked gone and removed from the group.', message: 'Beans was marked used and removed from the group.',
}); });
expect(listGroupedStockEntriesMock).toHaveBeenCalledTimes(1); expect(listGroupedStockEntriesMock).toHaveBeenCalledTimes(1);
expect(listGroupedStockEntriesMock).toHaveBeenCalledWith(store, { expanded: 0 }); expect(listGroupedStockEntriesMock).toHaveBeenCalledWith(store, { expanded: 0 });