From bf123fa65500e46c9b925c2698170387b167e606 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 2 Mar 2016 22:20:01 -0500
Subject: [PATCH] Patron reg field validation (WIP)

Signed-off-by: Bill Erickson <berickxx@gmail.com>
---
 .../src/templates/staff/circ/patron/t_edit.tt2     | 24 ++++++++--------------
 .../web/js/ui/default/staff/circ/patron/regctl.js  |  6 ++----
 2 files changed, 10 insertions(+), 20 deletions(-)

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 76a24b1ccb..13a974abfb 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -259,6 +259,7 @@ within the "form" by name for validation.
     <input eg-date-input 
       name="dob"
       ng-change="field_modified()" 
+      ng-required="field_required('au', 'dob')"
       ng-blur="handle_field_changed(patron, 'dob')"
       class="form-control" ng-model="patron.dob"/>
   </div>
@@ -435,22 +436,13 @@ within the "form" by name for validation.
 <div class="row reg-field-row" ng-show="show_field('au.net_access_level')">
   [% draw_field_label('au', 'net_access_level') %]
   <div class="col-md-3 reg-field-input">
-    <div class="btn-group" dropdown>
-      <button type="button" class="btn btn-default dropdown-toggle">
-        <span style="padding-right: 5px;">
-          {{patron.net_access_level.name() || "[% l('Net Access Level') %]"}}
-        </span>
-        <span class="caret"></span>
-      </button>
-      <ul class="dropdown-menu">
-        <li ng-repeat="level in net_access_levels">
-          <a href 
-            ng-click="patron.net_access_level = level; handle_field_changed(patron, 'net_access_level')">
-              {{level.name()}}
-          </a>
-        </li>
-      </ul>
-    </div>
+    <select 
+      class="form-control" 
+      ng-model="patron.net_access_level"
+      ng-required="field_required('au', 'net_access_level')"
+      ng-blur="handle_field_changed(patron, 'net_access_level')"
+      ng-options="level.name() for level in net_access_levels track by level.id()">
+    </select>
   </div>
 </div>
 
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 2dd04b98a8..5bbe3f44f7 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
@@ -975,7 +975,6 @@ angular.module('egCoreMod')
         var phone_reg = service.org_settings['ui.patron.edit.phone.regex'];
         if (phone_reg) {
             // apply generic phone regex first, replace below as needed.
-            console.log(phone_reg);
             patterns.au.day_phone = new RegExp(phone_reg);
             patterns.au.evening_phone = new RegExp(phone_reg);
             patterns.au.other_phone = new RegExp(phone_reg);
@@ -990,12 +989,11 @@ angular.module('egCoreMod')
             var cls = parts[1];
             var name = parts[2];
             patterns[cls][name] = new RegExp(val);
+            console.log('adding field pattern for ' + 
+              name + ' : ' + patterns[cls][name]);
         });
-
-        console.log('day phone ' + patterns.au.day_phone);
     }
 
-
     return service;
 }]);
 
-- 
2.11.0