@@ -, +, @@ overdues report --- circ/overdue.pl | 3 ++- .../prog/en/modules/circ/overdue.tt | 22 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) --- a/circ/overdue.pl +++ a/circ/overdue.pl @@ -117,7 +117,7 @@ for my $attrcode (grep { /^patron_attr_filter_/ } $input->multi_param) { } my $have_pattr_filter_data = keys(%cgi_attrcode_to_attrvalues) > 0; -my @patron_attr_filter_loop; # array of [ domid cgivalue ismany isclone ordinal code description repeatable authorised_value_category ] +my @patron_attr_filter_loop; # array of [ domid cgivalue ismany isclone ordinal code description repeatable is_date authorised_value_category ] my $patron_attrs = Koha::Patron::Attribute::Types->search_with_library_limits( { @@ -133,6 +133,7 @@ while (my $attr = $patron_attrs->next ) { code => $attr->code, description => $attr->description, repeatable => $attr->repeatable, + is_date => $attr->is_date, authorised_value_category => $attr->authorised_value_category, }; $row->{ordinal} = $ordinal; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -207,10 +207,10 @@ [% ELSE %][% END %] - [% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %] - -
  • - + [% FOREACH patron_attr_filter_loo IN patron_attr_filter_loop %] + +
  • + [% IF ( patron_attr_filter_loo.authorised_value_category ) %] [% SET authvals = AuthorisedValues.GetAuthValueDropbox( patron_attr_filter_loo.authorised_value_category ) %] - [% ELSE %] + [% ELSIF ( patron_attr_filter_loo.is_date ) %] + + [% ELSE %] - [% END %] - [% IF ( patron_attr_filter_loo.repeatable ) %] + [% END %] + [% IF ( patron_attr_filter_loo.repeatable ) %] Add [% IF ( patron_attr_filter_loo.isclone ) %] Delete @@ -235,9 +237,9 @@ [% ELSE %] [% END %] - [% END %] -
  • - [% END %] + [% END %] + + [% END %]