[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8c594593d39b9671cd9ab15f3a05e65314672c74
Evergreen Git
git at git.evergreen-ils.org
Tue Oct 17 14:04:32 EDT 2017
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 8c594593d39b9671cd9ab15f3a05e65314672c74 (commit)
via a5a4d91d84add7de18b07dd2f5404666ce176754 (commit)
from 6ad3acf2af15f9050b0ad69fec15937e9c39c93a (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 8c594593d39b9671cd9ab15f3a05e65314672c74
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Tue Oct 3 16:42:43 2017 -0400
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 at equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
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 c7b3d4a..aa112ed 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
@@ -55,7 +55,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}} <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 771bb17..3d920c9 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
@@ -60,6 +60,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}} <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 315c155..ea9503d 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
@@ -13,7 +13,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>
@@ -45,9 +45,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 06166df..bb544d0 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
@@ -1506,11 +1506,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);
commit a5a4d91d84add7de18b07dd2f5404666ce176754
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date: Mon Oct 2 17:57:39 2017 -0400
LP#1714566 - enable hold notes set to print on slip to be shown
Adds a bit of code and edits the realted templates in order
to be able to see any hold notes set to print on the slip.
Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
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 8fa2d4b..c7b3d4a 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
@@ -54,6 +54,10 @@
<span>{{hold.request_time | date:$root.egDateFormat}}</span>
</div>
<div>
+ <span>[% l('Request Notes:') %]</span>
+ <ul><li ng-repeat="n in holdslip_notes"><strong>{{n.title}}</strong>: {{n.body}}</li></ul>
+ </div>
+ <div>
<span>[% l('Slip Date:') %]</span>
<span>{{today | date:$root.egDateFormat}}</span>
</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 2d1a9f7..315c155 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
@@ -13,6 +13,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)
-->
<div>
@@ -44,7 +45,11 @@ 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">
+ <ul>Notes:
+ <li ng-repeat="note in holdslip_notes">{{note}}</li>
+ </ul>
+ </div>
<br/>
<div>[% l('Request Date: [_1]',
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 5910127..06166df 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
@@ -1504,6 +1504,15 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
if (data.patron) {
print_context.hold = egCore.idl.toHash(evt.payload.hold);
+ var notes = print_context.hold.notes;
+ if(notes.length > 0){
+ print_context.holdslip_notes = [];
+ angular.forEach(notes, function(n){
+ if (n.slip){
+ print_context.holdslip_notes.push(n);
+ }
+ });
+ }
print_context.patron = egCore.idl.toHash(data.patron);
}
-----------------------------------------------------------------------
Summary of changes:
.../staff/circ/share/t_hold_shelf_dialog.tt2 | 4 ++++
.../staff/circ/share/t_transit_dialog.tt2 | 6 ++++++
.../share/print_templates/t_hold_shelf_slip.tt2 | 7 ++++++-
.../web/js/ui/default/staff/circ/services/circ.js | 7 +++++++
4 files changed, 23 insertions(+), 1 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list