From 8c6096a80e0fe1e06578adff5c4a85e9b9d038e8 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 19 Oct 2021 16:20:19 +0000 Subject: [PATCH] Bug 29278: Fix selector of hint used to show age This patch modifies the patron entry form to correct a problem with the write_age() function introduced by the switch to Flatpickr on this page (Bug 28937). Rather than selecting the element based on the sequence of elements on the page, we should add an ID for direct selection. To test, apply the patch and go to Patrons. - Locate a patron record which has a date of birth saved. - When you open that patron for editing, you should see their age displayed below the date of birth input field, e.g. "Age: 23 years 9 months." - Changing the date in the date of birth field should update the age string correctly. - Go to Patrons -> New patron. - The date of birth field should have a hint showing the required date format, e.g. "(DD.MM.YYYY)". - When you select a date of birth using the Flatpickr calendar the age string should be updated correctly. --- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- koha-tmpl/intranet-tmpl/prog/js/members.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 204c59723e..ebd034a5f0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -354,7 +354,7 @@ legend:hover { [% IF ( ERROR_dateofbirth ) %] (Error) [% END %] -
[% INCLUDE 'date-format.inc' %]
+
[% INCLUDE 'date-format.inc' %]
[% END # /UNLESS nodateofbirth %] [% UNLESS noinitials %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/members.js b/koha-tmpl/intranet-tmpl/prog/js/members.js index 73c15021cf..a9e6a870ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/members.js +++ b/koha-tmpl/intranet-tmpl/prog/js/members.js @@ -148,7 +148,7 @@ function CalculateAge(dateofbirth) { } function write_age() { - var hint = $("#dateofbirth").siblings(".hint").first(); + var hint = $("#dateofbirth_hint"); hint.html(dateformat); var age = CalculateAge(document.form.dateofbirth.value); -- 2.20.1