display text for system-generated copy alerts

Signed-off-by: Galen Charlton <gmc@esilibrary.com>

diff --git a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2 b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
index 4f9c917..a044ce4 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/circ_strings.tt2
@@ -34,7 +34,29 @@ s.COPY_IN_TRANSIT = '[% l("Copy is In-Transit") %]';
 s.TOO_MANY_CLAIMS_RETURNED = 
   '[% l("Patron exceeds claims returned count.  Force this action?") %]';
 s.MARK_NEVER_CHECKED_OUT = 
-  '[% l("Mark Never Checked Out: [_1]", "{{barcodes.toString()}}") %]'
+  '[% l("Mark Never Checked Out: [_1]", "{{barcodes.toString()}}") %]';
+s.ON_DEMAND_COPY_ALERT = {
+    'CHECKIN': {
+        'NORMAL' : '[% l("Normal checkin") %]',
+        'LOST' : '[% l("Copy was marked lost") %]',
+        'LOST_AND_PAID' : '[% l("Copy was marked lost and paid for") %]',
+        'MISSING' : '[% l("Copy was marked missing") %]',
+        'DAMAGED' : '[% l("Copy was marked damaged") %]',
+        'CLAIMSRETURNED' : '[% l("Copy was marked claims returned") %]',
+        'LONGOVERDUE' : '[% l("Copy was marked long overdue") %]',
+        'CLAIMSNEVERCHECKEDOUT' : '[% l("Copy was marked claims never checked out") %]'
+    },
+    'CHECKOUT': {
+        'NORMAL' : '[% l("Normal checkout") %]',
+        'LOST' : '[% l("Copy was marked lost") %]',
+        'LOST_AND_PAID' : '[% l("Copy was marked lost and paid for") %]',
+        'MISSING' : '[% l("Copy was marked missing") %]',
+        'DAMAGED' : '[% l("Copy was marked damaged") %]',
+        'CLAIMSRETURNED' : '[% l("Copy was marked claims returned") %]',
+        'LONGOVERDUE' : '[% l("Copy was marked long overdue") %]',
+        'CLAIMSNEVERCHECKEDOUT' : '[% l("Copy was marked claims never checked out") %]'
+    }
+};
 }]);
 </script>
 

diff --git a/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
index 3fe4c93..75c2df0 100644 (file)
--- a/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
+++ b/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
@@ -10,7 +10,7 @@
   <div class="modal-body">
     <div>
       <div class="row" ng-repeat="alert in alerts" style="border-bottom: 1px solid grey; margin-top: 3px;">
-        <div class="col-md-8" ng-class="{ acknowledged: isAcknowledged(alert) }">{{alert.note()}}</div>
+        <div class="col-md-8" ng-class="{ acknowledged: isAcknowledged(alert) }">{{alert.message}}</div>
         <div class="col-md-4">
           <button ng-if="canBeAcknowledged(alert)"
                   class="btn btn-xs btn-default"

diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 72b04e9..150173f 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1475,6 +1475,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,  egCopyAlert
         } else { // we got a list of copy alert objects ...
             return egCopyAlertManagerDialog.open({
                 alerts : evt.payload,
+                mode : action,
                 ok : function() {},
                 cancel : function() {}
             }).result.then(function() {

diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index cd1c22e..52dd96a 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -424,8 +424,15 @@ function($modal , $interpolate , egCore) {
                     $scope.alerts = args.alerts;
                     $scope.mode = args.mode || 'checkin';
 
+                    angular.forEach($scope.alerts, function(copy_alert) {
+                        var state = copy_alert.alert_type().state();
+                        var evt   = copy_alert.alert_type().event();
+                        copy_alert.message = copy_alert.note() ||
+                            egCore.strings.ON_DEMAND_COPY_ALERT[evt][state];
+                    });
+
                     $scope.isAcknowledged = function(copy_alert) {
-                        return (copy_alert.ack_time() || copy_alert.acked);
+                        return (copy_alert.acked);
                     };
                     $scope.canBeAcknowledged = function(copy_alert) {
                         return (!copy_alert.ack_time() && copy_alert.temp());