From 71b3dd8688ffedab217e8800e4df2457fa1dbdc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 4 Apr 2017 13:03:04 +0200 Subject: [PATCH] Bug 18375: Better readability of patron category table for zero ages and fees In patron category table, this patch displays zero / empty values for ages and fees with '-' for better readability To test: - Go to Home > Administration > Patron categories - Verify that you have 0 years and/or only years in Age required and Uper age limit colums - Verify that you have Enrollment and Hold fees of 0.00 - Apply patch - Verify that such values are replaced by - to enhance table readability Signed-off-by: Luke Honiss --- .../prog/en/modules/admin/categories.tt | 24 ++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index b28b634..2c2863b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -386,12 +386,28 @@ until [% category.enrolmentperioddate | $KohaDates %] [% END %] - [% category.dateofbirthrequired %] years - [% category.upperagelimit %] years - [% category.enrolmentfee | $Price %] + [% IF (category.dateofbirthrequired) %] + [% category.dateofbirthrequired %] years + [% ELSE %] + - + [% END %] + [% IF (category.upperagelimit) %] + [% category.upperagelimit %] years + [% ELSE %] + - + [% END %] + [% IF (category.enrolmentfee > 0) %] + [% category.enrolmentfee | $Price %] + [% ELSE %] + - + [% END %] [% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %] [% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %] - [% category.reservefee | $Price %] + [% IF (category.reservefee > 0) %] + [% category.reservefee | $Price %] + [% ELSE %] + - + [% END %] [% IF Koha.Preference('EnhancedMessagingPreferences') %] [% SET default_messaging = category.default_messaging %] -- 2.1.4