[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. d2d255ccde1704a4e0e1ff02a2888ba836322d67

[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_3_0 has been updated
       via  d2d255ccde1704a4e0e1ff02a2888ba836322d67 (commit)
       via  f106953c692ec0bdfb7a8aaa865a8d69ae56c4ef (commit)
      from  5ae6a7bf715019fb78eb2d8da1c9693faa533477 (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 d2d255ccde1704a4e0e1ff02a2888ba836322d67
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Sep 21 16:46:17 2018 -0400

    LP#1791340: expand on comment about backdated checkin times
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
index 748fe77..a07dfdf 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
@@ -131,6 +131,10 @@ function($scope , $q , $window , $location , $timeout , egCore , checkinSvc , eg
         var params = angular.copy(args);
 
         // a backdate of 'today' is not really a backdate
+        // (and this particularly matters when checking in hourly
+        // loans, as backdated checkins currently get the time
+        // portion of the checkin time from the due date; this will
+        // stop mattering when FIXME bug 1793817 is dealt with)
         if (!$scope.is_backdate())
             delete params.backdate;
 

commit f106953c692ec0bdfb7a8aaa865a8d69ae56c4ef
Author: Dan Wells <dbw2 at calvin.edu>
Date:   Fri Sep 21 10:45:59 2018 -0400

    LP#1791340 Webstaff: Don't backdate when we're not
    
    There was code in the webstaff checkin interface which attempted to
    remove the backdate parameter when it wasn't needed, as its mere
    presence has a negative effect on the checkin process.  This fail-safe
    was not working, however.
    
    Instead, let's build on the same check function used for the display,
    so we can be more sure that if the user doesn't see that they are
    backdating, the interface will not treat it as a backdate, and
    vice-versa.
    
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
index d037c9a..748fe77 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
@@ -130,13 +130,13 @@ function($scope , $q , $window , $location , $timeout , egCore , checkinSvc , eg
     function compile_checkin_args(args) {
         var params = angular.copy(args);
 
+        // a backdate of 'today' is not really a backdate
+        if (!$scope.is_backdate())
+            delete params.backdate;
+
         if (params.backdate) {
             params.backdate = 
                 params.backdate.toISOString().replace(/T.*/,'');
-
-            // a backdate of 'today' is not really a backdate
-            if (params.backdate == $scope.max_backdate)
-                delete params.backdate;
         }
 
         angular.forEach(['noop','void_overdues',

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

Summary of changes:
 .../web/js/ui/default/staff/circ/checkin/app.js    |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS