From 346ef4a5ae4b895012a66c0ce95511d4a2a36b47 Mon Sep 17 00:00:00 2001
From: juanf <juanf@ethz.ch>
Date: Fri, 4 Aug 2023 11:09:33 +0200
Subject: [PATCH] SSDM-13894: Update messages regarding barcodes
---
.../1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js | 4 ++--
.../eln-lims/html/js/views/SampleForm/widgets/LinksView.js | 2 +-
.../html/js/views/SideMenu/SideMenuWidgetBrowserController.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js
index 0cdba21a479..dfecc6899c9 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/BarcodeUtil.js
@@ -537,8 +537,8 @@ var BarcodeUtil = new function() {
Util.unblockUI();
});
- $window.append($('<legend>').append("Read Barcodes"));
- $window.append(FormUtil.getInfoText("Please scan one or more barcodes. The barcodes will be listed below if the scan is successful."));
+ $window.append($('<legend>').append("Scan Barcode/QR code"));
+ $window.append(FormUtil.getInfoText("Please scan one or more barcodes/qr codes. The barcodes/qr codes will be listed below if the scan is successful."));
$window.append($('<legend>').append('Found'));
$window.append($btnAccept).append(' ').append($btnCancel);
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
index 49a031b5633..17c690bb4be 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/LinksView.js
@@ -655,7 +655,7 @@ function LinksView(linksController, linksModel) {
}
linksView.getAddAnyBarcode = function() {
- var $addBtn = FormUtil.getButtonWithIcon("glyphicon-barcode", null);
+ var $addBtn = FormUtil.getButtonWithIcon("glyphicon-barcode", null, null, "Scan Barcode/QR code");
$addBtn.click(function() {
BarcodeUtil.readBarcodeMulti("Add Objects", function(objects) {
for(var oIdx = 0; oIdx < objects.length; oIdx++) {
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js
index b51422bef4a..d1b70828154 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetBrowserController.js
@@ -2484,7 +2484,7 @@ class SideMenuWidgetBrowserController extends window.NgComponents.default.Browse
_createBarcodesGeneratorNode() {
if (profile.mainMenu.showBarcodes) {
return {
- text: "Barcodes Generator",
+ text: "Barcodes/QR codes Generator",
object: {
type: this.TYPE_GENERATE_BARCODES,
id: this.TYPE_GENERATE_BARCODES,
--
GitLab