only show alert penalties in alert pane / sidebar

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
index e9a0adf..818fbfe 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_alerts.tt2
@@ -42,7 +42,7 @@
   </div>
 
   <!-- penalties -->
-  <div class="row" ng-if="patron().standing_penalties().length">
+  <div class="row" ng-if="alert_penalties.length">
     <div class="col-md-12">
       <div class="panel panel-warning">
         <div class="panel-heading">
@@ -50,7 +50,7 @@
         </div>
         <div class="panel-body">
           <div class="row" 
-            ng-repeat="penalty in patron().standing_penalties()">
+            ng-repeat="penalty in alert_penalties">
             <div class="col-md-2">
               {{penalty.org_unit().shortname()}}
             </div>

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 6f23d45..db51b8b 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_summary.tt2
@@ -3,20 +3,18 @@
   <div ng-show="patron()" id="patron-summary-grid">
     <div class="row" 
       ng-class="{'patron-summary-divider' : !$index}"
-      ng-repeat="penalty in patron().standing_penalties()">
+      ng-repeat="penalty in alert_penalties">
       <div 
-        ng-if="penalty.standing_penalty().block_list()"
         class="col-md-9 patron-summary-alert"
         title="{{penalty.standing_penalty().name()}}">
         {{penalty.note() || penalty.standing_penalty().label()}}
       </div>
-      <div class="col-md-3"
-        ng-if="penalty.standing_penalty().block_list()">
+      <div class="col-md-3">
         {{penalty.set_date() | date:'shortDate'}}
       </div>
     </div>
     <div class="row" 
-      ng-class="{'patron-summary-divider' : patron().standing_penalties().length}">
+      ng-class="{'patron-summary-divider' : alert_penalties.length}">
       <div class="col-md-5">[% l('Profile') %]</div>
       <div class="col-md-7">{{patron().profile().name()}}</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 c10b3d4..c16ba00 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
@@ -276,7 +276,13 @@ function($q , $timeout , $location , egCore,  egUser , $locale) {
         var deferred = $q.defer();
         var p = service.current;
 
-        if (p.standing_penalties().length ||
+        service.alert_penalties = p.standing_penalties().filter(
+            function(pen) { 
+                return pen.standing_penalty().staff_alert() == 't' 
+            }
+        );
+
+        if (service.alert_penalties.length ||
             p.alert_message() ||
             p.active() == 'f' ||
             p.barred() == 't' ||
@@ -347,6 +353,9 @@ function($q , $timeout , $location , egCore,  egUser , $locale) {
 function($scope,  $q,  $location , $filter,  egCore,  egUser,  patronSvc) {
 
     function redirectToAlertPanel() {
+
+        $scope.alert_penalties = patronSvc.alert_penalties;
+
         if (patronSvc.alertsShown) return;
         patronSvc.alertsShown = true;