@@ -, +, @@
Patron detail
Other patron pages - look on the left side (circ-menu)
Patron search
Guarantor search ( go to child patron -> edit -> in guarantor
section click "Set to patron"
Search through "Check out" (in the header)
try it on patrons with and without date of birth set to find
possible reggressions
---
C4/Utils/DataTables/Members.pm | 1 +
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 10 ++++++++++
.../prog/en/includes/circ-patron-search-results.inc | 2 +-
koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc | 8 ++++++++
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +-
.../prog/en/modules/members/tables/guarantor_search.tt | 2 +-
.../prog/en/modules/members/tables/members_results.tt | 2 +-
members/moremember.pl | 1 -
8 files changed, 23 insertions(+), 5 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc
--- a/C4/Utils/DataTables/Members.pm
+++ a/C4/Utils/DataTables/Members.pm
@@ -180,6 +180,7 @@ sub search {
my $patron_object = Koha::Patrons->find( $patron->{borrowernumber} );
$patron->{overdues} = $patron_object->get_overdues->count;
$patron->{issues} = $patron_object->checkouts->count;
+ $patron->{age} = $patron_object->get_age;
my $balance = $patron_object->account->balance;
# FIXME Should be formatted from the template
$patron->{fines} = sprintf("%.2f", $balance);
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -55,6 +55,12 @@
[% patron.emailpro | html %]
[% END %]
[% END %]
+ [% IF ( patron.dateofbirth ) %]
+
+ Date of birth:
+ [% INCLUDE 'patron-age.inc' %]
+
+ [% END %]
[% UNLESS ( patron.address or patron.address2 ) %]
No address stored.
@@ -68,6 +74,10 @@
[% UNLESS ( patron.email or patron.emailpro) %]
No email stored.
[% END %]
+ [% UNLESS ( patron.dateofbirth ) %]
+ No date of birth stored.
+ [% END %]
+
[% END %]
[% IF Koha.Preference('ExtendedPatronAttributes') %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-patron-search-results.inc
@@ -27,7 +27,7 @@
[% borrower.surname | html %], [% borrower.firstname | html %] |
[% END %]
[% borrower.cardnumber | html %] |
- [% borrower.dateofbirth | $KohaDates %] |
+ [% INCLUDE 'patron-age.inc' patron = borrower %] |
[% Categories.GetName( borrower.categorycode ) | html %] |
[% Branches.GetName( borrower.branchcode ) | html %] |
[% borrower.address | html %] |
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-age.inc
@@ -0,0 +1,8 @@
+[%- USE KohaDates -%]
+[%- IF ( patron ) -%]
+ [%- IF ( patron.dateofbirth ) -%]
+ [% patron.dateofbirth | $KohaDates -%]
+ [%- IF ( patron.get_age ) %] ([% patron.get_age | html %] years)
+ [%- ELSIF ( patron.age ) %] ([% patron.age | html %] years)[% END -%]
+ [%- END -%]
+[%- END -%]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -240,7 +240,7 @@
[% IF ( patron.dateofbirth ) %]
Date of birth:
- [% patron.dateofbirth | $KohaDates %] ([% patron.get_age | html %] years)
+ [% INCLUDE 'patron-age.inc' %]
[% END %]
[% IF ( patron.sex ) %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/guarantor_search.tt
@@ -14,7 +14,7 @@
"dt_name":
"[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames cardnumber = data.cardnumber invert_name = 1%]",
"dt_dateofbirth":
- "[% data.dateofbirth | $KohaDates %]",
+ "[% INCLUDE 'patron-age.inc' patron = data %]",
"dt_address":
"[% INCLUDE escape_address data=data %]",
"dt_action":
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
@@ -19,7 +19,7 @@
"dt_name":
"[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]
[% INCLUDE escape_address data = data %][% IF data.email %]
Email: [% data.email | html | $To %][% END %]",
"dt_dateofbirth":
- "[% data.dateofbirth | $KohaDates %]",
+ "[% INCLUDE 'patron-age.inc' patron = data %]",
"dt_category":
"[% data.category_description | html | $To %] ([% data.category_type | html | $To %])",
"dt_branch":
--- a/members/moremember.pl
+++ a/members/moremember.pl
@@ -123,7 +123,6 @@ if ( !$patron->is_valid_age ) {
$template->param( age_low => $patron->category->dateofbirthrequired );
$template->param( age_high => $patron->category->upperagelimit );
}
-$template->param( age => $patron->get_age );
# Generate CSRF token for upload and delete image buttons
$template->param(
--