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

Improve error handling for label printing [SCI-10039] (#6997)

Browse source
This commit is contained in:
ajugo 2024-01-31 11:10:11 +01:00 • committed by GitHub
parent edce20e303
commit 9d48cbbb86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
/* eslint-disable no-param-reassign */ /* eslint-disable no-param-reassign */
/* eslint-disable no-undef */ /* eslint-disable no-undef */
/* global I18n */ /* global HelperModule I18n */
/* eslint-disable no-unused-vars, no-use-before-define */ /* eslint-disable no-unused-vars, no-use-before-define */
/* config = { /* config = {
@ -218,6 +218,8 @@ var zebraPrint = (function() {
updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR); updateProgressModalData(progressModal, printData.printer_name, PRINTER_STATUS_ERROR, PRINTER_STATUS_ERROR);
} }
}); });
}).fail(() => {
HelperModule.flashAlertMsg(I18n.t('repository_row.modal_print_label.general_error'), 'danger');
}); });
} }
}; };

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

@ -91,6 +91,8 @@
</template> </template>
<script> <script>
/* global HelperModule */
import DropdownSelector from '../shared/dropdown_selector.vue'; import DropdownSelector from '../shared/dropdown_selector.vue';
import LabelPreview from '../label_template/components/label_preview.vue'; import LabelPreview from '../label_template/components/label_preview.vue';
@ -203,8 +205,14 @@ export default {
this.labelTemplateError = null; this.labelTemplateError = null;
this.labelTemplateCode = result.label_code; this.labelTemplateCode = result.label_code;
}).fail((result) => { }).fail((result) => {
this.labelTemplateError = result.responseJSON.error; if (result.responseJSON) {
this.labelTemplateCode = result.responseJSON.label_code; this.labelTemplateError = result.responseJSON.error;
this.labelTemplateCode = result.responseJSON.label_code;
} else {
this.labelTemplateError = null;
this.labelTemplateCode = null;
HelperModule.flashAlertMsg(this.i18n.t('repository_row.modal_print_label.general_error'), 'danger');
}
}); });
}, },
submitPrint() { submitPrint() {
@ -233,6 +241,8 @@ export default {
$(this.$refs.modal).modal('hide'); $(this.$refs.modal).modal('hide');
this.$emit('close'); this.$emit('close');
PrintProgressModal.init(data); PrintProgressModal.init(data);
}).fail(() => {
HelperModule.flashAlertMsg(this.i18n.t('repository_row.modal_print_label.general_error'), 'danger');
}); });
} }
}); });

2
app/services/label_templates/repository_row_service.rb
View file

@ -17,7 +17,7 @@ module LabelTemplates
errors = [] errors = []
keys = @label_template.content.scan(/(?<=\{\{).*?(?=\}\})/).uniq keys = @label_template.content.scan(/(?<=\{\{).*?(?=\}\})/).uniq
label = keys.reduce(@label_template.content.dup) do |rendered_content, key| label = keys.reduce(@label_template.content.dup) do |rendered_content, key|
rendered_content.gsub!(/\{\{#{key}\}\}/, fetch_value(key)) rendered_content.gsub!(Regexp.new(Regexp.escape("{{#{key}}}")), fetch_value(key))
rescue LabelTemplates::ColumnNotFoundError, rescue LabelTemplates::ColumnNotFoundError,
LabelTemplates::LogoNotFoundError, LabelTemplates::LogoNotFoundError,
LabelTemplates::LogoParamsError => e LabelTemplates::LogoParamsError => e

1
config/locales/en.yml
View file

@ -2584,6 +2584,7 @@ en:
title: "There seems to be no printer available" title: "There seems to be no printer available"
description: "To learn more about printing labels and label printers please visit our blog." description: "To learn more about printing labels and label printers please visit our blog."
visit_blog: "Visit blog" visit_blog: "Visit blog"
general_error: "Something went wrong"
reminder: reminder:
clear: "Clear" clear: "Clear"
low_stock_title: "Item running low" low_stock_title: "Item running low"