From 46c2449ef4b498486852b46d1ef604b3dfcea0fe Mon Sep 17 00:00:00 2001 From: Billy Horn Date: Wed, 5 Oct 2016 10:41:33 -0700 Subject: [PATCH] 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 Signed-off-by: Kathy Lussier --- Open-ILS/src/templates/staff/circ/patron/index.tt2 | 3 ++- Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 | 3 ++- Open-ILS/web/js/ui/default/staff/circ/patron/app.js | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2 index ebde904e53..50c8bd782a 100644 --- a/Open-ILS/src/templates/staff/circ/patron/index.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2 @@ -68,7 +68,8 @@ angular.module('egCoreMod').run(['egStrings', function(s) {

-
+
[% 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 606687dd61..c67e1de230 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2 @@ -57,7 +57,8 @@
[% l('Create Date') %]
{{patron().create_date() | date:'shortDate'}}
-
+
[% l('Expire Date') %]
{{patron().expire_date() | date:'shortDate'}}
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 bb514c4f00..bc2f390393 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js @@ -298,6 +298,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. @@ -651,6 +652,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({ -- 2.43.2