From 2b0f4098a37903a548158a3b69ac451c2fee5fc6 Mon Sep 17 00:00:00 2001
From: Josh Stompro <stompro@stompro.org>
Date: Tue, 27 Jul 2021 09:34:11 -0500
Subject: [PATCH] LP#1642000 - Add Prefix,Suffix and Part to bootsrap opac circ
 history

Signed-off-by: Josh Stompro <stompro@stompro.org>
Signed-off-by: Elaine Hardy <ehardy@georgialibraries.org>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 .../opac/myopac/circ_history.tt2                   | 30 ++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2 b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
index c057a4a9e4..e18bdf55eb 100755
--- a/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
+++ b/Open-ILS/src/templates-bootstrap/opac/myopac/circ_history.tt2
@@ -96,7 +96,17 @@
                         circ.SORTING = circ.circ.target_copy.barcode;
 
                     CASE "callnum";
-                        circ.SORTING = circ.circ.target_copy.call_number.label;
+                        sortlist = [];
+
+                        FOREACH element IN [circ.circ.target_copy.call_number.prefix.label_sortkey
+                                            circ.circ.target_copy.call_number.label_sortkey
+                                            circ.circ.target_copy.call_number.suffix.label_sortkey
+                                            circ.circ.target_copy.parts.0.label_sortkey];
+                            IF (element);
+                                sortlist.push(element);
+                            END;
+                        END;
+                        circ.SORTING = sortlist.join("");
 
                     CASE;
                         sort_field = "";
@@ -162,7 +172,23 @@
                                 ) %]">[% circ.ATTRS.author | html %]</a>
                             [% END; %]
                         </td>
-                        <td>[% circ.circ.target_copy.call_number.label | html %]</td>
+                        <td>
+                              [%-
+                                   cnlist = [];
+                                   FOREACH element IN [circ.circ.target_copy.call_number.prefix.label
+                                                circ.circ.target_copy.call_number.label
+                                                circ.circ.target_copy.call_number.suffix.label];
+                                       IF (element);
+                                         cnlist.push(element);
+                                       END;
+                                   END;
+                                   cn = cnlist.join(' ');
+                              %]
+                              [% cn | html %]
+                              [%- IF circ.circ.target_copy.parts.0.label %]
+                                    </BR>[% circ.circ.target_copy.parts.0.label | html -%]
+                              [%- END %]
+                        </td>
                         <td>
                             [% date.format(ctx.parse_datetime(circ.circ.xact_start),DATE_FORMAT); %]
                         </td>
-- 
2.11.0