LP#1522599 add visual indicator for an expired patron

Add checkAlerts to getPrimary
Add alert styling to index patron for any active alert
Add alert styling to expire date in patron summary

Signed-off-by: Billy Horn <bhorn@catalystdevworks.com>

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index cc3ee09..aa03005 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -67,7 +67,8 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
     <div ng-show="patron()">
       <h4 title="{{patron().id()}}">
         <div class="flex-row">
-          <div class="flex-cell">
+          <div class="flex-cell"
+          ng-class="{'patron-summary-alert' : hasAlerts()}">
             [% l('[_1], [_2] [_3]', 
                 '{{patron().family_name()}}',
                 '{{patron().first_given_name()}}',

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
index 205a64a..626fd88 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -44,7 +44,8 @@
       <div class="col-md-5">[% l('Create Date') %]</div>
       <div class="col-md-7">{{patron().create_date() | date:'shortDate'}}</div>
     </div>
-    <div class="row">
+    <div class="row"
+      ng-class="{'patron-summary-alert' : isPatronExpired()}">
       <div class="col-md-5">[% l('Expire Date') %]</div>
       <div class="col-md-7">{{patron().expire_date() | date:'shortDate'}}</div>
     </div>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index 350a48a..02c16c9 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -296,6 +296,7 @@ function($q , $timeout , $location , egCore,  egUser , $locale) {
 
         service.getPrimary(id, user, force)
         .then(function() {
+            service.checkAlerts();
             var p = service.primaryUserPromise;
             service.primaryUserId = null;
             // clear before resolution just to be safe.
@@ -649,6 +650,8 @@ function($scope,  $q,  $location , $filter,  egCore,  egUser,  patronSvc) {
     $scope.patron = function() { return patronSvc.current }
     $scope.patron_stats = function() { return patronSvc.patron_stats }
     $scope.summary_stat_cats = function() { return patronSvc.summary_stat_cats }
+    $scope.hasAlerts = function() { return patronSvc.hasAlerts }
+    $scope.isPatronExpired = function() { return patronSvc.patronExpired }
 
     $scope.print_address = function(addr) {
         egCore.print.print({