scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-08 21:06:24 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7626 from rekonder/aj_SCI_9833

Browse source 
Fix small zebra print issues [SCI-9833]
This commit is contained in:
ajugo 2024-06-04 15:59:25 +02:00 • committed by GitHub
commit 596844cc07
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -201,23 +201,27 @@ var zebraPrint = (function() {
}); });
} }
updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_SEARCH, PRINTER_STATUS_SEARCH); if (dataZebra?.responseJSON?.labels?.length && printData.number_of_copies > 0) {
device = findDevice(printData.printer_name); updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_SEARCH, PRINTER_STATUS_SEARCH);
device = findDevice(printData.printer_name);
getPrinterStatus(device).then((device) => { getPrinterStatus(device).then((device) => {
if (device.status === I18n.t('label_printers.modal_printing_status.printer_status.ready')) { if (device.status === I18n.t('label_printers.modal_printing_status.printer_status.ready')) {
print( print(
device, device,
progressModal, progressModal,
printData.number_of_copies, printData.number_of_copies,
printData.printer_name, printData.printer_name,
dataZebra.responseJSON.labels, dataZebra.responseJSON.labels,
0, 0
); );
} else { } else {
updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR); updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
} }
}); });
} else {
updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
}
}).fail(() => { }).fail(() => {
HelperModule.flashAlertMsg(I18n.t('repository_row.modal_print_label.general_error'), 'danger'); HelperModule.flashAlertMsg(I18n.t('repository_row.modal_print_label.general_error'), 'danger');
}); });

1
app/javascript/vue/repository_print_modal/container.vue
View file

@ -255,6 +255,7 @@ export default {
}); });
}, },
initZebraPrinter() { initZebraPrinter() {
this.printers = this.printers.filter((printer) => !printer.id.startsWith('zebra'));
this.zebraPrinters = zebraPrint.init($('#LabelPrinterSelector'), { this.zebraPrinters = zebraPrint.init($('#LabelPrinterSelector'), {
clearSelectorOnFirstDevice: false, clearSelectorOnFirstDevice: false,
appendDevice: (device) => { appendDevice: (device) => {