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

[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  e4d84edfe6dc97bf7585f40a1a6f5bd22eb3839f (commit)
       via  5fcf1e87c9412d6d7552b4cea699a358a267e496 (commit)
      from  879a4952319693ba6768229d00457d4a7775e4af (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 e4d84edfe6dc97bf7585f40a1a6f5bd22eb3839f
Author: Kathy Lussier <klussier at masslnc.org>
Date:   Thu Feb 9 11:20:00 2017 -0500

    LP#1639782: Release note entry for Active Date Column Picker Option
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/docs/RELEASE_NOTES_NEXT/Client/active-date-column-picker.adoc b/docs/RELEASE_NOTES_NEXT/Client/active-date-column-picker.adoc
new file mode 100644
index 0000000..4e7c448
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Client/active-date-column-picker.adoc
@@ -0,0 +1,4 @@
+Active Date Column Picker Option
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The active date will now be available as a column picker option in the Item
+Status screen.

commit 5fcf1e87c9412d6d7552b4cea699a358a267e496
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Mon Nov 7 07:40:24 2016 -0500

    LP#1639782 - Add Active Date to Item Status Column Picker
    
    Circ and Cataloging staff need a quick way to view the Active
    Date of an item in the "Item Status" (F5) interface.  This
    makes that column available for selection.
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/xul/staff_client/server/circ/util.js b/Open-ILS/xul/staff_client/server/circ/util.js
index 346a425..c9b557e 100644
--- a/Open-ILS/xul/staff_client/server/circ/util.js
+++ b/Open-ILS/xul/staff_client/server/circ/util.js
@@ -1229,6 +1229,23 @@ circ.util.columns = function(modify,params) {
         },
         {
             'fm_class' : 'acp',
+            'id' : 'acp_active_date',
+            'label' : document.getElementById('circStrings').getString('staff.circ.utils.active_date'),
+            'flex' : 1,
+            'sort_type' : 'date',
+            'primary' : false,
+            'hidden' : true,
+            'editable' : false, 'render' : function(my) { return util.date.formatted_date( my.acp.active_date(), '%{localized}' ); }
+            ,'sort_value' : function(my) {
+                return util.date.db_date2Date(
+                    my.acp
+                    ? my.acp.active_date()
+                    : null
+                ).getTime();
+            }
+        }, 
+        {
+            'fm_class' : 'acp',
             'id' : 'acp_edit_date',
             'label' : document.getElementById('circStrings').getString('staff.circ.utils.edit_date'),
             'flex' : 1,
diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
index 926e3a2..7f3798c 100644
--- a/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
+++ b/Open-ILS/xul/staff_client/server/locale/en-US/circ.properties
@@ -281,6 +281,7 @@ staff.circ.utils.xact_finish=Transaction Finished
 staff.circ.utils.checkin_scan_time=Checkin Scan Date
 staff.circ.utils.checkin_workstation=Checkin Workstation
 staff.circ.utils.create_date=Date Created
+staff.circ.utils.active_date=Date Active
 staff.circ.utils.edit_date=Date Last Edited 
 staff.circ.utils.bre.create_date=Date Record Created
 staff.circ.utils.bre.edit_date=Date Record Last Edited 

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

Summary of changes:
 Open-ILS/xul/staff_client/server/circ/util.js      |   17 +++++++++++++++++
 .../server/locale/en-US/circ.properties            |    1 +
 .../Client/active-date-column-picker.adoc          |    4 ++++
 3 files changed, 22 insertions(+), 0 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Client/active-date-column-picker.adoc


hooks/post-receive
-- 
Evergreen ILS