[open-ils-commits] [GIT] Evergreen ILS branch rel_3_4 updated. 5418f1b851eb79c323dfaf72f321dbedf49ff3c6

Evergreen Git git at git.evergreen-ils.org
Mon Jul 20 17:30:34 EDT 2020


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_4 has been updated
       via  5418f1b851eb79c323dfaf72f321dbedf49ff3c6 (commit)
      from  de8e1a075264a629191cd33c23d9f1c8f79f9dfc (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 5418f1b851eb79c323dfaf72f321dbedf49ff3c6
Author: Kyle Huckins <khuckins at catalyte.io>
Date:   Thu May 23 21:47:02 2019 +0000

    lp1775286 Color Indication of Overdue on Items Out
    
    - Overdue items are highlighted in red in the Items Out UI.
    - Ensure overdue-row and lost-row classes handle visited links
    
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    Signed-off-by: Jennifer Pringle <jennifer.pringle at bc.libraries.coop>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
index 8dc89022e1..06d1d0bf0e 100644
--- a/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2
@@ -49,7 +49,8 @@
   features="clientsort,allowAll"
   items-provider="gridDataProvider"
   persist-key="circ.patron.items_out"
-  dateformat="{{$root.egDateAndTimeFormat}}">
+  dateformat="{{$root.egDateAndTimeFormat}}"
+  row-class="colorizeItemsOutList">
 
   <eg-grid-action handler="print_receipt"
     label="[% l('Print Item Receipt') %]"></eg-grid-action>
@@ -80,7 +81,7 @@
       {{item.target_copy().barcode()}}
     </a>
   </eg-grid-field>
-  <eg-grid-field label="[% l('Due Date') %]" path='due_date' datefilter="egDueDate" dateonlyinterval="duration" datecontext="circ_lib" datatype="timestamp"></eg-grid-field>
+  <eg-grid-field label="[% l('Due Date') %]" path='due_date' datefilter="egDueDate" dateonlyinterval="duration" datecontext="circ_lib" datatype="timestamp" required></eg-grid-field>
   <eg-grid-field label="[% l('Workstation') %]" path='workstation.name'></eg-grid-field>
   <eg-grid-field label="[% l('Checkin Workstation') %]" path='checkin_workstation.name'></eg-grid-field>
   <eg-grid-field label="[% l('Checkout / Renewal Library') %]" path='circ_lib.shortname'></eg-grid-field>
diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 5db43ef5d2..684cf3d843 100644
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -353,7 +353,7 @@ table.list tr.selected td { /* deprecated? */
   color: #FFF;
   background-color: #EB0000 !important;
 }
-.overdue-row a:link, .lost-row a:link {
+.overdue-row a:link, .overdue-row a:visited, .lost-row a:link, .lost-row a:visited {
   color: #B8ECFF;
 }
 
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 9514f16f7d..fb411de99f 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
@@ -89,6 +89,15 @@ function($scope , $q , $routeParams , $timeout , egCore , egUser , patronSvc ,
         // noncat_list always involves instantiating a new grid.
     }
 
+    $scope.colorizeItemsOutList = {
+        apply: function(item) {
+            var duedate = item.due_date();
+            if (duedate && duedate < new Date().toISOString()) {
+                return 'overdue-row';
+            }
+        }
+    }
+
     // Reload the user to pick up changes in items out, fines, etc.
     // Reload circs since the contents of the main vs. alt list may
     // have changed.

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

Summary of changes:
 Open-ILS/src/templates/staff/circ/patron/t_items_out.tt2  | 5 +++--
 Open-ILS/src/templates/staff/css/style.css.tt2            | 2 +-
 Open-ILS/web/js/ui/default/staff/circ/patron/items_out.js | 9 +++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list