From b12d5a92fb7fefa123cd3a176373148d60e04f1f Mon Sep 17 00:00:00 2001
From: Remington Steed <rjs7@calvin.edu>
Date: Fri, 26 Oct 2018 11:28:32 -0400
Subject: [PATCH] LP#1800178 Holdings View should also sort by part
The Holdings View tab of the web client doesn't correctly sort by
monograph parts. The JS is already grabbing the part label for display,
so this commit moves that chunk before the sorting code, and also grabs
the sort key. Note that the part labels and sort keys are joined per
item, since the database supports multiple parts per item (though the UI
hasn't yet supported that). And we now join the label on comma-space,
instead of the default (just a comma).
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Signed-off-by: Rogan Hamby <rogan.hamby@gmail.com>
Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
.../js/ui/default/staff/cat/services/holdings.js | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js b/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
index 20ce815faf..ad16b5d1f2 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
@@ -78,6 +78,15 @@ function(egCore , $q) {
function() { // finished
if (p.cancel) return;
+ // create virtual field for displaying active parts
+ angular.forEach(svc.copies, function (cp) {
+ cp.monograph_parts = '';
+ if (cp.parts && cp.parts.length > 0) {
+ cp.monograph_parts = cp.parts.map(function(obj) { return obj.label; }).join(', ');
+ cp.monograph_parts_sortkeys = cp.parts.map(function(obj) { return obj.label_sortkey; }).join();
+ }
+ });
+
svc.copies = svc.copies.sort(
function (a, b) {
function compare_array (x, y, i) {
@@ -105,6 +114,10 @@ function(egCore , $q) {
if (a.call_number.label < b.call_number.label) return -1;
if (a.call_number.label > b.call_number.label) return 1;
+ // also parts sortkeys combined string
+ if (a.monograph_parts_sortkeys < b.monograph_parts_sortkeys) return -1;
+ if (a.monograph_parts_sortkeys > b.monograph_parts_sortkeys) return 1;
+
// try copy number
if (a.copy_number < b.copy_number) return -1;
if (a.copy_number > b.copy_number) return 1;
@@ -117,14 +130,6 @@ function(egCore , $q) {
}
);
- // create virtual field for displaying active parts
- angular.forEach(svc.copies, function (cp) {
- cp.monograph_parts = '';
- if (cp.parts && cp.parts.length > 0) {
- cp.monograph_parts = cp.parts.map(function(obj) { return obj.label; }).join();
- }
- });
-
// create virtual field for copy alert count
angular.forEach(svc.copies, function (cp) {
if (cp.copy_alerts) cp.copy_alert_count = cp.copy_alerts.length;
--
2.11.0