[open-ils-commits] [GIT] Evergreen ILS branch rel_2_12 updated. b237d15e640cd63c42da3353fcebb0cbdc65376b
Evergreen Git
git at git.evergreen-ils.org
Mon Apr 17 22:49: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, rel_2_12 has been updated
via b237d15e640cd63c42da3353fcebb0cbdc65376b (commit)
via f7fe51d51db3b08d6d8d6c4e765422fa97424afe (commit)
via ccaddcf090798b1a4b910fae545db294f847da6c (commit)
via 3aeeceb946a284e9db90a93e0260d88c93ef491e (commit)
via 7244428e8be2cbb10ea0e08b91797eb83325e648 (commit)
via 1b9804e998cf7bc79baf07ded7cf883401d1e705 (commit)
via bdc15c7670ca803c4c2e8cf4207c415daa45e987 (commit)
via 6a25441808a641e434850d7f53306e3cfe11188d (commit)
via db76c3891046c41414907e7fee6ac4db96e7f02a (commit)
via 23899ba51adbbaa59906a785c959695fd8fb17b0 (commit)
via b734f0c321c1aba65d3b3a501f0bff0fedfaacea (commit)
via 10209bfec748ca24b89aef69e018891f6c25a7ca (commit)
from b851fec7f09b19454ca77bc59fb04065940f3188 (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 b237d15e640cd63c42da3353fcebb0cbdc65376b
Author: Jason Etheridge <jason at esilibrary.com>
Date: Mon Apr 17 15:43:43 2017 -0400
webstaff: sound effects for patron search
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
index 8a8e326..7f0e0d8 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/app.js
@@ -989,6 +989,7 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore,
egProgressDialog.open(); // Indeterminate
patronSvc.patrons = [];
+ var which_sound = 'success';
egCore.net.request(
'open-ils.actor',
'open-ils.actor.patron.search.advanced.fleshed',
@@ -1005,7 +1006,9 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore,
function() {
deferred.resolve();
},
- null, // onerror
+ function() { // onerror
+ which_sound = 'error';
+ },
function(user) {
// hide progress bar as soon as the first result appears.
egProgressDialog.close();
@@ -1013,7 +1016,13 @@ function($scope, $q, $routeParams, $timeout, $window, $location, egCore,
patronSvc.patrons.push(user);
deferred.notify(user);
}
- )['finally'](egProgressDialog.close); // close on 0-hits or error
+ )['finally'](function() { // close on 0-hits or error
+ if (which_sound == 'success' && patronSvc.patrons.length == 0) {
+ which_sound = 'warning';
+ }
+ egCore.audio.play(which_sound + '.patron.by_search');
+ egProgressDialog.close();
+ });
return deferred.promise;
};
commit f7fe51d51db3b08d6d8d6c4e765422fa97424afe
Author: Mike Rylander <mrylander at gmail.com>
Date: Fri Mar 24 11:35:53 2017 -0400
webstaff: Allow adding new volumes to libaries that were not selected in the holdings UI (and fix a couple minor bugs)
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2 b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
index 30ac2d3..5266734 100644
--- a/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/cat/volcopy/t_edit.tt2
@@ -32,7 +32,7 @@
</div>
<div class="col-xs-1"></div>
<div class="col-xs-5">
- <button class="btn btn-default center-block" ng-click="applyBatchCNValues()" type="button">Apply</button>
+ <button class="btn btn-default center-block" ng-click="applyBatchCNValues()" type="button">[% l('Apply') %]</button>
</div>
</div>
</div>
@@ -73,6 +73,11 @@
allcopies="data.copies"
struct="data.tree[lib]">
</eg-vol-edit>
+ <hr/>
+ <div>
+ <eg-org-selector alldisabled="{{record_id == 0}}" selected="new_lib_to_add" onchange="changeNewLib" disable-test="cant_have_vols"></eg-org-selector>
+ <button class="btn btn-default" ng-click="addLibToStruct()" type="button">[% l('Add volume') %]</button>
+ </div>
</div>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
index 92c2201..23bd2e8 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
@@ -728,7 +728,7 @@ function(egCore , $q) {
$scope.struct[cn.id()] = [cp];
$scope.allcopies.push(cp);
- if (!scope.defaults.classification) {
+ if (!$scope.defaults.classification) {
egCore.org.settings(
['cat.default_classification_scheme'],
cn.owning_lib()
@@ -795,6 +795,40 @@ function($scope , $q , $window , $routeParams , $location , $timeout , egCore ,
}
};
+ $scope.new_lib_to_add = egCore.org.get(egCore.auth.user().ws_ou());
+ $scope.changeNewLib = function (org) {
+ $scope.new_lib_to_add = org;
+ }
+ $scope.addLibToStruct = function () {
+ var newLib = $scope.new_lib_to_add;
+ var cn = new egCore.idl.acn();
+ cn.id( --itemSvc.new_cn_id );
+ cn.isnew( true );
+ cn.prefix( $scope.defaults.prefix || -1 );
+ cn.suffix( $scope.defaults.suffix || -1 );
+ cn.label_class( $scope.defaults.classification || 1 );
+ cn.owning_lib( newLib.id() );
+ cn.record( $scope.record_id );
+
+ var cp = itemSvc.generateNewCopy(
+ cn,
+ newLib.id(),
+ $scope.fast_add,
+ true
+ );
+
+ $scope.data.addCopy(cp);
+
+ if (!$scope.defaults.classification) {
+ egCore.org.settings(
+ ['cat.default_classification_scheme'],
+ cn.owning_lib()
+ ).then(function (val) {
+ cn.label_class(val['cat.default_classification_scheme']);
+ });
+ }
+ }
+
$scope.embedded = ($routeParams.mode && $routeParams.mode == 'embedded') ? true : false;
$scope.edit_templates = ($location.path().match(/edit_template/)) ? true : false;
commit ccaddcf090798b1a4b910fae545db294f847da6c
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Mar 21 13:03:44 2017 -0400
webstaff: Reprint Last Receipt functionality
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index 7835f25..8d593b9 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -168,6 +168,15 @@
<span>[% l('Scan Item as Missing Pieces') %]</span>
</a>
</li>
+ <li class="divider"></li>
+ <li>
+ <a href="" ng-click="reprintLast($event)"
+ eg-accesskey="[% l('f9') %]"
+ eg-accesskey-desc="[% l('Reprint Last Receipt') %]">
+ <span class="glyphicon glyphicon-print"></span>
+ <span>[% l('Reprint Last Receipt') %]</span>
+ </a>
+ </li>
</ul>
</li><!-- circ -->
diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js
index d36d40e..c7bb4ed 100644
--- a/Open-ILS/web/js/ui/default/staff/services/navbar.js
+++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js
@@ -31,6 +31,11 @@ angular.module('egCoreMod')
function($scope , $window , $location , $timeout , hotkeys ,
egCore , $uibModal , ngToast, egOpChange) {
+ $scope.reprintLast = function (e) {
+ egCore.print.reprintLast();
+ return e.preventDefault();
+ }
+
function navTo(path) {
// Strip the leading "./" if any.
path = path.replace(/^\.\//,'');
diff --git a/Open-ILS/web/js/ui/default/staff/services/print.js b/Open-ILS/web/js/ui/default/staff/services/print.js
index 67a26b3..97f8333 100644
--- a/Open-ILS/web/js/ui/default/staff/services/print.js
+++ b/Open-ILS/web/js/ui/default/staff/services/print.js
@@ -54,6 +54,8 @@ function($q , $window , $timeout , $http , egHatch , egAuth , egIDL , egOrg , eg
egIDL.toHash(egOrg.get(egAuth.user().ws_ou()));
}
+ service.last_print = {};
+
// Template has been fetched (or no template needed)
// Process the template and send the result off to the printer.
service.print_content = function(args) {
@@ -81,15 +83,26 @@ function($q , $window , $timeout , $http , egHatch , egAuth , egIDL , egOrg , eg
return promise.then(function(html) {
// For good measure, wrap the compiled HTML in container tags.
html = "<html><body>" + html + "</body></html>";
- return egHatch.remotePrint(
- args.context || 'default',
- args.content_type,
- html,
- args.show_dialog
- );
+ service.last_print.content = html;
+ service.last_print.context = args.context || 'default';
+ service.last_print.content_type = args.content_type;
+ service.last_print.show_dialog = args.show_dialog;
+
+ egHatch.setItem('eg.print.last_printed', service.last_print);
+
+ return service._remotePrint();
});
}
+ service._remotePrint = function () {
+ return egHatch.remotePrint(
+ service.last_print.context,
+ service.last_print.content_type,
+ service.last_print.content,
+ service.last_print.show_dialog
+ );
+ }
+
service.print_via_browser = function(args) {
var type = args.content_type;
var content = args.content;
@@ -111,14 +124,55 @@ function($q , $window , $timeout , $http , egHatch , egAuth , egIDL , egOrg , eg
content;
}).then(function(content) {
+ service.last_print.content = content;
+ service.last_print.content_type = type;
+ service.last_print.printScope = printScope
+
+ egHatch.setItem('eg.print.last_printed', service.last_print);
+
// Ingest the content into the page DOM.
- return service.ingest_print_content(type, content, printScope);
+ return service.ingest_print_content(
+ service.last_print.content_type,
+ service.last_print.content,
+ service.last_print.printScope
+ );
}).then(function() {
$window.print();
});
}
+ service.reprintLast = function () {
+ var deferred = $q.defer();
+ var promise = deferred.promise;
+ promise.finally( function() { service.clear_print_content() });
+
+ egHatch.getItem(
+ 'eg.print.last_printed'
+ ).then(function (last) {
+ if (last && last.content) {
+ service.last_print = last;
+
+ if (egHatch.usePrinting()) {
+ promise.then(function () {
+ egHatch._remotePrint()
+ });
+ } else {
+ promise.then(function () {
+ service.ingest_print_content(
+ service.last_print.content_type,
+ service.last_print.content,
+ service.last_print.printScope
+ ).then(function() { $window.print() });
+ });
+ }
+ return deferred.resolve();
+ } else {
+ return deferred.reject();
+ }
+ });
+ }
+
// loads an HTML print template by name from the server
// If no template is available in local/hatch storage,
// fetch the template as an HTML file from the server.
commit 3aeeceb946a284e9db90a93e0260d88c93ef491e
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Mar 21 10:23:26 2017 -0400
webstaff: Apply XUL-era hotkeys to some actions
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/navbar.tt2 b/Open-ILS/src/templates/staff/navbar.tt2
index e989fcf..7835f25 100644
--- a/Open-ILS/src/templates/staff/navbar.tt2
+++ b/Open-ILS/src/templates/staff/navbar.tt2
@@ -36,7 +36,7 @@
<ul uib-dropdown-menu>
<li>
<a href="./circ/patron/search" target="_self"
- eg-accesskey="[% l('alt+s') %]"
+ eg-accesskey="[% l('alt+s') %] [% l('f4') %]"
eg-accesskey-desc="[% l('Patron search by name, address, etc.') %]">
<span class="glyphicon glyphicon-user"></span>
<span eg-accesskey-label>[% l('Search for Patrons') %]</span>
@@ -99,7 +99,9 @@
</a>
</li>
<li>
- <a href="./circ/renew/renew" target="_self">
+ <a href="./circ/renew/renew" target="_self"
+ eg-accesskey="[% l('ctrl+f2') %]"
+ eg-accesskey-desc="[% l('Renew items') %]">
<span class="glyphicon glyphicon-refresh"></span>
[% l('Renew Items') %]
</a>
commit 7244428e8be2cbb10ea0e08b91797eb83325e648
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Mar 21 10:22:59 2017 -0400
webstaff: Allow multiple hotkeys for a single action
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/web/js/ui/default/staff/services/navbar.js b/Open-ILS/web/js/ui/default/staff/services/navbar.js
index ec00a9a..d36d40e 100644
--- a/Open-ILS/web/js/ui/default/staff/services/navbar.js
+++ b/Open-ILS/web/js/ui/default/staff/services/navbar.js
@@ -41,15 +41,17 @@ angular.module('egCoreMod')
// adds a keyboard shortcut
// http://chieffancypants.github.io/angular-hotkeys/
$scope.addHotkey = function(key, path, desc, elm) {
- hotkeys.add({
- combo: key,
- allowIn: ['INPUT','SELECT','TEXTAREA'],
- description: desc,
- callback: function(e) {
- e.preventDefault();
- if (path) return navTo(path);
- return $timeout(function(){$(elm).trigger('click')});
- }
+ angular.forEach(key.split(' '), function (k) {
+ hotkeys.add({
+ combo: k,
+ allowIn: ['INPUT','SELECT','TEXTAREA'],
+ description: desc,
+ callback: function(e) {
+ e.preventDefault();
+ if (path) return navTo(path);
+ return $timeout(function(){$(elm).trigger('click')});
+ }
+ });
});
};
commit 1b9804e998cf7bc79baf07ded7cf883401d1e705
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Tue Mar 14 18:05:45 2017 -0400
webstaff: add more comments to print templates
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
index fe6851a..e3bb24e 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
@@ -1,3 +1,14 @@
+<!--
+Template for bill payment recepts. Data specific to this template
+includes:
+
+* current_location.name - name of workstation location
+* payment_type
+* payment_total - total paid
+* new_balance - balance after the payments were applied
+* payments - list of specific payments
+
+-->
Welcome to {{current_location.name}}!<br/>
A receipt of your transaction:<hr/>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
index c99cb4d..21b53c2 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
@@ -1,3 +1,13 @@
+<!-
+Template for printing a list of current bills. Data specific
+to this template includes:
+
+* transasctions - a list of transactions, each of which
+ contains:
+
+ summary - information about the transaction
+
+-->
Welcome to {{current_location.name}}!<br/>
You have the following bills:
<hr/>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
index d8871fe..44fcd57 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
@@ -1,3 +1,13 @@
+<!-
+Template for printing a list of past bills. Data specific
+to this template includes:
+
+* transasctions - a list of transactions, each of which
+ contains:
+
+ summary - information about the transaction
+
+-->
Welcome to {{current_location.name}}!<br/>
You had the following bills:
<hr/>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_checkin.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_checkin.tt2
index 7bc56e4..3aa276c 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_checkin.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_checkin.tt2
@@ -1,3 +1,15 @@
+<!--
+Template for printing a checkin receipt. Data specific to this
+template includes:
+
+* checkins - list of checkins recorded during the session. Each
+ includes:
+
+ * title
+ * copy_barcode
+ * call_number.label
+
+-->
<div>
<div>[% l('Welcome to [_1]', '{{current_location.name}}') %]</div>
<div>[% l('You checked in the following items:') %]</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
index 1f1218e..dc88446 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
@@ -1,3 +1,14 @@
+<!--
+Template for printing checkout receipts; fields available include:
+
+* circulations - list of loans made during this session. Each
+ includes:
+
+ * title
+ * copy_barcode
+ * due_date
+
+-->
<div>
<div>[% l('Welcome to [_1]', '{{current_location.name}}') %]</div>
<div>[% l('You checked out the following items:') %]</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2
index ce23fe4..47be206 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2
@@ -1,3 +1,15 @@
+<!--
+Template for printing a table of holds to pull. Fields include:
+
+* holds - list of holds, each of which includes:
+
+ * title
+ * author
+ * hold.hold_type
+ * copy.location_name
+ * volume.label - call number
+ * copy.barcode
+-->
<table id='pull-list-template-table'>
<style>
#pull-list-template-table td,
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
index c95fb3e..375e9b9 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
@@ -1,3 +1,18 @@
+<!--
+Template for printing a list of items on the hold shelf. Fields include:
+
+* holds - list of hold requests, including
+
+ * patron_alias
+ * patron_last
+ * patron_first
+ * hold.hold_type
+ * title
+ * author
+ * volume.label
+ * copy.barcode
+
+-->
<table id='shelf-list-template-table'>
<style>
#pull-list-template-table td,
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 590e00b..aef5b8a 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
@@ -1,3 +1,19 @@
+<!--
+Template for printing hold request slips. Fields include:
+
+* hold.behind_desk
+* copy.barcode
+* title
+* patron.family_name
+* patron.first_given_name
+* patron.second_given_name
+* patron.card.barcode
+* hold.request_time
+* hold.phone_notify
+* hold.sms_notify
+* hold.email_notify
+
+-->
<div>
<div ng-switch on="hold.behind_desk">
<div ng-switch-when="t">
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
index 64a213d..eb002b8 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
@@ -1,3 +1,26 @@
+<!--
+Template for printing hold transit slips. Fields include:
+
+* dest_location.name - name of destination library
+* dest_location.shortname
+* dest_address.street1
+* dest_address.street2
+* dest_address.city
+* dest_address.state
+* dest_address.post_code
+* hold.behind_desk
+* copy.barcode
+* title
+* patron.family_name
+* patron.first_given_name
+* patron.second_given_name
+* patron.card.barcode
+* hold.request_time
+* hold.phone_notify
+* hold.sms_notify
+* hold.email_notify
+
+-->
<div>
<div>[% l('This item needs to be routed to [_1]', '<b>{{dest_location.shortname}}</b>') %]</div>
<div>{{dest_location.name}}</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
index 8d3061c..2a2f965 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
@@ -1,3 +1,16 @@
+<!--
+Template for printing a list of holds associated with a
+bib record. Fields include:
+
+* holds - list of holds, including
+
+ * hold.request_time
+ * patron_barcode
+ * patron_last - patron surname
+ * patron_alias - hold alias for the patorn
+ * copy.barcode
+
+-->
<div>
<div>[% l('Holds for record: [_1]', '{{holds[0].title}}') %]</div>
<hr/>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_patron.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_patron.tt2
index 492454c..0f3a5da 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_patron.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_patron.tt2
@@ -1,3 +1,11 @@
+<!--
+Template for printing a list of hold requests for a patron. Fields include:
+
+* holds - a list of hold request, each of which includes
+
+ * title
+
+-->
<div>
<div>[% l('Welcome to [_1]', '{{current_location.name}}') %]</div>
<div>[% l('You have the following title on hold:') %]</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_items_out.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_items_out.tt2
index fee903b..10564b1 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_items_out.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_items_out.tt2
@@ -1,3 +1,14 @@
+<!--
+Template for printing a list of items that a patron has checked out.
+Fields include:
+
+* circulations - list of current loans, including
+
+ * copy.barcode
+ * circ.due_date
+ * title
+
+-->
<div>
<div>[% l('Welcome to [_1]', '{{current_location.name}}') %]</div>
<div>[% l('You have the following items:') %]</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_address.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_address.tt2
index c1a3e37..55996b2 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_patron_address.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_address.tt2
@@ -1,3 +1,16 @@
+<!--
+Template for printing a patron address. Fields include:
+
+* first_given_name
+* second_given_name
+* family_name
+* address.street1
+* address.street2
+* address.city
+* address.state
+* address.post_code
+
+-->
<div>
<div>
{{patron.first_given_name}}
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2
index 5b98683..da75ec4 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_note.tt2
@@ -1,3 +1,13 @@
+<!--
+Template for printing a patron note. Fields include:
+
+* note.usr.family_name
+* note.usr.first_name
+* note.usr.second_given_name
+* note.usr.card.barcode
+* note.create_date
+
+-->
<h3>[% l(
'Pertaining to [_1], [_2] [_3] : [_4]',
'{{note.usr.family_name}}',
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_renew.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_renew.tt2
index 8e96445..d5046b2 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_renew.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_renew.tt2
@@ -1,3 +1,13 @@
+<!--
+Template for printing a renewal receipt. Fields include:
+
+* circulations - list of renewals made during the session, including
+
+ * title
+ * copy.barcode
+ * circ.due_date
+
+-->
<div>
<div>[% l('Welcome to [_1]', '{{current_location.name}}') %]</div>
<div>[% l('You renewed the following items:') %]</div>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
index 324ad5e..afd5aab 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
@@ -1,3 +1,17 @@
+<!--
+Template for printing a transit slip. Fields include:
+
+* dest_location.name - name of destination library
+* dest_location.shortname
+* dest_address.street1
+* dest_address.street2
+* dest_address.city
+* dest_address.state
+* dest_address.post_code
+* copy.barcode
+* title
+* author
+-->
<div>
<div>[% l('This item needs to be routed to [_1]', '<b>{{dest_location.shortname}}</b>') %]</div>
<div>{{dest_location.name}}</div>
commit bdc15c7670ca803c4c2e8cf4207c415daa45e987
Author: Jason Etheridge <jason at esilibrary.com>
Date: Mon Mar 27 16:00:11 2017 -0400
webstaff: console logging for debugging audio
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/web/js/ui/default/staff/services/audio.js b/Open-ILS/web/js/ui/default/staff/services/audio.js
index 8cab872..82baa76 100644
--- a/Open-ILS/web/js/ui/default/staff/services/audio.js
+++ b/Open-ILS/web/js/ui/default/staff/services/audio.js
@@ -39,6 +39,7 @@ angular.module('egCoreMod')
}
service.play_url = function(path, orig_path) {
+ console.log('audio: play_url('+path+','+orig_path+')');
egHatch.getItem('eg.audio.disable').then(function(audio_disabled) {
if (!audio_disabled) {
@@ -51,6 +52,7 @@ angular.module('egCoreMod')
player.onloadeddata = function() {
service.url_cache[orig_path] = url;
player.play();
+ console.log('audio: ' + url);
};
if (service.url_cache[path]) {
commit 6a25441808a641e434850d7f53306e3cfe11188d
Author: Jason Etheridge <jason at esilibrary.com>
Date: Mon Mar 27 15:52:06 2017 -0400
webstaff: warning sound for Refund Confirmation dialog
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
index 7c869b3..601956a 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/bills.js
@@ -545,7 +545,8 @@ function($scope , $q , $routeParams , egCore , egConfirmDialog , $location,
if (items.length == 0) return;
var ids = items.map(function(item) {return item.id});
-
+
+ egCore.audio.play('warning.circ.refund_confirmation');
egConfirmDialog.open(
egCore.strings.CONFIRM_REFUND_PAYMENT, '',
{ xactIds : ''+ids,
commit db76c3891046c41414907e7fee6ac4db96e7f02a
Author: Jason Etheridge <jason at esilibrary.com>
Date: Mon Mar 27 15:31:34 2017 -0400
webstaff: warning sound for Event Override dialog
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 7e50729..4c48ae6 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
@@ -642,6 +642,8 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
// the returned event.
service.override_dialog = function(evt, params, options, action) {
if (!angular.isArray(evt)) evt = [evt];
+
+ egCore.audio.play('warning.circ.event_override');
return $uibModal.open({
templateUrl: './circ/share/t_event_override_dialog',
controller:
commit 23899ba51adbbaa59906a785c959695fd8fb17b0
Author: Jason Etheridge <jason at esilibrary.com>
Date: Mon Mar 27 15:10:45 2017 -0400
webstaff: warning sound for Bad Barcode dialog
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 77564fd..7e50729 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
@@ -1477,6 +1477,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
var ok = service.check_barcode(bc);
if (ok) return $q.when();
+ egCore.audio.play('warning.circ.bad_barcode');
return $uibModal.open({
templateUrl: './circ/share/t_bad_barcode_dialog',
controller:
commit b734f0c321c1aba65d3b3a501f0bff0fedfaacea
Author: Jason Etheridge <jason at esilibrary.com>
Date: Mon Mar 27 15:01:48 2017 -0400
webstaff: warning sound for Item Not Found in Item Status
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/web/js/ui/default/staff/cat/item/app.js b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
index 6e411ef..5f0ecb0 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/item/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/item/app.js
@@ -213,6 +213,7 @@ function($scope , $q , $routeParams , $location , $timeout , $window , egCore ,
$scope.args.barcode = '';
} else {
$scope.context.itemNotFound = true;
+ egCore.audio.play('warning.item_status.itemNotFound');
}
$scope.context.selectBarcode = true;
})
@@ -1002,6 +1003,7 @@ function($scope , $q , $location , $routeParams , $timeout , $window , egCore ,
if (!res) {
copyId = null;
$scope.context.itemNotFound = true;
+ egCore.audio.play('warning.item_status.itemNotFound');
deferred.reject(); // avoid propagation of data fetch calls
return;
}
commit 10209bfec748ca24b89aef69e018891f6c25a7ca
Author: Jason Etheridge <jason at esilibrary.com>
Date: Thu Mar 23 15:08:17 2017 -0400
webstaff: tweak successful renewal sound
aesthetic: default to info.wav instead of success.wav
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
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 df43abb..77564fd 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
@@ -412,7 +412,7 @@ function($uibModal , $q , egCore , egAlertDialog , egConfirmDialog,
// Other events
switch (evt[0].textcode) {
case 'SUCCESS':
- egCore.audio.play('success.renew');
+ egCore.audio.play('info.renew');
return $q.when(final_resp);
case 'COPY_IN_TRANSIT':
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/staff/cat/volcopy/t_edit.tt2 | 7 ++-
Open-ILS/src/templates/staff/navbar.tt2 | 15 ++++-
.../staff/share/print_templates/t_bill_payment.tt2 | 11 +++
.../share/print_templates/t_bills_current.tt2 | 10 +++
.../share/print_templates/t_bills_historical.tt2 | 10 +++
.../staff/share/print_templates/t_checkin.tt2 | 12 ++++
.../staff/share/print_templates/t_checkout.tt2 | 11 +++
.../share/print_templates/t_hold_pull_list.tt2 | 12 ++++
.../share/print_templates/t_hold_shelf_list.tt2 | 15 ++++
.../share/print_templates/t_hold_shelf_slip.tt2 | 16 +++++
.../share/print_templates/t_hold_transit_slip.tt2 | 23 +++++++
.../share/print_templates/t_holds_for_bib.tt2 | 13 ++++
.../share/print_templates/t_holds_for_patron.tt2 | 8 ++
.../staff/share/print_templates/t_items_out.tt2 | 11 +++
.../share/print_templates/t_patron_address.tt2 | 13 ++++
.../staff/share/print_templates/t_patron_note.tt2 | 10 +++
.../staff/share/print_templates/t_renew.tt2 | 10 +++
.../staff/share/print_templates/t_transit_slip.tt2 | 14 ++++
Open-ILS/web/js/ui/default/staff/cat/item/app.js | 2 +
.../web/js/ui/default/staff/cat/volcopy/app.js | 36 ++++++++++-
.../web/js/ui/default/staff/circ/patron/app.js | 13 +++-
.../web/js/ui/default/staff/circ/patron/bills.js | 3 +-
.../web/js/ui/default/staff/circ/services/circ.js | 5 +-
Open-ILS/web/js/ui/default/staff/services/audio.js | 2 +
.../web/js/ui/default/staff/services/navbar.js | 25 +++++---
Open-ILS/web/js/ui/default/staff/services/print.js | 68 ++++++++++++++++++--
26 files changed, 351 insertions(+), 24 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list