[open-ils-commits] [GIT] Evergreen ILS branch master updated. ca5e57c9ecfc9bc67a5f9ae4bd0d318e7a9126d0
Evergreen Git
git at git.evergreen-ils.org
Mon Apr 30 14:27:06 EDT 2018
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 ca5e57c9ecfc9bc67a5f9ae4bd0d318e7a9126d0 (commit)
via aa647ea4bcc7f8ef8cfe74ad4bd79d19eb749012 (commit)
via b719b8593445f184518838ba3ee3cff724a34180 (commit)
via e949ada0a1d6d98f1836a5f9e96fbbadc85bd416 (commit)
via 2cdba87259cff8d8811d601496c77e31e46a9abf (commit)
from 9100dd6dddb81fdfcd341448e05543665bd37187 (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 ca5e57c9ecfc9bc67a5f9ae4bd0d318e7a9126d0
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 6 16:56:56 2018 -0500
LP#1738249: sort out circ or renewal workstation
This patch uses accs to work out the name of the workstation
of the most recent renewal, if it exists, or the original
checkout. It implicitly handles the case where the workstation
on the original circulation is null. As a bonus, this patch
adds an explicit "Last Renewal Workstation" to the item status
grid.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 99a3449..09a073d 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -89,7 +89,8 @@
<eg-grid-field label="[% l('Checkout Workstation') %]" path="_circ_summary.checkout_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout/Renewal Library') %]" path="_circ_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circulation ID') %]" path="_circ.id" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ_summary.last_renewal_workstation" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ_ws" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Last Renewal Workstation') %]" path="_circ_summary.last_renewal_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Classification') %]" path="call_number.label_class.name" hidden></eg-grid-field>
<eg-grid-field label="[% l('CN Prefix') %]" path="call_number.prefix.label" hidden></eg-grid-field>
<eg-grid-field label="[% l('CN Suffix') %]" path="call_number.suffix.label" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index b3ecd9f..963c0c9 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -152,6 +152,11 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
flatCopy._circ_summary = egCore.idl.toHash(copyData.circ_summary, true);
flatCopy._circ_lib = copyData.circ.circ_lib();
flatCopy._duration = copyData.circ.duration();
+ flatCopy._circ_ws = flatCopy._circ_summary.last_renewal_workstation ?
+ flatCopy._circ_summary.last_renewal_workstation :
+ flatCopy._circ_summary.checkout_workstation ?
+ flatCopy._circ_summary.checkout_workstation :
+ '';
}
flatCopy.index = service.index++;
flatCopy.copy_alert_count = copyData.copy.copy_alerts().filter(function(aca) {
commit aa647ea4bcc7f8ef8cfe74ad4bd79d19eb749012
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Feb 6 16:44:32 2018 -0500
LP#1738249: further fix to checkout workstation
Since accs.checkout_workstation contains the workstation associated
with the initial loan (and not any subsequent renewals), use that.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 64d38fd..99a3449 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -86,7 +86,7 @@
<eg-grid-field label="[% l('Checkin Scan Date') %]" path="_circ_summary.last_checkin_scan_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkin Workstation') %]" path="_circ_summary.last_checkin_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout Date') %]" path="_circ_summary.start_time" datatype="timestamp" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Checkout Workstation') %]" path="_checkout_ws" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Checkout Workstation') %]" path="_circ_summary.checkout_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout/Renewal Library') %]" path="_circ_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circulation ID') %]" path="_circ.id" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ_summary.last_renewal_workstation" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 1a6e839..b3ecd9f 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -152,7 +152,6 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
flatCopy._circ_summary = egCore.idl.toHash(copyData.circ_summary, true);
flatCopy._circ_lib = copyData.circ.circ_lib();
flatCopy._duration = copyData.circ.duration();
- flatCopy._checkout_ws = copyData.circ.workstation().name();
}
flatCopy.index = service.index++;
flatCopy.copy_alert_count = copyData.copy.copy_alerts().filter(function(aca) {
commit b719b8593445f184518838ba3ee3cff724a34180
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Thu Jan 25 12:50:59 2018 -0500
LP#1738249 - Fix checkout_workstation display issue
Addresses the issue with checkout workstation, by
attaching as a object property to the flatCopy hash.
Also makes sure the pcrud call uses combcirc.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 521d780..64d38fd 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -86,7 +86,7 @@
<eg-grid-field label="[% l('Checkin Scan Date') %]" path="_circ_summary.last_checkin_scan_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkin Workstation') %]" path="_circ_summary.last_checkin_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout Date') %]" path="_circ_summary.start_time" datatype="timestamp" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Checkout Workstation') %]" path="_circ.workstation.name" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Checkout Workstation') %]" path="_checkout_ws" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout/Renewal Library') %]" path="_circ_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circulation ID') %]" path="_circ.id" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ_summary.last_renewal_workstation" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 16b97fa..1a6e839 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -62,7 +62,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
}
service.getCirc = function(id) {
- return egCore.pcrud.search('aacs', { target_copy : id },
+ return egCore.pcrud.search('combcirc', { target_copy : id },
service.circFlesh).then(function(circ) {return circ});
}
@@ -152,6 +152,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
flatCopy._circ_summary = egCore.idl.toHash(copyData.circ_summary, true);
flatCopy._circ_lib = copyData.circ.circ_lib();
flatCopy._duration = copyData.circ.duration();
+ flatCopy._checkout_ws = copyData.circ.workstation().name();
}
flatCopy.index = service.index++;
flatCopy.copy_alert_count = copyData.copy.copy_alerts().filter(function(aca) {
commit e949ada0a1d6d98f1836a5f9e96fbbadc85bd416
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Fri Jan 19 12:55:03 2018 -0500
LP#1738249 - Webstaff CircLib should point to item's circ_lib plus misc
This addresses some display issues in the webstaff Item Status grid.
Besides, correcting the Circ Lib to be the item's and not the
circulation,this also fleshes the owning lib. Additionally, I've applied
miker's fix to 1743819 in order to prevent a regression.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 64bf498..521d780 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -86,10 +86,10 @@
<eg-grid-field label="[% l('Checkin Scan Date') %]" path="_circ_summary.last_checkin_scan_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkin Workstation') %]" path="_circ_summary.last_checkin_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout Date') %]" path="_circ_summary.start_time" datatype="timestamp" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Checkout Workstation') %]" path="_circ_summary.checkout_workstation" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Checkout Workstation') %]" path="_circ.workstation.name" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout/Renewal Library') %]" path="_circ_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circulation ID') %]" path="_circ.id" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ.workstation.name" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ_summary.last_renewal_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Classification') %]" path="call_number.label_class.name" hidden></eg-grid-field>
<eg-grid-field label="[% l('CN Prefix') %]" path="call_number.prefix.label" hidden></eg-grid-field>
<eg-grid-field label="[% l('CN Suffix') %]" path="call_number.suffix.label" hidden></eg-grid-field>
@@ -118,7 +118,7 @@
<eg-grid-field label="[% l('Loan Duration') %]" path="loan.duration" hidden></eg-grid-field>
<eg-grid-field label="[% l('OPAC Visible?') %]" path="opac_visible" hidden></eg-grid-field>
<eg-grid-field label="[% l('Owned By') %]" path="call_number.record.owner" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Owning Library') %]" path="call_number.owning_lib" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Owning Library') %]" path="call_number.owning_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Parts') %]" path="parts" hidden></eg-grid-field>
<eg-grid-field label="[% l('Price') %]" path="price" hidden></eg-grid-field>
<eg-grid-field label="[% l('Publication Date') %]" path="call_number.record.simple_record.pubdate" hidden></eg-grid-field>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/item.js b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
index 4e752bd..16b97fa 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/item.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/item.js
@@ -131,8 +131,7 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
if (copyData.circ) {
// flesh circ_lib locally
copyData.circ.circ_lib(egCore.org.get(copyData.circ.circ_lib()));
- copyData.circ.checkin_workstation(
- egCore.org.get(copyData.circ.checkin_workstation()));
+
}
var flatCopy;
@@ -142,6 +141,9 @@ function(egCore , egCirc , $uibModal , $q , $timeout , $window , egConfirmDialog
function(c) {return c.id == copyData.copy.id()})[0];
}
+ // flesh acn.owning_lib
+ copyData.copy.call_number().owning_lib(egCore.org.get(copyData.copy.call_number().owning_lib()));
+
if (!flatCopy) {
flatCopy = egCore.idl.toHash(copyData.copy, true);
commit 2cdba87259cff8d8811d601496c77e31e46a9abf
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Jan 16 23:40:32 2018 -0500
LP#1738249: Item status column picker fixes
Adds some fixes to the column pickers in the web staff client Item Status
interface:
* The Circulation Library field now displays the asset.copy circ library
instead of the checkout library.
* The Circulation Library and Checkout / Renewal Library now show the
shortname instead of the full name.
* A typo fix so that Remaining Renewals display
Conflicts:
Open-ILS/src/templates/staff/cat/item/t_list.tt2
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Jason Stephenson <jason at sigio.com>
diff --git a/Open-ILS/src/templates/staff/cat/item/t_list.tt2 b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
index 2addc1d..64bf498 100644
--- a/Open-ILS/src/templates/staff/cat/item/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/item/t_list.tt2
@@ -87,7 +87,7 @@
<eg-grid-field label="[% l('Checkin Workstation') %]" path="_circ_summary.last_checkin_workstation" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout Date') %]" path="_circ_summary.start_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('Checkout Workstation') %]" path="_circ_summary.checkout_workstation" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Checkout/Renewal Library') %]" path="_circ.circ_lib.name" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Checkout/Renewal Library') %]" path="_circ_lib.shortname" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circulation ID') %]" path="_circ.id" hidden></eg-grid-field>
<eg-grid-field label="[% l('Circ or Renewal Workstation') %]" path="_circ.workstation.name" hidden></eg-grid-field>
<eg-grid-field label="[% l('Classification') %]" path="call_number.label_class.name" hidden></eg-grid-field>
@@ -125,7 +125,7 @@
<eg-grid-field label="[% l('Publisher') %]" path="call_number.record.simple_record.publisher" hidden></eg-grid-field>
<eg-grid-field label="[% l('Quality') %]" path="call_number.record.simple_record.quality" hidden></eg-grid-field>
<eg-grid-field label="[% l('Reference?') %]" path="ref" hidden></eg-grid-field>
- <eg-grid-field label="[% l('Remaining Renewals') %]" path="_circ.renewals_remaining" hidden></eg-grid-field>
+ <eg-grid-field label="[% l('Remaining Renewals') %]" path="_circ.renewal_remaining" hidden></eg-grid-field>
<eg-grid-field label="[% l('Status Changed Time') %]" path="status_changed_time" datatype="timestamp" hidden></eg-grid-field>
<eg-grid-field label="[% l('TCN') %]" path="call_number.record.tcn_value" hidden></eg-grid-field>
<eg-grid-field label="[% l('TCN Source') %]" path="call_number.record.tcn_source" hidden></eg-grid-field>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/staff/cat/item/t_list.tt2 | 9 +++++----
.../web/js/ui/default/staff/circ/services/item.js | 13 ++++++++++---
2 files changed, 15 insertions(+), 7 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list