[open-ils-commits] [GIT] Evergreen ILS branch master updated. ef25453cd7e1f6b46728f8cfee17ba44a1b9955f
Evergreen Git
git at git.evergreen-ils.org
Fri Mar 23 13:49:08 EDT 2018
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 ef25453cd7e1f6b46728f8cfee17ba44a1b9955f (commit)
via 010eca09b936c1b774954d7f27122f6e1a70532b (commit)
via 6b44a066e098aae251fa7496fe01fc6b0cbce8e7 (commit)
from c31faa9080e5d71963300816678c5fd6e6ef0d12 (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 ef25453cd7e1f6b46728f8cfee17ba44a1b9955f
Author: Remington Steed <rjs7 at calvin.edu>
Date: Fri Mar 23 10:46:32 2018 -0400
LP#1693036: Simplify template, cleanup preview data
This commit corrects a few minor problems, and also attempts to simplify
and cleanup the template. The changes include:
- Adding the missing "ident_type2" field to the template and JS
- Adding missing sample data for "county"
- Moving "postal code" closer to the standard location (at the end of
the address)
- Fixing typos, and making "Claims..." labels more consistent
- Minor cleanup of the sample data
- Removing template comments that list available variables, because
this template is simpler than most, intended to print everything
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
index 6c84270..48d6152 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
@@ -1,9 +1,5 @@
<!--
-Template for printing a patron's data, including addesses and statistical categories. Fields include:
-
-* patron.first_given_name
-* patron.second_given_name
-* patron.family_name
+Template for printing a patron's data, including addresses and statistical categories.
-->
<div>
<div>=-=-=-=</div>
@@ -21,6 +17,7 @@ Template for printing a patron's data, including addesses and statistical catego
<div>Juvenile: {{patron.juvenile}}</div>
<div>Primary Identification Type: {{patron.ident_type.name()}}</div>
<div>Primary Identification: {{patron.ident_value}}</div>
+ <div>Secondary Identification Type: {{patron.ident_type2.name()}}</div>
<div>Secondary Identification: {{patron.ident_value2}}</div>
<div>Email Address: {{patron.email}}</div>
<div>Daytime Phone: {{patron.day_phone}}</div>
@@ -33,36 +30,25 @@ Template for printing a patron's data, including addesses and statistical catego
<div>Active: {{patron.active}}</div>
<div>Barred: {{patron.barred}}</div>
<div>Is Group Lead Account: {{patron.master_account}}</div>
- <div>Claims-returned Count: {{patron.claims_returned_count}}</div>
- <div>Claims Never Checked Out Count: {{patron.claims_never_checked_out_count}}</div>
+ <div>Claims-Returned Count: {{patron.claims_returned_count}}</div>
+ <div>Claims-Never-Checked-Out Count: {{patron.claims_never_checked_out_count}}</div>
<div>Alert Message: {{patron.alert_message}}</div>
<div>
- <!--
- * address.street1
- * address.street2
- * address.city
- * address.state
- * address.post_code
- -->
<div ng-repeat="address in patron.addresses">
<div>-------</div>
<div>Type: {{address.address_type}}</div>
- <div>Postal Code: {{address.post_code}}</div>
<div>Street (1): {{address.street1}}</div>
<div>Street (2): {{address.street2}}</div>
<div>City: {{address.city}}</div>
<div>County: {{address.county}}</div>
<div>State: {{address.state}}</div>
- <div>Contry: {{address.country}}</div>
+ <div>Postal Code: {{address.post_code}}</div>
+ <div>Country: {{address.country}}</div>
<div>Valid Address?: {{address.valid}}</div>
<div>Within City Limits?: {{address.within_city_limits}}</div>
</div>
<div>-------</div>
- <!-- Stat Cats
- * entry.stat_cat_entry
- * entry.stat_cat.name
- -->
<div ng-repeat="entry in patron.stat_cat_entries">{{entry.stat_cat.name}} : {{entry.stat_cat_entry}}</div>
<div>=-=-=-=</div>
</div>
diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index ecafa85..012eab0 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -356,8 +356,8 @@ function($scope , $q , egCore , ngToast) {
// NOTE: A lot of this data can be shared across templates.
var seed_user = {
prefix : 'Mr',
- first_given_name : 'Slow',
- second_given_name : 'Joe',
+ first_given_name : 'Joseph',
+ second_given_name : 'Martin',
family_name : 'Jones',
suffix : 'III',
card : {
@@ -369,17 +369,16 @@ function($scope , $q , egCore , ngToast) {
total_paid : '1.00'
},
expire_date : '2020-12-31',
- alias : 'the dude',
+ alias : 'Joey J.',
has_email : true,
has_phone : false,
- dob : '1984-11-07T00:00:00-8:00',
+ dob : '1980-01-01T00:00:00-8:00',
juvenile : 'f',
usrname : '30393830393',
day_phone : '111-222-3333',
evening_phone : '222-333-1111',
other_phone : '333-111-2222',
email : 'user at example.com',
- ident_value2 : 'Carol',
home_ou : {name: function() {return 'BR1'}},
profile : {name: function() {return 'Patrons'}},
net_access_level : {name: function() {return 'Filtered'}},
@@ -388,9 +387,11 @@ function($scope , $q , egCore , ngToast) {
master_account : 'f',
claims_returned_count : '0',
claims_never_checked_out_count : '0',
- alert_message : 'Very slow',
- ident_type: {name: function() {return 'Other'}},
+ alert_message : 'Coat is in the lost-and-found behind the circ desk',
+ ident_type: {name: function() {return 'Drivers License'}},
ident_value: '11332445',
+ ident_type2: {name: function() {return 'Other'}},
+ ident_value2 : '55442211',
addresses : [],
stat_cat_entries : [
{
@@ -408,6 +409,7 @@ function($scope , $q , egCore , ngToast) {
street1 : '123 Apple Rd',
street2 : 'Suite B',
city : 'Anywhere',
+ county : 'Great County',
state : 'XX',
country : 'US',
post_code : '12345',
commit 010eca09b936c1b774954d7f27122f6e1a70532b
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Wed Mar 14 10:33:27 2018 -0400
LP#1693036: follow-up: fix printing of daytime phone number
This patch corrects how the 'day_phone' field should be referred
to in the print template.
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
index 052fdcc..6c84270 100644
--- a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
@@ -23,7 +23,7 @@ Template for printing a patron's data, including addesses and statistical catego
<div>Primary Identification: {{patron.ident_value}}</div>
<div>Secondary Identification: {{patron.ident_value2}}</div>
<div>Email Address: {{patron.email}}</div>
- <div>Daytime Phone: {{patron.daytime_phone}}</div>
+ <div>Daytime Phone: {{patron.day_phone}}</div>
<div>Evening Phone: {{patron.evening_phone}}</div>
<div>Other Phone: {{patron.other_phone}}</div>
<div>Home Library: {{patron.home_ou.name()}}</div>
@@ -66,4 +66,4 @@ Template for printing a patron's data, including addesses and statistical catego
<div ng-repeat="entry in patron.stat_cat_entries">{{entry.stat_cat.name}} : {{entry.stat_cat_entry}}</div>
<div>=-=-=-=</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index 45294e5..ecafa85 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -375,7 +375,7 @@ function($scope , $q , egCore , ngToast) {
dob : '1984-11-07T00:00:00-8:00',
juvenile : 'f',
usrname : '30393830393',
- daytime_phone : '111-222-3333',
+ day_phone : '111-222-3333',
evening_phone : '222-333-1111',
other_phone : '333-111-2222',
email : 'user at example.com',
commit 6b44a066e098aae251fa7496fe01fc6b0cbce8e7
Author: Kyle Huckins <khuckins at catalyte.io>
Date: Thu Feb 15 23:03:20 2018 +0000
lp1693036 Patron Editor Print Data
- Add Print button to Patron Editor.
- Add Patron Data print template.
- Add additional print template dummy data needed for Patron
Data template.
- Implement print functionality for Patron registration/edit
data.
Signed-off-by: Kyle Huckins <khuckins at catalyte.io>/
Signed-off-by: Terran McCanna <tmccanna at georgialibraries.org>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
Signed-off-by: Remington Steed <rjs7 at calvin.edu>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2 b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2
index 12eccfb..239ec26 100644
--- a/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2
+++ b/Open-ILS/src/templates/staff/admin/workstation/t_print_templates.tt2
@@ -29,6 +29,7 @@
<option value="item_status">[% l('Item Status') %]</option>
<option value="items_out">[% l('Items Out') %]</option>
<option value="patron_address">[% l('Patron Address') %]</option>
+ <option value="patron_data">[% l('Patron Data') %]</option>
<option value="patron_note">[% l('Patron Note') %]</option>
<option value="renew">[% l('Renew') %]</option>
<option value="transit_list">[% l('Transit List') %]</option>
diff --git a/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2 b/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2
index c5aabcb..76414f9 100644
--- a/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/reg_actions.tt2
@@ -23,6 +23,10 @@
<div class="flex-cell"></div>
<div>
<span class="pad-all-min">
+ <button type="button" class="btn btn-default"
+ ng-click="edit_passthru.print()">[% l('Print') %]</button>
+ </span>
+ <span class="pad-all-min">
<button type="button" class="btn btn-default"
ng-disabled="edit_passthru.hide_save_actions()"
ng-click="edit_passthru.save()">[% l('Save') %]</button>
diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
new file mode 100644
index 0000000..052fdcc
--- /dev/null
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
@@ -0,0 +1,69 @@
+<!--
+Template for printing a patron's data, including addesses and statistical categories. Fields include:
+
+* patron.first_given_name
+* patron.second_given_name
+* patron.family_name
+-->
+<div>
+ <div>=-=-=-=</div>
+ <div>-------</div>
+ <div>Barcode: {{patron.card.barcode}}</div>
+ <div>-------</div>
+ <div>Patron's Username: {{patron.usrname}}</div>
+ <div>Prefix/Title: {{patron.prefix}}</div>
+ <div>First Name: {{patron.first_given_name}}</div>
+ <div>Middle Name: {{patron.second_given_name}}</div>
+ <div>Last Name: {{patron.family_name}}</div>
+ <div>Suffix: {{patron.suffix}}</div>
+ <div>Holds Alias: {{patron.alias}}</div>
+ <div>Date of Birth: {{patron.dob}}</div>
+ <div>Juvenile: {{patron.juvenile}}</div>
+ <div>Primary Identification Type: {{patron.ident_type.name()}}</div>
+ <div>Primary Identification: {{patron.ident_value}}</div>
+ <div>Secondary Identification: {{patron.ident_value2}}</div>
+ <div>Email Address: {{patron.email}}</div>
+ <div>Daytime Phone: {{patron.daytime_phone}}</div>
+ <div>Evening Phone: {{patron.evening_phone}}</div>
+ <div>Other Phone: {{patron.other_phone}}</div>
+ <div>Home Library: {{patron.home_ou.name()}}</div>
+ <div>Main (Profile) Permission Group: {{patron.profile.name()}}</div>
+ <div>Privilege Expiration Date: {{patron.expire_date}}</div>
+ <div>Internet Access Level: {{patron.net_access_level.name()}}</div>
+ <div>Active: {{patron.active}}</div>
+ <div>Barred: {{patron.barred}}</div>
+ <div>Is Group Lead Account: {{patron.master_account}}</div>
+ <div>Claims-returned Count: {{patron.claims_returned_count}}</div>
+ <div>Claims Never Checked Out Count: {{patron.claims_never_checked_out_count}}</div>
+ <div>Alert Message: {{patron.alert_message}}</div>
+
+ <div>
+ <!--
+ * address.street1
+ * address.street2
+ * address.city
+ * address.state
+ * address.post_code
+ -->
+ <div ng-repeat="address in patron.addresses">
+ <div>-------</div>
+ <div>Type: {{address.address_type}}</div>
+ <div>Postal Code: {{address.post_code}}</div>
+ <div>Street (1): {{address.street1}}</div>
+ <div>Street (2): {{address.street2}}</div>
+ <div>City: {{address.city}}</div>
+ <div>County: {{address.county}}</div>
+ <div>State: {{address.state}}</div>
+ <div>Contry: {{address.country}}</div>
+ <div>Valid Address?: {{address.valid}}</div>
+ <div>Within City Limits?: {{address.within_city_limits}}</div>
+ </div>
+ <div>-------</div>
+ <!-- Stat Cats
+ * entry.stat_cat_entry
+ * entry.stat_cat.name
+ -->
+ <div ng-repeat="entry in patron.stat_cat_entries">{{entry.stat_cat.name}} : {{entry.stat_cat_entry}}</div>
+ <div>=-=-=-=</div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
index de6e94f..45294e5 100644
--- a/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
+++ b/Open-ILS/web/js/ui/default/staff/admin/workstation/app.js
@@ -371,17 +371,52 @@ function($scope , $q , egCore , ngToast) {
expire_date : '2020-12-31',
alias : 'the dude',
has_email : true,
- has_phone : false
+ has_phone : false,
+ dob : '1984-11-07T00:00:00-8:00',
+ juvenile : 'f',
+ usrname : '30393830393',
+ daytime_phone : '111-222-3333',
+ evening_phone : '222-333-1111',
+ other_phone : '333-111-2222',
+ email : 'user at example.com',
+ ident_value2 : 'Carol',
+ home_ou : {name: function() {return 'BR1'}},
+ profile : {name: function() {return 'Patrons'}},
+ net_access_level : {name: function() {return 'Filtered'}},
+ active : 't',
+ barred : 'f',
+ master_account : 'f',
+ claims_returned_count : '0',
+ claims_never_checked_out_count : '0',
+ alert_message : 'Very slow',
+ ident_type: {name: function() {return 'Other'}},
+ ident_value: '11332445',
+ addresses : [],
+ stat_cat_entries : [
+ {
+ stat_cat : {'name' : 'Favorite Donut'},
+ 'stat_cat_entry' : 'Maple'
+ }, {
+ stat_cat : {'name' : 'Favorite Book'},
+ 'stat_cat_entry' : 'Beasts Made of Night'
+ }
+ ]
}
+
var seed_addr = {
+ address_type : 'MAILING',
street1 : '123 Apple Rd',
street2 : 'Suite B',
city : 'Anywhere',
state : 'XX',
country : 'US',
- post_code : '12345'
+ post_code : '12345',
+ valid : 't',
+ within_city_limits: 't'
}
+ seed_user.addresses.push(seed_addr);
+
var seed_record = {
title : 'Traveling Pants!!',
author : 'Jane Jones',
diff --git a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
index 8716184..bd83888 100644
--- a/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
+++ b/Open-ILS/web/js/ui/default/staff/circ/patron/regctl.js
@@ -1945,4 +1945,14 @@ function($scope , $routeParams , $q , $uibModal , $window , egCore ,
}
});
}
+
+ $scope.edit_passthru.print = function() {
+ var print_data = {patron : $scope.patron}
+
+ return egCore.print.print({
+ context : 'default',
+ template : 'patron_data',
+ scope : print_data
+ });
+ }
}])
-----------------------------------------------------------------------
Summary of changes:
.../staff/admin/workstation/t_print_templates.tt2 | 1 +
.../templates/staff/circ/patron/reg_actions.tt2 | 4 ++
.../staff/share/print_templates/t_patron_data.tt2 | 55 ++++++++++++++++++++
.../js/ui/default/staff/admin/workstation/app.js | 47 +++++++++++++++--
.../web/js/ui/default/staff/circ/patron/regctl.js | 10 ++++
5 files changed, 112 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/templates/staff/share/print_templates/t_patron_data.tt2
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list