From f042a5812866048a0b3a3c4bcb6117e828484fff Mon Sep 17 00:00:00 2001 From: Victoria Lewis <“vlewis@catalystitservices.com”> Date: Fri, 17 Jul 2015 14:43:03 -0700 Subject: [PATCH] LP#1437109 Calculate renew and edit due date MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Add code to correctly calculate renew and edit due dates. Signed-off-by: Victoria Lewis <“vlewis@catalystitservices.com”> --- Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js | 6 +++--- Open-ILS/web/js/ui/default/staff/services/ui.js | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js index f8f4dd8e40..6e5a73cdcb 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js +++ b/Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js @@ -263,7 +263,7 @@ function($scope, $q, $routeParams, egCore , egUser, patronSvc , // if there is only one circ, default to the due date // of that circ. Otherwise, default to today. var due_date = items.length == 1 ? - Date.parse(items[0].due_date()) : new Date(); + new Date(Date.parse(items[0].due_date())) : new Date(); $scope.args = { num_circs : items.length, @@ -275,9 +275,9 @@ function($scope, $q, $routeParams, egCore , egUser, patronSvc , $scope.ok = function(args) { // toISOString gives us Zulu time, so // adjust for that before truncating to date - var adjust_date = new Date( $scope.args.date ); + var adjust_date = new Date( $scope.args.due_date ); adjust_date.setMinutes( - $scope.args.date.getMinutes() - adjust_date.getTimezoneOffset() + $scope.args.due_date.getMinutes() - adjust_date.getTimezoneOffset() ); var due = adjust_date.toISOString().replace(/T.*/,''); console.debug("applying due date of " + due); 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 25312c667c..a6af85c16e 100644 --- a/Open-ILS/web/js/ui/default/staff/services/ui.js +++ b/Open-ILS/web/js/ui/default/staff/services/ui.js @@ -305,6 +305,11 @@ It also allows us to abstract away some browser finickiness. // user's expectations. Note this allows us to retain // the timezone. function strip_time(date) { + if(date.getTimezoneOffset() > 0){ + date.setMinutes (date.getMinutes() + date.getTimezoneOffset()); + } else { + date.setMinutes (date.getMinutes() - date.getTimezoneOffset()); + } if (!date) date = new Date(); date.setHours(0); date.setMinutes(0); -- 2.11.0