[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. e605e2499cc9434f94f0795d835f2e549e1e299b

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, rel_2_12 has been updated
       via  e605e2499cc9434f94f0795d835f2e549e1e299b (commit)
      from  5368363fd0cf2f1a21f30ec12b0a66b0f72924aa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e605e2499cc9434f94f0795d835f2e549e1e299b
Author: Jason Etheridge <jason at EquinoxInitiative.org>
Date:   Wed Aug 16 09:05:25 2017 -0400

    lp1709966 webstaff: Hold Verify prompt
    
    This implements the prompt and call logic for the Hold Verify feature for copy
    locations.
    
    Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/circ/checkin/t_hold_verify.tt2 b/Open-ILS/src/templates/staff/circ/checkin/t_hold_verify.tt2
new file mode 100644
index 0000000..75e6292
--- /dev/null
+++ b/Open-ILS/src/templates/staff/circ/checkin/t_hold_verify.tt2
@@ -0,0 +1,16 @@
+<div>
+  <div class="modal-header">
+    <button type="button" class="close"
+      ng-click="cancel()" aria-hidden="true">×</button>
+    <h4 class="modal-title alert alert-info">[% l('Hold Capture Delayed') %]</h4>
+  </div>
+  <div class="modal-body">[% l('This item could fulfill a hold request but capture has been delayed by policy.') %]</div>
+  <div class="modal-body">[% l('Item Barcode: [_1]','{{copy_barcode}}') %]</div>
+  <div class="modal-footer">
+    [% dialog_footer %]
+    <input type="submit" class="btn btn-primary"
+      ng-click="capture()" value="[% l('Capture') %]"/>
+    <button class="btn btn-warning"
+      ng-click="nocapture()">[% l('Do Not Capture') %]</button>
+  </div>
+</div>
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 c217f25..347c5c3 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -109,6 +109,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
     // these events can be overridden by staff during checkin
     service.checkin_overridable_events = 
         service.checkin_suppress_overrides.concat([
+        'HOLD_CAPTURE_DELAYED', // not technically overridable, but special prompt and param
         'TRANSIT_CHECKIN_INTERVAL_BLOCK'
     ])
 
@@ -394,6 +395,8 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
         switch(evt[0].textcode) {
             case 'COPY_ALERT_MESSAGE':
                 return service.copy_alert_dialog(evt[0], params, options, 'checkin');
+            case 'HOLD_CAPTURE_DELAYED':
+                return service.hold_capture_delay_dialog(evt[0], params, options, 'checkin');
             default: 
                 return service.override_dialog(evt, params, options, 'checkin');
         }
@@ -1483,6 +1486,37 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
         });
     }
 
+    // action == what action to take if the user confirms the alert
+    service.hold_capture_delay_dialog = function(evt, params, options, action) {
+        if (angular.isArray(evt)) evt = evt[0];
+        return $uibModal.open({
+            templateUrl: './circ/checkin/t_hold_verify',
+            controller:
+                       ['$scope','$uibModalInstance','params',
+                function($scope , $uibModalInstance , params) {
+                $scope.copy_barcode = params.copy_barcode;
+                $scope.capture = function() {
+                    params.capture = 'capture';
+                    $uibModalInstance.close();
+                };
+                $scope.nocapture = function() {
+                    params.capture = 'nocapture';
+                    $uibModalInstance.close();
+                };
+                $scope.cancel = function() { $uibModalInstance.dismiss(); };
+            }],
+            resolve : {
+                params : function() {
+                    return params;
+                }
+            }
+        }).result.then(
+            function(r) {
+                return service[action](params, options);
+            }
+        );
+    }
+
     // check the barcode.  If it's no good, show the warning dialog
     // Resolves on success, rejected on error
     service.test_barcode = function(bc) {

-----------------------------------------------------------------------

Summary of changes:
 .../templates/staff/circ/checkin/t_hold_verify.tt2 |   16 +++++++++
 .../web/js/ui/default/staff/circ/services/circ.js  |   34 ++++++++++++++++++++
 2 files changed, 50 insertions(+), 0 deletions(-)
 create mode 100644 Open-ILS/src/templates/staff/circ/checkin/t_hold_verify.tt2


hooks/post-receive
-- 
Evergreen ILS