From 89dfbe654b1d6fe945d0a344d2e3cb2b526f679a Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 7 Sep 2021 14:14:54 +0000 Subject: [PATCH] Bug 28961: Use Flatpickr on tools pages This patch replaces the use of jQueryUI's datepicker on tools pages. To test, apply the patch and test the following tools pages to confirm that datepickers work correctly. "Linked" date fields should prevent a "to" selection which preceeds the selected "from" date. - News -> New entry: Linked fields "Published date" and "Expiration date". - Batch extend due dates: Linked fields "Due date from" and "Due date to"; "Hard due date" field. - Batch patron deletion: "who have not borrowed since," "whose expiration date is before," and "Permanently delete checkout history older than." - Export: Linked "Start date" and "End date" fields. - Import patrons -> Enter default values: "Date of birth," "Registration date," and "Expiry date." - Inventory: "Set inventory date to." - Batch patron modification -> Submit a batch of cardnumbers or a patron list: "Registration date," "Expiry date," and "Restriction expiration." - Task scheduler: "Date" field. - Log viewer: "Display from" and "Display to" linked fields. Signed-off-by: Lucas Gass Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- .../prog/en/modules/tools/additional-contents.tt | 4 ++-- .../prog/en/modules/tools/batch_extend_due_dates.tt | 6 +++--- .../prog/en/modules/tools/cleanborrowers.tt | 8 ++++---- .../intranet-tmpl/prog/en/modules/tools/export.tt | 4 ++-- .../prog/en/modules/tools/import_borrowers.tt | 2 +- .../prog/en/modules/tools/inventory.tt | 2 +- .../prog/en/modules/tools/modborrowers.tt | 2 +- .../prog/en/modules/tools/scheduler.tt | 13 +++++-------- .../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 4 ++-- 9 files changed, 21 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt index 0c388e83c6..0a7f55ef38 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -199,12 +199,12 @@ [% END %]
  • - +
    [% INCLUDE 'date-format.inc' %]
  • - +
    [% INCLUDE 'date-format.inc' %] [% IF category == 'news' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt index 66ba593bf6..1fed15f83a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt @@ -82,12 +82,12 @@
  • - +
  • - +
  • @@ -96,7 +96,7 @@
    1. - +
    2. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt index 9e5f7bcde8..05e70eb768 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tt @@ -111,18 +111,18 @@
      • - + [% INCLUDE 'date-format.inc' %]
      • - + [% INCLUDE 'date-format.inc' %]
      • [% IF Koha.Preference('TrackLastPatronActivity') %]
      • - + [% INCLUDE 'date-format.inc' %]
      • [% END %] @@ -161,7 +161,7 @@
        • - + [% INCLUDE 'date-format.inc' %]
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt index 04b7bc801c..fe5011bd9b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -110,11 +110,11 @@
        1. - +
        2. - +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt index 153ffd3a09..080762d8d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt @@ -409,7 +409,7 @@ you can supply dates in ISO format (e.g., '2010-10-28'). [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index b828dc3b55..a1794b0e75 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -273,11 +273,11 @@ [% END %]
      • - +
        [% INCLUDE 'date-format.inc' %]
      • - +
        [% INCLUDE 'date-format.inc' %]
    -- 2.39.5