From fac2024be4f9186221a827ee56e90f893947377e Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 18 Mar 2023 10:13:09 +0000 Subject: [PATCH] Bug 32610: Add date extended patron attributes to patron module This makes the necessary changes in the patron module of the staff interface, so the new patron attribute appers and behaves correctly when editing a patron record. To test: * You will need to test different configuration options for extended patron attributes (PA) in combination with the date option: * PA is a date and not mandatory * Patron form should have the calendar widget to let you set the date. * PA is a date and mandatory * Patron form shoudl have calendar widget and check that the date is set for allowing you to save the record. * PA is a date and unique * For this set the date in one patron record and try to set the same date in another. You should not be able to save. * PA displays in brief patron information * Make sure the date displays on the left formatted correctly * When the date PAs are saved, they should display nicely formatted on the details tab. --- .../intranet-tmpl/prog/en/includes/circ-menu.inc | 7 ++++++- .../prog/en/modules/members/memberentrygen.tt | 16 +++++++++++++--- .../prog/en/modules/members/moremember.tt | 6 +++++- members/memberentry.pl | 1 + 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index be02b213ec..613b4cdb52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -106,7 +106,12 @@ [% IF ( extendedattribute.type.display_checkout ) %] [%# FIXME We should filter in the line above %] [% IF ( extendedattribute.attribute ) %] [%# FIXME Why that? why not if == 0? %]
  • - [% extendedattribute.type.description | html %]: [% extendedattribute.description | html %] + [% extendedattribute.type.description | html %]: + [% IF extendedattribute.type.is_date %] + [% extendedattribute.description | $KohaDates %] + [% ELSE %] + [% extendedattribute.description | html %] + [% END %]
  • [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 10a4a4d601..fe5ce6ee98 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1575,13 +1575,23 @@ legend:hover { [% ELSE %] [% IF patron_attribute.mandatory %] - + [% IF patron_attribute.is_date %] + + [% ELSE %] + + [% END %] [% ELSE %] - + [% IF patron_attribute.is_date %] + + [% ELSE %] + + [% END %] [% END %] [% END # /IF ( patron_attribute.use_dropdown ) %] - Clear + [% IF ( !patron_attribute.is_date ) %] + Clear + [% END %] [% IF ( patron_attribute.repeatable ) %] New [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 9cadcd5709..7b6baecc86 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -320,7 +320,11 @@ [% FOREACH item IN attribute.items %]
  • [% item.type.description | html %]: - [% item.description | html_line_break %] + [% IF item.type.is_date %] + [% item.description | $KohaDates %] + [% ELSE %] + [% item.description | html_line_break %] + [% END %]
  • [% END %] diff --git a/members/memberentry.pl b/members/memberentry.pl index 0193cc3777..af2e333380 100755 --- a/members/memberentry.pl +++ b/members/memberentry.pl @@ -864,6 +864,7 @@ sub patron_attributes_form { category => $attr_type->authorised_value_category(), category_code => $attr_type->category_code(), mandatory => $attr_type->mandatory(), + is_date => $attr_type->is_date(), }; if (exists $attr_hash{$attr_type->code()}) { foreach my $attr (@{ $attr_hash{$attr_type->code()} }) { -- 2.30.2