From 9d0fa75d93e732f89c175ee6bd19e7a301f06bf9 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Sun, 4 Oct 2015 20:58:35 -0400
Subject: [PATCH] LP#1452950 focus barcode field

For new patrons, focus the barcode field.  For existing patrons, disable
the barcode field (except when a new barcode is needed) and focus the
username field by default.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 Open-ILS/src/templates/staff/circ/patron/t_edit.tt2    | 10 +++++++++-
 Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 1e7cc71614..2d8e8c3fe6 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -65,7 +65,15 @@
       <input type="text" ng-blur="post_code_changed(patron.[% path %])"
         class="form-control" ng-model="[% model %]"/>
     [% ELSIF field == 'barcode' %]
-      <input type="text" ng-blur="barcode_changed(patron.card.barcode)"
+      <input type="text" 
+        focus-me="focus_bc"
+        ng-disabled="disable_bc"
+        ng-blur="barcode_changed(patron.card.barcode)"
+        class="form-control" ng-model="[% model %]"/>
+    [% ELSIF field == 'usrname' %]
+      <input type="text" 
+        focus-me="focus_usrname"
+        ng-blur="usrname_changed(patron.usrname)"
         class="form-control" ng-model="[% model %]"/>
     [% ELSE %]
       <input type="[% input_type %]" 
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index 91ea251b5b..40809e58e3 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -443,6 +443,10 @@ function PatronRegCtrl($scope, $routeParams,
     $scope.patron_id = 
         patronRegSvc.patron_id = $routeParams.edit_id || $routeParams.id;
 
+    // for existing patrons, disable barcode input by default
+    $scope.disable_bc = $scope.focus_usrname = Boolean($scope.patron_id);
+    $scope.focus_bc = !Boolean($scope.patron_id);
+
     if (!$scope.edit_passthru) {
         // in edit more, scope.edit_passthru is delivered to us by
         // the enclosing controller.  In register mode, there is 
@@ -644,6 +648,7 @@ function PatronRegCtrl($scope, $routeParams,
     $scope.replace_card = function() {
         $scope.patron.card.active = false;
         $scope.patron.card.ischanged = true;
+        $scope.disable_bc = false;
 
         var new_card = egCore.idl.toHash(new egCore.idl.ac());
         new_card.id = patronRegSvc.virt_id--;
-- 
2.11.0