From: Kyle Huckins Date: Thu, 23 May 2019 20:53:11 +0000 (+0000) Subject: lp1034058 Disable Renewal Due Dates in the Past X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e430a18707d1741a506cf30f356a8cb542d00084;p=working%2FEvergreen.git lp1034058 Disable Renewal Due Dates in the Past - Apply minimum date and an out of range flag to prevent selecting or inputting a past date when renewing items from Circulation->Renew Items or Patron->Items Out->Actions-> Renew With Specific Due Date. Signed-off-by: Kyle Huckins Changes to be committed: modified: Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 modified: Open-ILS/web/js/ui/default/staff/circ/renew/app.js modified: Open-ILS/src/templates/staff/circ/patron/t_renew_with_date_dialog.tt2 modified: Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js --- diff --git a/Open-ILS/src/templates/staff/circ/patron/t_renew_with_date_dialog.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_renew_with_date_dialog.tt2 index c2e0958c95..ca732aea4f 100644 --- a/Open-ILS/src/templates/staff/circ/patron/t_renew_with_date_dialog.tt2 +++ b/Open-ILS/src/templates/staff/circ/patron/t_renew_with_date_dialog.tt2 @@ -13,11 +13,12 @@
- +
diff --git a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 index 886e93fdbb..28ff323a3e 100644 --- a/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 +++ b/Open-ILS/src/templates/staff/circ/renew/t_renew.tt2 @@ -18,7 +18,8 @@ ng-model="renewalArgs.copy_barcode" id="patron-renewal-barcode" type="text"/> - + @@ -33,7 +34,8 @@ -
+
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 f0a795fa2c..327eeb5fe6 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 @@ -477,6 +477,8 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc , controller : [ '$scope','$uibModalInstance', function($scope , $uibModalInstance) { + $scope.outOfRange = false; + $scope.minDate = new Date(); $scope.args = { barcodes : barcodes, date : new Date() diff --git a/Open-ILS/web/js/ui/default/staff/circ/renew/app.js b/Open-ILS/web/js/ui/default/staff/circ/renew/app.js index 2c6ba639ea..63dbd91e9d 100644 --- a/Open-ILS/web/js/ui/default/staff/circ/renew/app.js +++ b/Open-ILS/web/js/ui/default/staff/circ/renew/app.js @@ -36,6 +36,8 @@ function($scope , $window , $location , egCore , egGridDataProvider , egCirc) { egCore.hatch.getItem('circ.renew.strict_barcode') .then(function(sb){ $scope.strict_barcode = sb }); $scope.focusBarcode = true; + $scope.outOfRange = false; + $scope.minDate = new Date(); $scope.renewals = []; var today = new Date();