From db4c0bdc45e6b170a5ae466b8d712aa20328c5d5 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 14 Oct 2021 17:05:07 +0000 Subject: [PATCH] Bug 29240: (follow-up) Correct more instances This patch fixes linked date fields in these pages: - Reports -> Patrons with the most checkouts - Reports -> Patrons statistics wizard - Reports -> Most-circulated items - Reports -> Catalog statistics wizard - Reports -> Guided reports - Reports -> Average loan time - Reports -> Holds statistics wizard --- .../prog/en/modules/reports/bor_issues_top.tt | 37 ++------ .../en/modules/reports/borrowers_stats.tt | 19 +--- .../prog/en/modules/reports/cat_issues_top.tt | 39 ++------ .../en/modules/reports/catalogue_stats.tt | 34 ++----- .../modules/reports/guided_reports_start.tt | 21 +---- .../en/modules/reports/issues_avg_stats.tt | 39 ++------ .../prog/en/modules/reports/reserves_stats.tt | 88 ++++--------------- 7 files changed, 44 insertions(+), 233 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt index 2d819f6262..b784b8a563 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/bor_issues_top.tt @@ -120,16 +120,18 @@
  1. - + + - + [% INCLUDE 'date-format.inc' %]
  2. - + + - + [% INCLUDE 'date-format.inc' %]
  3. @@ -227,33 +229,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt index f08b356023..8ae1d0627a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt @@ -181,9 +181,9 @@ - + - + [% INCLUDE 'date-format.inc' %] @@ -330,21 +330,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt index 7d4aa27b51..910caa92db 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cat_issues_top.tt @@ -97,16 +97,18 @@
    1. - + + - + [% INCLUDE 'date-format.inc' %]
    2. - + + - + [% INCLUDE 'date-format.inc' %]
    3. @@ -225,35 +227,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt index effe64e508..bdaba8e80b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt @@ -252,9 +252,10 @@ - + + - + @@ -263,9 +264,10 @@ - + + - + @@ -354,30 +356,6 @@ $(document).ready(function() { - var acqdateFrom = $("#acqdateFrom").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - acqdateTo.set('minDate', selectedDates[0]); - } - }); - var acqdateTo = $("#acqdateTo").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - - var deldateFrom = $("#deldateFrom").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - deldateTo.set('minDate', selectedDates[0]); - } - }); - var deldateTo = $("#deldateTo").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - $("input[name='Cellvalue']").change(function() { changeRemovedDateTrStatus(); }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index 1a4c2d9a3d..9211b4a96d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -619,9 +619,9 @@ [% IF ( criteri.daterange ) %] from - + to - + [% INCLUDE 'date-format.inc' %] @@ -2189,23 +2189,6 @@ readOnly: true }); } - [% IF ( build4 ) %] - [% FOREACH criteri IN criteria %] - [% IF ( criteri.daterange ) %] - var from_[% criteri.name.remove('\.') | html %]_value = $("#from_[% criteri.name.remove('\.') | html %]_value").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - to_[% criteri.name.remove('\.') | html %]_value.set('minDate', selectedDates[0]); - } - }); - var to_[% criteri.name.remove('\.') | html %]_value = $("#to_[% criteri.name.remove('\.') | html %]_value").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - [% END %] - [% END %] - [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt index 47138b735d..bb1e3200bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_avg_stats.tt @@ -105,9 +105,10 @@ - + + - + [% INCLUDE 'date-format.inc' %] @@ -119,7 +120,7 @@ - + @@ -129,9 +130,10 @@ - + + - + [% INCLUDE 'date-format.inc' %] @@ -266,33 +268,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt index 4db7612a5d..59cd4aca36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reserves_stats.tt @@ -125,9 +125,10 @@ - + + - + @@ -136,9 +137,10 @@ - + + - + @@ -147,9 +149,10 @@ - + + - + @@ -158,9 +161,10 @@ - + + - + @@ -169,9 +173,10 @@ - + + - + @@ -338,69 +343,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] -- 2.20.1