From 035bab04c39fc676c1c30bd16bfa4622fecfb3c6 Mon Sep 17 00:00:00 2001
From: Cesar Velez <cesar.velez@equinoxinitiative.org>
Date: Tue, 3 Oct 2017 16:42:43 -0400
Subject: [PATCH] LP#1714566 - enable hold notes to display on dialogs

Also display all notes in the hold shelf dialog and other dialogs
so that staff is aware of any public notes that will
print.

Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
---
 Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2     | 2 +-
 Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2        | 6 ++++++
 .../src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 | 6 +++---
 Open-ILS/web/js/ui/default/staff/circ/services/circ.js              | 6 ++----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2
index 90ae8250bb..4e98cd2a49 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_hold_shelf_dialog.tt2
@@ -51,7 +51,7 @@
     </div>
     <div>
       <span>[% l('Request Notes:') %]</span>
-      <ul><li ng-repeat="n in holdslip_notes"><strong>{{n.title}}</strong>: {{n.body}}</li></ul>
+      <ul><li ng-repeat="n in hold_notes"><strong>{{n.title}}</strong>: {{n.body}} &nbsp;<span ng-if="n.slip =='t' || n.pub == 't'">[Patron-visible]</span></li></ul>
     </div>
     <div>
       <span>[% l('Slip Date:') %]</span>
diff --git a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2 b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
index c04a6064ff..87f251e779 100644
--- a/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
+++ b/Open-ILS/src/templates/staff/circ/share/t_transit_dialog.tt2
@@ -56,6 +56,12 @@
           <span>[% l('Request Date:') %]</span>
           <span>{{hold.request_time | date:$root.egDateFormat}}</span>
         </div>
+        <div ng-if="hold_notes">
+          <span>[% l('Request Notes:') %]</span>
+          <ul>
+              <li ng-repeat="n in hold_notes"><strong>{{n.title}}</strong> - {{n.body}}&nbsp;<span ng-if="n.slip == 't' || n.pub == 't'">[Patron-visible]</span></li>
+          </ul>
+        </div>
       </div>
       <div>
         <div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
index 50aa191aa1..6609224dbd 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
@@ -12,7 +12,7 @@ Template for printing hold request slips. Fields include:
 * hold.phone_notify
 * hold.sms_notify
 * hold.email_notify
-* holdslip_notes (array of slip-printable notes)
+* hold_notes (array of slip-printable notes)
 
 -->
 <div>
@@ -42,9 +42,9 @@ Template for printing hold request slips. Fields include:
   <div ng-if="hold.phone_notify">[% l('Notify by phone: [_1]', '{{hold.phone_notify}}') %]</div>
   <div ng-if="hold.sms_notify">[% l('Notify by text: [_1]', '{{hold.sms_notify}}') %]</div>
   <div ng-if="hold.email_notify == 't'">[% l('Notify by email: [_1]', '{{patron.email}}') %]</div>
-    <div ng-if="holdslip_notes">
+    <div ng-if="hold_notes">
       <ul>Notes:
-        <li ng-repeat="note in holdslip_notes">{{note}}</li>
+        <li ng-repeat="note in hold_notes | filter: {slip : 't'}"><strong>{{note.title}}</strong> - {{note.body}}</li>
       </ul>
     </div>
   <br/>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
index 6d0383df86..12be8d5d97 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/services/circ.js
@@ -1493,11 +1493,9 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
                 print_context.hold = egCore.idl.toHash(evt.payload.hold);
                 var notes = print_context.hold.notes;
                 if(notes.length > 0){
-                    print_context.holdslip_notes = [];
+                    print_context.hold_notes = [];
                     angular.forEach(notes, function(n){
-                        if (n.slip){
-                            print_context.holdslip_notes.push(n);
-                        }
+                        print_context.hold_notes.push(n);
                     });
                 }
                 print_context.patron = egCore.idl.toHash(data.patron);
-- 
2.11.0