LP#1437109 Calculate renew and edit due date

Add code to correctly calculate renew and edit due dates.

Signed-off-by: Victoria Lewis <“vlewis@catalystitservices.com”>

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 f8f4dd8..6e5a73c 100644 (file)
--- 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 25312c6..a6af85c 100644 (file)
--- 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);