allowing -'s in barcode

[Evergreen.git] / Evergreen / xul / staff_client / server / patron / ue_config.js

diff --git a/Evergreen/xul/staff_client/server/patron/ue_config.js b/Evergreen/xul/staff_client/server/patron/ue_config.js
index 1dd2244..7f24f8a 100644 (file)
--- a/Evergreen/xul/staff_client/server/patron/ue_config.js
+++ b/Evergreen/xul/staff_client/server/patron/ue_config.js
@@ -39,7 +39,8 @@ var myPerms = [
 
 var dataFields;
 const numRegex         = /^\d+$/;
 
 var dataFields;
 const numRegex         = /^\d+$/;

-const wordRegex        = /^\w+$/;
+const wordRegex        = /^[\w-]+$/;
+const unameRegex       = /^\w[\.\w\@-]*$/;

 const ssnRegex         = /^\d{3}-\d{2}-\d{4}$/;
 const dlRegex          = /^[a-zA-Z]{2}-\w+/; /* driver's license */
 const phoneRegex       = /^\d{3}-\d{3}-\d{4}(| ex\d+)$/i;
 const ssnRegex         = /^\d{3}-\d{2}-\d{4}$/;
 const dlRegex          = /^[a-zA-Z]{2}-\w+/; /* driver's license */
 const phoneRegex       = /^\d{3}-\d{3}-\d{4}(| ex\d+)$/i;


@@ -77,6 +78,7 @@ function uEditUsrnameBlur(field) {
 function uEditBarcodeBlur(field) {
        var barcode = uEditNodeVal(field);
        if(!barcode) return;
 function uEditBarcodeBlur(field) {
        var barcode = uEditNodeVal(field);
        if(!barcode) return;

+       _debug("blurring card with new value " + barcode);

        var req = new Request(CHECK_BARCODE, SESSION, barcode);
        req.callback( 
                function(r) {
        var req = new Request(CHECK_BARCODE, SESSION, barcode);
        req.callback( 
                function(r) {


@@ -126,7 +128,7 @@ function uEditDefineData(patron) {
                        errkey  : 'ue_bad_username',
                        widget  : {
                                id              : 'ue_username',
                        errkey  : 'ue_bad_username',
                        widget  : {
                                id              : 'ue_username',

-                               regex   : wordRegex,
+                               regex   : unameRegex,

                                type    : 'input',
                                onblur : uEditUsrnameBlur
                        }
                                type    : 'input',
                                onblur : uEditUsrnameBlur
                        }


@@ -159,6 +161,11 @@ function uEditDefineData(patron) {
                                        var pw1f = uEditFindFieldByWId('ue_password1');
                                        var pw1 = uEditNodeVal(pw1f);
                                        field.widget.regex = new RegExp('^'+pw1+'$');
                                        var pw1f = uEditFindFieldByWId('ue_password1');
                                        var pw1 = uEditNodeVal(pw1f);
                                        field.widget.regex = new RegExp('^'+pw1+'$');

+                                       if( pw1 ) field.required = true;
+                                       else {
+                                               if(!patron.isnew())
+                                                       field.required = false;
+                                       }

                                }
                        }
                },
                                }
                        }
                },