From 74204dcb81e1bf79ffff050e9c8d52715acb1238 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 3 Jul 2014 14:29:52 -0400 Subject: [PATCH] patron holds : edit dates Signed-off-by: Bill Erickson --- .../src/templates/staff/circ/patron/t_holds.tt2 | 2 + .../templates/staff/circ/share/t_hold_dates.tt2 | 75 ++++++++++++++++++++++ .../staff/circ/share/t_hold_notification_prefs.tt2 | 28 +++++--- .../web/js/ui/default/staff/circ/patron/holds.js | 3 + .../web/js/ui/default/staff/circ/services/holds.js | 45 +++++++++++++ Open-ILS/web/js/ui/default/staff/services/ui.js | 19 +++++- 6 files changed, 160 insertions(+), 12 deletions(-) create mode 100644 Open-ILS/src/templates/staff/circ/share/t_hold_dates.tt2 diff --git a/Open-ILS/src/templates/staff/circ/patron/t_holds.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_holds.tt2 index d1ff57fb91..ea0c7dd819 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_holds.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_holds.tt2 @@ -25,6 +25,8 @@ label="[% l('Edit Pickup Library') %]"> + diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_dates.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_dates.tt2 new file mode 100644 index 0000000000..b145d0e601 --- /dev/null +++ b/Open-ILS/src/templates/staff/circ/share/t_hold_dates.tt2 @@ -0,0 +1,75 @@ +
+
+ +

+ [% l('Modify Dates for [_1] Hold(s)', '{{num_holds}}') %] +

+
+
+
+
+ [% l('Check the checkbox next to each field you wish to modify.') %] +
+
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+ + +
+
+ +
+
+ +
+
+
+
+ + +
+
+ + diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_notification_prefs.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_notification_prefs.tt2 index c0f55d2ab3..7f2659d21e 100644 --- a/Open-ILS/src/templates/staff/circ/share/t_hold_notification_prefs.tt2 +++ b/Open-ILS/src/templates/staff/circ/share/t_hold_notification_prefs.tt2 @@ -3,7 +3,7 @@

- [% l('Edit Hold Notification Settings') %] + [% l('Edit Notification Settings for [_1] Hold(s)', '{{num_holds}}') %]

@@ -15,7 +15,8 @@
- + +
@@ -27,35 +28,42 @@
- + +
- +
- +
- + +
- +
- +
- + +
-
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js b/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js index ca54d5646d..8720003ed1 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/holds.js @@ -129,6 +129,9 @@ function($scope, $q, $routeParams, egCore, egUser, patronSvc, $scope.edit_notify_prefs = function(items) { generic_update(items, 'edit_notify_prefs'); } + $scope.edit_dates = function(items) { + generic_update(items, 'edit_dates'); + } }]) diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js index 2d4808ed4d..a49fb89d1f 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/services/holds.js +++ b/Open-ILS/web/js/ui/default/staff/circ/services/holds.js @@ -142,6 +142,7 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { function($scope, $modalInstance, sms_carriers) { $scope.args = {} $scope.sms_carriers = sms_carriers; + $scope.num_holds = hold_ids.length; $scope.ok = function() { var vals = hold_ids.map(function(hold_id) { @@ -172,6 +173,50 @@ function($modal , $q , egCore , egAlertDialog , egConfirmDialog) { }).result; } + service.edit_dates = function(hold_ids) { + if (!hold_ids.length) return $q.when(); + + // collects the fields from the dialog the user wishes to modify + function relay_to_update(modal_scope) { + var vals = hold_ids.map(function(hold_id) { + var val = {id : hold_id}; + angular.forEach( + ['thaw_date', 'request_time', 'expire_time', 'shelf_expire_time'], + function(field) { + if (modal_scope.args['modify_' + field]) + val[field] = modal_scope.args[field].toISOString(); + } + ); + + return val; + }); + + console.log(JSON.stringify(vals,null,2)); + return service.update_holds(vals); + } + + return $modal.open({ + templateUrl : './circ/share/t_hold_dates', + controller : + ['$scope', '$modalInstance', + function($scope, $modalInstance) { + var today = new Date(); + $scope.args = { + thaw_date : today, + request_time : today, + expire_time : today, + shelf_expire_time : today + } + $scope.num_holds = hold_ids.length; + $scope.ok = function() { + relay_to_update($scope).then($modalInstance.close); + } + $scope.cancel = function() { $modalInstance.dismiss() } + } + ], + }).result; + } + return service; }]) 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 91dc54fdfc..138394aa86 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -264,12 +264,27 @@ It also allows us to abstract away some browser finickiness. template: '', replace: true, link: function(scope, elm, attrs, ngModelCtrl) { + + // since this is a date-only selector, set the time + // portion to 00:00:00, which should better match the + // user's expectations. Note this allows us to retain + // the timezone. + function strip_time(date) { + date.setHours(0); + date.setMinutes(0); + date.setSeconds(0); + date.setMilliseconds(0); + return date; + } + ngModelCtrl.$formatters.unshift(function (modelValue) { - return dateFilter(modelValue, 'yyyy-MM-dd'); + // apply strip_time here in case the user never + // modifies the date value. + return dateFilter(strip_time(modelValue), 'yyyy-MM-dd'); }); ngModelCtrl.$parsers.unshift(function(viewValue) { - return new Date(viewValue); + return strip_time(new Date(viewValue)); }); }, }; -- 2.11.0