From 6e011761ac80edf17c436046438b6e285cb346c3 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Thu, 2 Jun 2022 08:56:22 +0000 Subject: [PATCH] spl , character added --- .../doctype/system_mapping/system_mapping.js | 20 +++++++++---------- .../variant_mapping/variant_mapping.js | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/smart_service/transactions/doctype/system_mapping/system_mapping.js b/smart_service/transactions/doctype/system_mapping/system_mapping.js index 563c450..e2f468b 100644 --- a/smart_service/transactions/doctype/system_mapping/system_mapping.js +++ b/smart_service/transactions/doctype/system_mapping/system_mapping.js @@ -42,24 +42,24 @@ frappe.ui.form.on('System Mapping', { frm.trigger('fnLoadmat_initial_values'); }, validate: function (frm) { - var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|.<>\/?]+/; + var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|,.<>\/?]+/; for (var i = 0; i < cur_frm.doc.system_sub_systems.length; i++) { if (regex.test(cur_frm.doc.system_sub_systems[i].rts) === true) { - frappe.throw(__("RTS: Only letters, numbers and -, are allowed.")); + frappe.throw(__("RTS: Only letters, numbers and - are allowed.")); frappe.validated = false; } else if (cur_frm.doc.system_sub_systems[i].rts) { if (cur_frm.doc.system_sub_systems[i].rts.includes("'")) { - frappe.throw(__("RTS: Only letters, numbers and -, are allowed.")); + frappe.throw(__("RTS: Only letters, numbers and - are allowed.")); frappe.validated = false; } } if (regex.test(cur_frm.doc.system_sub_systems[i].mat) === true) { - frappe.throw(__("MAT: Only letters, numbers and -, are allowed.")); + frappe.throw(__("MAT: Only letters, numbers and - are allowed.")); frappe.validated = false; } else if (cur_frm.doc.system_sub_systems[i].mat) { if (cur_frm.doc.system_sub_systems[i].mat.includes("'")) { - frappe.throw(__("MAT: Only letters, numbers and -, are allowed.")); + frappe.throw(__("MAT: Only letters, numbers and - are allowed.")); frappe.validated = false; } } @@ -175,24 +175,24 @@ frappe.ui.form.on('System Mapping', { } }, special_character: function(frm){ - var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|.<>\/?]+/; + var regex = /[!@#$%^&*()_+\=\[\]{};'`~:"\\|,.<>\/?]+/; for (var i = 0; i < cur_frm.doc.system_sub_systems.length; i++) { if (regex.test(cur_frm.doc.system_sub_systems[i].rts) === true) { - frappe.throw(__("RTS: Only letters, numbers and -, are allowed.")); + frappe.throw(__("RTS: Only letters, numbers and - are allowed.")); frappe.validated = false; } else if (cur_frm.doc.system_sub_systems[i].rts) { if (cur_frm.doc.system_sub_systems[i].rts.includes("'")) { - frappe.throw(__("RTS: Only letters, numbers and -, are allowed.")); + frappe.throw(__("RTS: Only letters, numbers and - are allowed.")); frappe.validated = false; } } if (regex.test(cur_frm.doc.system_sub_systems[i].mat) === true) { - frappe.throw(__("MAT: Only letters, numbers and -, are allowed.")); + frappe.throw(__("MAT: Only letters, numbers and - are allowed.")); frappe.validated = false; } else if (cur_frm.doc.system_sub_systems[i].mat) { if (cur_frm.doc.system_sub_systems[i].mat.includes("'")) { - frappe.throw(__("MAT: Only letters, numbers and -, are allowed.")); + frappe.throw(__("MAT: Only letters, numbers and - are allowed.")); frappe.validated = false; } } diff --git a/smart_service/transactions/doctype/variant_mapping/variant_mapping.js b/smart_service/transactions/doctype/variant_mapping/variant_mapping.js index 28ea0f5..54f5bc7 100644 --- a/smart_service/transactions/doctype/variant_mapping/variant_mapping.js +++ b/smart_service/transactions/doctype/variant_mapping/variant_mapping.js @@ -45,7 +45,7 @@ frappe.ui.form.on('Variant Mapping', { } }, validate: function(frm){ - var regex = /[!@#$%^&*()_+\-=\[\]{};'`~:"\\|.<>\/?]+/; + var regex = /[!@#$%^&*()_+\-=\[\]{};'`~:"\\|,.<>\/?]+/; if (regex.test(frm.doc.family_code) === true) { frappe.throw(__("Family Code: Only letters and numbers are allowed.")); frappe.validated = false;