scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 18:52:07 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix zebra label printing order [SCI-9575] (#6574)

Browse source
This commit is contained in:
ajugo 2023-11-03 10:11:19 +01:00 committed by GitHub
parent f7df98a63d
commit d82ec3a705
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
app/assets/javascripts/sitewide/zebra_print.js
View file

@ -128,31 +128,33 @@ var zebraPrint = (function() {
+ printingStatus));
}
function print(device, progressModal, numberOfCopies, printerName, labels) {
var counter = 0;
function print(device, progressModal, numberOfCopies, printerName, labels, labelIndex) {
if (labels.length <= labelIndex) {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_READY, PRINTER_STATUS_DONE);
return;
}
const label = labels[labelIndex];
function printNextLabel() {
print(device, progressModal, numberOfCopies, printerName, labels, labelIndex + 1);
}
function unsuccessfulPrint() {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
}
try {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_READY, PRINTER_STATUS_PRINTING);
labels.forEach(function(label) {
for (counter = 0; counter < numberOfCopies; counter += 1) {
if (counter + 1 === parseInt(numberOfCopies, 10)) {
device.sendThenRead(
label,
() => {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_READY, PRINTER_STATUS_DONE);
},
(error)=> {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
}
);
} else {
device.send(label, ()=>{}, (error)=> {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
});
}
for (let counter = 0; counter < numberOfCopies; counter += 1) {
if (counter + 1 === parseInt(numberOfCopies, 10)) {
device.sendThenRead(label, printNextLabel, unsuccessfulPrint);
} else {
device.send(label, () => {}, unsuccessfulPrint);
}
});
}
} catch (error) {
updateProgressModalData(progressModal, printerName, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
unsuccessfulPrint();
}
}
@ -204,8 +206,12 @@ var zebraPrint = (function() {
getPrinterStatus(device).then((device) => {
if (device.status === I18n.t('label_printers.modal_printing_status.printer_status.ready')) {
print(
device, progressModal, printData.number_of_copies,
printData.printer_name, dataZebra.responseJSON.labels
device,
progressModal,
printData.number_of_copies,
printData.printer_name,
dataZebra.responseJSON.labels,
0,
);
} else {
updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);