From b089121aeb06a722657842a433832330a32098ae Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 24 Apr 2015 15:36:34 +0200 Subject: [PATCH] Bug 14060: Remove readonly attributes on date inputs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In order to remove accessibility issues due to the readonly attributes on date inputs, this patch will remove them and introduce a javascript validation on them. This patch is not perfect for some reason: I didn't manage to force the user to select a valid date. One solution would be to reopen the datepicker plugin until a valid date is inserted. But it could be annoying for users (and for me: I did not manage to implement this solution). You will note that input is emptied if the date is not valid. This is a quick and efficient solution to prevent submitting invalid date and make Koha explodes. A proper solution would be to implement the check server side send a friendly message to the user. Test plan: For all inputs, try an invalid and a valid date. 1/ Debar a patron 2/ On the checkout tables (circulation and moremember), add a renewal due date (at the bottom of the tables) 3/ On the checkout page, specify a due date 4/ On the return page, specify a return date 5/ On the invoice page (acquisition module), enter a shipment and billing date 6/ On the invoice search page (invoices.pl) use filters shipment and billing dates 7/ On the offline circ page, specify a due date 8/ On the edit patron page (memberentry), add a debarment 9/ On the reserve page (reserve/request.pl), use the date inputs to suspend until a defined date 10/ Edit patrons in a batch (tools/modborrowers.pl) and use the registration and expiry date inputs Signed-off-by: Owen Leonard Signed-off-by: Nick Clemens Signed-off-by: Kyle M Hall (cherry picked from commit f91ed3d8bf19533a4a92e67c0b1fe394e84e67bf) Signed-off-by: Frédéric Demians --- .../prog/en/includes/borrower_debarments.inc | 2 +- .../prog/en/includes/calendar.inc | 29 +++++++++++++++++-- .../en/includes/checkouts-table-footer.inc | 2 +- .../prog/en/modules/acqui/invoice.tt | 4 +-- .../prog/en/modules/acqui/invoices.tt | 4 +-- .../prog/en/modules/circ/circulation.tt | 14 +++++---- .../prog/en/modules/circ/offline.tt | 8 +++-- .../prog/en/modules/circ/returns.tt | 6 +++- .../prog/en/modules/members/memberentrygen.tt | 2 +- .../prog/en/modules/members/moremember.tt | 5 ---- .../prog/en/modules/reserve/request.tt | 6 ++-- .../prog/en/modules/tools/modborrowers.tt | 5 ++-- .../prog/js/pages/circulation.js | 9 +++++- 13 files changed, 68 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc index 9944ec4464..a72a76e41a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/borrower_debarments.inc @@ -85,7 +85,7 @@ Add manual restriction
    2. -
  2. +
  3. Clear date
Cancel
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc index 9b6dd5223a..7439304cbe 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -6,6 +6,24 @@ var debug = "[% debug %]"; var dformat = "[% dateformat %]"; var sentmsg = 0; if (debug > 1) {alert("dateformat: " + dformat + "\ndebug is on (level " + debug + ")");} +var MSG_PLEASE_ENTER_A_VALID_DATE = ("Please enter a valid date."); + +function validate_date (dateText, inst) { + var dateformat = '[% Koha.Preference('dateformat') %]'; + if ( dateformat == 'us' ) { + dateformat = 'mm/dd/yy'; + } else if ( dateformat == 'metric' ) { + dateformat = 'dd/mm/yy'; + } else if (dateformat == 'iso' ) { + dateformat = 'yy-mm-dd'; + } + try { + $.datepicker.parseDate(dateformat, dateText); + } catch (e) { + alert(MSG_PLEASE_ENTER_A_VALID_DATE); + $('#'+inst.id).val(''); + }; +} function Date_from_syspref(dstring) { var dateX = dstring.split(/[-/.]/); @@ -89,7 +107,11 @@ $.datepicker.setDefaults({ selectOtherMonths: true }); - $( ".datepicker" ).datepicker(); + $( ".datepicker" ).datepicker({ + onClose: function(dateText, inst) { + validate_date(dateText, inst); + }, + }); // http://jqueryui.com/demos/datepicker/#date-range var dates = $( ".datepickerfrom, .datepickerto" ).datepicker({ changeMonth: true, @@ -102,7 +124,10 @@ $.datepicker.setDefaults({ $.datepicker._defaults.dateFormat, selectedDate, instance.settings ); dates.not( this ).datepicker( "option", option, date ); - } + }, + onClose: function(dateText, inst) { + validate_date(dateText, inst); + }, }); }); //]]> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc index 0039c8e68e..a8b906b7c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc @@ -5,7 +5,7 @@ [% finetotal %] [% totalprice %]
-

+

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 8f8a317153..5b8ee465b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -77,10 +77,10 @@
  1. -
    2. +
  2. -
    3. +
    4. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index e94f2c013d..4b4691598f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -180,10 +180,10 @@ $(document).ready(function() {
  5. -
    6. +
  6. -
    7. +
    8. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index cf4e8c2678..0ccc638662 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -72,7 +72,11 @@ function toggle_onsite_checkout(){ [% END %] } else { $("#duedatespec").datetimepicker({ - onClose: function(dateText, inst) { $("#barcode").focus(); }, + onClose: function(dateText, inst) { + if (validate_date(dateText, inst) ) { + $("#barcode").focus(); + } + }, hour: 23, minute: 59 }); @@ -369,7 +373,7 @@ $(document).ready(function() { [% IF ( DEBT ) %][% END %] [% IF ( INVALID_DATE ) %]

    - +

    [% ELSE %] @@ -635,9 +639,9 @@ No patron matched [% message | html %]
    Specify due date [% INCLUDE 'date-format.inc' %]:
    [% IF ( duedatespec ) %] - + [% ELSE %] - + [% END %] [% IF ( stickyduedate ) %] @@ -685,7 +689,7 @@ No patron matched [% message | html %] [% IF noissues %]
    - +
    [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt index b50f038d7a..2bf0868c21 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/offline.tt @@ -553,7 +553,11 @@ $(document).ready(function () { minute: 59 }); $("#duedatespec").datetimepicker({ - onClose: function(dateText, inst) { setTimeout(function() { $('#checkout-barcode').trigger('focus'), 1 }); }, + onClose: function(dateText, inst) { + if (validate_date(dateText, inst) ) { + setTimeout(function() { $('#checkout-barcode').trigger('focus'), 1 }); + } + }, hour: 23, minute: 59 }); @@ -690,7 +694,7 @@ $(document).ready(function () {
    Specify due date [% INCLUDE 'date-format.inc' %]:
    - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 0130ae1f86..a5342d6769 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -38,7 +38,11 @@ $(document).ready(function () { }, columns_settings); $("#return_date_override").datetimepicker({ - onClose: function(dateText, inst) { $("#barcode").focus(); }, + onClose: function(dateText, inst) { + if (validate_date(dateText, inst) ) { + $("#barcode").focus(); + } + }, defaultDate: -1, hour: 23, minute: 59, 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 734d5222d2..86e67678d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -926,7 +926,7 @@ $(document).ready(function() { Add manual restriction
      2. -
    2. +
    3. Clear date
    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 72b3fd5aa6..50baebec90 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -85,11 +85,6 @@ $(document).ready(function() { });[% END %] $("#suspend_until").datepicker({ minDate: 1 }); // require that hold suspended until date is after today - $("#newduedate").datetimepicker({ - minDate: 1, // require that renewal date is after today - hour: 23, - minute: 59 - }); $("#view_restrictions").on("click",function(){ $('#debarments-tab-link').click(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index ba53b3a118..e5a1a0f2eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -390,14 +390,14 @@ function checkMultiHold() { [% IF ( reserve_in_future ) %]
  8. - + Clear date
    9. [% END %]
  9. - + Clear date
    10. @@ -810,7 +810,7 @@ function checkMultiHold() { [% IF AutoResumeSuspendedHolds %] - + Clear date [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt index 54227e66e2..1b7f9fac05 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt @@ -1,3 +1,4 @@ +[% USE Koha %] [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc'%] Koha › Tools › Batch patron modification @@ -335,7 +336,7 @@ [% END %] [% IF field.mandatory %] - + [% ELSE %] [% END %] @@ -354,7 +355,7 @@ [% END %] [% END %] [% IF ( field.type == 'date' ) %] - + Clear [% END %] [% IF field.mandatory %] diff --git a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js index 2d85c81888..2386cb5cf7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js +++ b/koha-tmpl/intranet-tmpl/prog/js/pages/circulation.js @@ -31,12 +31,19 @@ $(document).ready(function() { }); $("#newduedate").datetimepicker({ + onClose: function(dateText, inst) { + validate_date(dateText, inst); + }, minDate: 1, // require that renewal date is after today hour: 23, minute: 59 }); $("#duedatespec").datetimepicker({ - onClose: function(dateText, inst) { $("#barcode").focus(); }, + onClose: function(dateText, inst) { + if ( validate_date(dateText, inst) ) { + $("#barcode").focus(); + } + }, hour: 23, minute: 59 }); -- 2.39.5