From: erickson Date: Thu, 21 Aug 2008 16:19:34 +0000 (+0000) Subject: updated the default print template to show library hours and address X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b70de7efc4a63abc337a6114b340995d406b6753;p=Evergreen.git updated the default print template to show library hours and address git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_2_3@10399 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js index 9455c05e0d..fae706a63a 100644 --- a/Open-ILS/web/opac/extras/selfcheck/selfcheck.js +++ b/Open-ILS/web/opac/extras/selfcheck/selfcheck.js @@ -34,6 +34,8 @@ var scanTimeout = 800; var scanTimeoutId; var patronBarcodeRegex; var orgUnit; +var orgUnitAddress; +var orgUnitHours; function selfckInit() { @@ -43,6 +45,7 @@ function selfckInit() { selfckSetupPrinter(); orgUnit = findOrgUnitSN(cgi.param('l')) || globalOrgTree; + selfckFetchOrgDetails(); var t = fetchOrgSettingDefault(orgUnit.id(), 'circ.selfcheck.patron_login_timeout'); patronTimeout = (t) ? parseInt(t) * 1000 : patronTimeout; @@ -82,6 +85,16 @@ function selfckInit() { } +function selfckFetchOrgDetails() { + var hreq = new Request('open-ils.actor:open-ils.actor.org_unit.hours_of_operation.retrieve', G.user.session, orgUnit.id()); + hreq.callback(function(r) { orgUnitHours = r.getResultObject(); }); + hreq.send(); + + var areq = new Request('open-ils.actor:open-ils.actor.org_unit.address.retrieve', orgUnit.mailing_address()); + areq.callback(function(r) { orgUnitAddress = r.getResultObject(); }); + areq.send(); +} + function selfckSetupPrinter() { try { // Mozilla only netscape.security.PrivilegeManager.enablePrivilege("UniversalBrowserRead"); @@ -379,8 +392,23 @@ function selfckRenew() { */ function selfckPrint() { for(var x in successfulItems) { // make sure we've checked out at least one item - appendClear($('selfck-print-lib-name'), text(orgUnit.name())); appendClear($('selfck-print-date'), text(new Date().toLocaleString())); + appendClear($('selfck-print-lib-name'), text(orgUnit.name())); + if(orgUnitAddress) { + appendClear($('selfck-print-lib-addr-street'), text(orgUnitAddress.street1()+' '+orgUnitAddress.street2())); + appendClear($('selfck-print-lib-addr-city'), text(orgUnitAddress.city())); + appendClear($('selfck-print-lib-addr-state'), text(orgUnitAddress.state())); + appendClear($('selfck-print-lib-addr-post-code'), text(orgUnitAddress.post_code())); + } + appendClear($('selfck-print-lname'), text(patron.family_name())); + appendClear($('selfck-print-fname'), text(patron.first_given_name())); + appendClear($('selfck-print-lib-phone'), text(orgUnit.phone())); + if(orgUnitHours) { + for(var i in [0, 1, 2, 3, 4, 5, 6]) { + appendClear($('selfck-print-dow_'+i+'_open'), text(orgUnitHours['dow_'+i+'_open']())); + appendClear($('selfck-print-dow_'+i+'_close'), text(orgUnitHours['dow_'+i+'_close']())); + } + } window.print(); return; } diff --git a/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml b/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml index b5034e4393..e658ae96d9 100644 --- a/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml +++ b/Open-ILS/web/opac/extras/selfcheck/selfcheck.xml @@ -164,15 +164,31 @@ -
- You checked out the following items: +
+
,
+ &selfck.items_out;
  1. - Barcode: - Due Date: + &selfck.barcode;: + &selfck.due_date;:
+
+
&selfck.org_phone;
+
+
+
&selfck.org_hours;
+ + + + + + + + +
&selfck.day0;
&selfck.day1;
&selfck.day2;
&selfck.day3;
&selfck.day4;
&selfck.day5;
&selfck.day6;
+
diff --git a/Open-ILS/web/opac/locale/en-US/opac.dtd b/Open-ILS/web/opac/locale/en-US/opac.dtd index cc599af399..a442b6215b 100644 --- a/Open-ILS/web/opac/locale/en-US/opac.dtd +++ b/Open-ILS/web/opac/locale/en-US/opac.dtd @@ -667,4 +667,16 @@ Ensure Caps-Lock is off and try again or contact your local library."> + + + + + + + + + + + +