knee-cola/evidencija-rezija
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/1.35.1'

Browse Source
This commit is contained in:
Nikola Derežić
2025-07-23 13:40:24 +02:00
parent 46730aa249 491b11e86d
commit 1ef3f01f86
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/lib/pdf/barcodeDecoder.ts
View File

@@ -330,7 +330,7 @@ const copyBarcodeImage = (canvas:HTMLCanvasElement, decoderResult:Result):string
} }
/** Finds PDF417 code within a file and decodes it */ /** Finds PDF417 code within a file and decodes it */
const decodeFromFile = async (file:File) => { const decodeFromFile = async (file:File): Promise<DecodeResult[]|null> => {
switch(file.type) { switch(file.type) {
case 'image/png': case 'image/png':
case 'image/jpeg': case 'image/jpeg':
@@ -341,13 +341,13 @@ const decodeFromFile = async (file:File) => {
// if there are multiple pages, we will decode each page separately // if there are multiple pages, we will decode each page separately
// and return the results from all pages // and return the results from all pages
const results = (await Promise.all(pageCanvas.map(async (canvas) => { const results = (await Promise.all(pageCanvas.map(async (canvas) => {
await yieldToBrowser('decodeFromCanvas'); await yieldToBrowser('decodeFromCanvas');
return await decodeFromCanvas(canvas); return await decodeFromCanvas(canvas);
}))) })))
// remove null results (pages with no PDF417 codes) // remove null results (pages with no PDF417 codes)
.filter((result) => result !== null) .filter((result) => result !== null)
// flatten the array of arrays into a single array // flatten the array of arrays into a single array
.flat(); .flat() as DecodeResult[];
return(results); return(results);
default: default:

1
app/ui/BillEditForm.tsx
View File

@@ -60,6 +60,7 @@ export const BillEditForm:FC<BillEditFormProps> = ({ location, bill }) => {
setBarcodeResults(null); setBarcodeResults(null);
const results = await findDecodePdf417(event); const results = await findDecodePdf417(event);
if(results && results.length > 0) { if(results && results.length > 0) {
if(results.length === 1) { if(results.length === 1) {