@@ -, +, @@ changed pages. --- .../prog/en/includes/calendar.inc | 19 ++++------ .../prog/en/includes/filter-orders.inc | 4 +-- .../prog/en/modules/acqui/invoices.tt | 30 +++------------- .../prog/en/modules/acqui/lateorders.tt | 4 +-- .../prog/en/modules/admin/aqbudgetperiods.tt | 8 ++--- .../prog/en/modules/admin/aqcontract.tt | 4 +-- .../prog/en/modules/circ/overdue.tt | 4 +-- .../prog/en/modules/circ/pendingreserves.tt | 4 +-- .../prog/en/modules/circ/reserveratios.tt | 4 +-- .../prog/en/modules/clubs/clubs-add-modify.tt | 4 +-- .../prog/en/modules/ill/ill-requests.tt | 8 ++--- .../prog/en/modules/labels/search.tt | 4 +-- .../prog/en/modules/members/memberentrygen.tt | 6 ++-- .../prog/en/modules/pos/register.tt | 4 +-- .../en/modules/reports/acquisitions_stats.tt | 35 +++---------------- .../en/modules/reports/cash_register_stats.tt | 4 +-- .../prog/en/modules/reports/dictionary.tt | 4 +-- .../prog/en/modules/reports/issues_stats.tt | 4 +-- .../prog/en/modules/serials/claims.tt | 4 +-- .../en/modules/serials/subscription-add.tt | 4 +-- .../modules/serials/subscription-history.tt | 4 +-- .../prog/en/modules/tags/review.tt | 4 +-- .../en/modules/tools/additional-contents.tt | 4 +-- .../modules/tools/batch_extend_due_dates.tt | 4 +-- .../prog/en/modules/tools/export.tt | 4 +-- .../prog/en/modules/tools/viewlog.tt | 4 +-- .../intranet-tmpl/prog/js/ill-list-table.js | 26 -------------- 27 files changed, 65 insertions(+), 147 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/calendar.inc @@ -58,23 +58,16 @@ }); }, onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); + validate_date( dateText, instance ); + var thisInput = instance.input; + if ( thisInput.hasAttribute('data-start_for') ) { + var endPicker = document.querySelector("#"+thisInput.dataset.start_for)._flatpickr; + endPicker.set('minDate', selectedDates[0]); + } }, }); $(document).ready(function(){ $(".flatpickr").flatpickr(); - var startPicker = $(".flatpickrfrom").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - endPicker.set('minDate', selectedDates[0]); - } - }); - var endPicker = $(".flatpickrto").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - }); [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc @@ -103,11 +103,11 @@
  • - +
    [% INCLUDE 'date-format.inc' %]
  • - +
    [% INCLUDE 'date-format.inc' %]
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -297,12 +297,12 @@
    1. - +
      [% INCLUDE 'date-format.inc' %]
    2. - +
      [% INCLUDE 'date-format.inc' %]
    @@ -314,12 +314,12 @@
    1. - +
      [% INCLUDE 'date-format.inc' %]
    2. - +
      [% INCLUDE 'date-format.inc' %]
    @@ -459,28 +459,6 @@ $('#merge_invoices').show(); } }); - var shipmentdatefrom = $("#shipmentdatefrom").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - shipmentdateto.set('minDate', selectedDates[0]); - } - }); - var shipmentdateto = $("#shipmentdateto").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - var billingdatefrom = $("#billingdatefrom").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - billingdateto.set('minDate', selectedDates[0]); - } - }); - var billingdateto = $("#billingdateto").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); }); [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -232,11 +232,11 @@
    1. days ago
    2. - +
      [% INCLUDE 'date-format.inc' %]
    3. - +
      [% INCLUDE 'date-format.inc' %]
    4. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -189,14 +189,14 @@
    5. - + Required
      [% INCLUDE 'date-format.inc' %]
    6. - + Required
      [% INCLUDE 'date-format.inc' %]
    7. @@ -259,14 +259,14 @@
      1. - + Required
        [% INCLUDE 'date-format.inc' %]
      2. - + Required
        [% INCLUDE 'date-format.inc' %]
      3. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tt @@ -132,12 +132,12 @@
      4.   - + Required
        [% INCLUDE 'date-format.inc' %]
      5.   - + Required
        [% INCLUDE 'date-format.inc' %]
      6. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/overdue.tt @@ -156,11 +156,11 @@
      7. - +
      8. - +
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/pendingreserves.tt @@ -271,12 +271,12 @@ - +
    8. - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt @@ -164,12 +164,12 @@
  • - +
  • - +
  • (inclusive) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/clubs/clubs-add-modify.tt @@ -73,12 +73,12 @@
  • - +
  • - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt @@ -73,19 +73,19 @@
  • - +
  • - +
  • - +
  • - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tt @@ -90,12 +90,12 @@ to add to Batch [% batch_id | html %]
    1. - +
      [% INCLUDE 'date-format.inc' %]
    2. - +
      [% INCLUDE 'date-format.inc' %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -1055,7 +1055,7 @@ legend:hover { [% END %] Registration date: - + [% IF ( mandatorydateenrolled ) %] Required [% END %] @@ -1079,9 +1079,9 @@ legend:hover { Expiry date (leave blank for auto calc): [% UNLESS ( opadd ) %] - + [% ELSE %] - + [% END %] [% IF ( mandatorydateexpiry ) %] Required --- a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/pos/register.tt @@ -160,9 +160,9 @@
    1. - + - + [% INCLUDE 'date-format.inc' %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tt @@ -120,9 +120,9 @@ - From + From [% INCLUDE 'date-format.inc' %] - To + To [% INCLUDE 'date-format.inc' %] @@ -143,9 +143,9 @@ - From + From [% INCLUDE 'date-format.inc' %] - To + To [% INCLUDE 'date-format.inc' %] @@ -339,33 +339,6 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% END %] [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -58,12 +58,12 @@
  • - +
    [% INCLUDE 'date-format.inc' %]
  • - +
    [% INCLUDE 'date-format.inc' %]
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tt @@ -259,10 +259,10 @@
  • Start of date range - +
    [% INCLUDE 'date-format.inc' %]
    End of date range - +
    [% INCLUDE 'date-format.inc' %]
  • [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/issues_stats.tt @@ -128,9 +128,9 @@ - + - + [% INCLUDE 'date-format.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt @@ -93,9 +93,9 @@
    1. - + - + [% INCLUDE 'date-format.inc' %] Clear filter --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -327,11 +327,11 @@ fieldset.rows table { clear: none; margin: 0; }
    2. - +
    3. - +
    4. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-history.tt @@ -41,14 +41,14 @@ Subscription start date - (start date of the 1st subscription) + (start date of the 1st subscription)
      [% INCLUDE 'date-format.inc' %]
      Subscription end date - (if empty, subscription is still active) + (if empty, subscription is still active)
      [% INCLUDE 'date-format.inc' %]
      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tt @@ -230,11 +230,11 @@ tr > td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
    5. - +
      [% INCLUDE 'date-format.inc' %]
      - +
      [% INCLUDE 'date-format.inc' %]
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt @@ -210,12 +210,12 @@ [% END %]
  • - +
    [% INCLUDE 'date-format.inc' %]
  • - +
    [% INCLUDE 'date-format.inc' %] [% IF category == 'news' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/batch_extend_due_dates.tt @@ -82,12 +82,12 @@
  • - +
  • - +
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/export.tt @@ -110,11 +110,11 @@
    1. - +
    2. - +
    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -273,11 +273,11 @@ [% END %]
  • - +
    [% INCLUDE 'date-format.inc' %]
  • - +
    [% INCLUDE 'date-format.inc' %]
  • --- a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js +++ a/koha-tmpl/intranet-tmpl/prog/js/ill-list-table.js @@ -335,32 +335,6 @@ $(document).ready(function() { $('#addcomment').toggleClass('content_hidden'); }); - var illfilter_dateplaced_start = $("#illfilter_dateplaced_start").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - illfilter_dateplaced_end.set('minDate', selectedDates[0]); - } - }); - - var illfilter_dateplaced_end = $("#illfilter_dateplaced_end").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - - var illfilter_datemodified_start = $("#illfilter_datemodified_start").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - illfilter_datemodified_end.set('minDate', selectedDates[0]); - } - }); - - var illfilter_datemodified_end = $("#illfilter_datemodified_end").flatpickr({ - onClose: function( selectedDates, dateText, instance) { - validate_date( selectedDates, instance ); - }, - }); - // Filter partner list // Record the list of all options var ill_partner_options = $('#partners > option'); --