[open-ils-commits] [GIT] Evergreen ILS branch master updated. 2ea48c6e65c8619888f13805a8e32912c14762c1

[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, master has been updated
       via  2ea48c6e65c8619888f13805a8e32912c14762c1 (commit)
       via  deb937bc82fa72272be333b1691700279a6e9116 (commit)
      from  7ba737d4d8937d1b3da2f08b0bc73e12130e3bba (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 2ea48c6e65c8619888f13805a8e32912c14762c1
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Fri Nov 17 12:40:43 2017 -0500

    LP#1708489: Adjust sample holds status
    
    Changed the sample holds status to a status that would show up on a real-world holds
    shelf.
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 135b97b..71e9117 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -535,7 +535,7 @@ function($scope , $q , egCore , ngToast) {
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
                 patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
-                status_string : 'In Transit'
+                status_string : 'Canceled'
             }
         ]
     }

commit deb937bc82fa72272be333b1691700279a6e9116
Author: Kyle Huckins <khuckins at catalyte.io>
Date:   Tue Oct 24 18:12:31 2017 +0000

    LP#1708489 Hold Shelf Print Template Additions
    
    - Add Hold Status and Shelf Expiry Date to Hold Shelf Print
    Template
    
    Signed-off-by: Kyle Huckins <khuckins at catalyte.io>
    
     Changes to be committed:
    	modified:   Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
    	modified:   Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
index 375e9b9..a92f45c 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
@@ -11,6 +11,8 @@ Template for printing a list of items on the hold shelf. Fields include:
   * author
   * volume.label
   * copy.barcode
+  * status_string
+  * hold.shelf_expire_time
 
 -->
 <table id='shelf-list-template-table'>
@@ -29,6 +31,8 @@ Template for printing a list of items on the hold shelf. Fields include:
       <th>[% l('Author') %]</th>
       <th>[% l('Call Number') %]</th>
       <th>[% l('Barcode/Part') %]</th>
+      <th>[% l('Status') %]</th>
+      <th>[% l('Shelf Expire Time') %]</th>
     </tr>
   </thead>
   <tbody>
@@ -47,6 +51,8 @@ Template for printing a list of items on the hold shelf. Fields include:
       <td>{{hold_data.author}}</td>
       <td>{{hold_data.volume.label}}</td>
       <td>{{hold_data.copy.barcode}} {{hold_data.part.label}}</td>
+      <td>{{hold_data.status_string}}</td>
+      <td>{{hold_data.hold.shelf_expire_time | date:'yyyy-MM-dd HH:mm:ss'}}</td>
     </tr>
   </tbody>
 </table>
diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 11510f4..135b97b 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -397,7 +397,8 @@ function($scope , $q , egCore , ngToast) {
         sms_notify : '111-222-3333',
         email_notify : 'user at example.org',
         request_time : new Date().toISOString(),
-        hold_type : 'T'
+        hold_type : 'T',
+        shelf_expire_time : new Date().toISOString()
     }
 
     var seed_transit = {
@@ -517,21 +518,24 @@ function($scope , $q , egCore , ngToast) {
                 volume : { label : '646.4 SOM' }, copy : seed_copy,
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
-                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane'
+                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
+                status_string : 'Ready for Pickup'
             },
             {
                 hold : one_hold, title : 'Some Title 2', author : 'Some Author 2',
                 volume : { label : '646.4 SOM' }, copy : seed_copy,
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
-                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane'
+                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
+                status_string : 'Ready for Pickup'
             },
             {
                 hold : one_hold, title : 'Some Title 3', author : 'Some Author 3',
                 volume : { label : '646.4 SOM' }, copy : seed_copy,
                 part : { label : 'v. 1' },
                 patron_barcode : 'S52802662',
-                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane'
+                patron_alias : 'XYZ', patron_last : 'Smith', patron_first : 'Jane',
+                status_string : 'In Transit'
             }
         ]
     }

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

Summary of changes:
 .../share/print_templates/t_hold_shelf_list.tt2    |    6 ++++++
 .../js/ui/default/staff/admin/workstation/app.js   |   12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS