Attachment 77695 Details for Bug 20600 – Bug 20600: (follow-up) Fix filtering

[patch] Bug 20600: (follow-up) Fix filtering

Bug-20600-follow-up-Fix-filtering.patch (text/plain), 2.45 KB, created by Owen Leonard on 2018-08-10 16:00:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2018-08-10 16:00:38 UTC

Size: 2.45 KB

patch

obsolete

>From dd72b81a06d26b9c905311a1f4d3d7e86fdbb7e4 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Wed, 6 Jun 2018 10:45:44 +0100
>Subject: [PATCH] Bug 20600: (follow-up) Fix filtering
>
>There was a bug whereby filtering by date would fail if the selected
>date syspref was set to dmydot or metric. Rather than use the display
>date value, We now use the non-display date value that is always in
>a predictable ISO8601 format to construct the Date objects used
>for comparison.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>index bc51a95..b8c2707 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt
>@@ -387,7 +387,7 @@
>                         { // Hide the two date columns we use just for sorting
>                             'aTargets': [ 'placed', 'updated' ],
>                             'bVisible': false,
>-                            'bSearchable': false
>+                            'bSearchable': true
>                         },
>                         { // When sorting 'placed', we want to use the
>                           // unformatted column
>@@ -428,12 +428,13 @@
> 
>                 // Custom date range filtering
>                 $.fn.dataTable.ext.search.push(function(settings, data, dataIndex) {
>+                    console.log(data);
>                     var placedStart = $('#illfilter_dateplaced_start').datepicker('getDate');
>                     var placedEnd = $('#illfilter_dateplaced_end').datepicker('getDate');
>                     var modifiedStart = $('#illfilter_datemodified_start').datepicker('getDate');
>                     var modifiedEnd = $('#illfilter_datemodified_end').datepicker('getDate');
>-                    var rowPlaced = data[8] ? new Date(data[8]) : null;
>-                    var rowModified = data[10] ? new Date(data[10]) : null;
>+                    var rowPlaced = data[7] ? new Date(data[7]) : null;
>+                    var rowModified = data[9] ? new Date(data[9]) : null;
>                     var placedPassed = true;
>                     var modifiedPassed = true;
>                     if (placedStart && rowPlaced && rowPlaced < placedStart) {
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20600: 74640 | 74641 | 75202 | 75276 | 75734 | 75735 | 75753 | 75755 | 75844 | 75845 | 75848 | 75849 | 75850 | 75851 | 75852 | 75853 | 75854 | 75871 | 77691 | 77692 | 77693 | 77694 | 77695 | 77696 | 77697 | 78439 | 78440 | 78441 | 78442 | 78443 | 78444 | 78445 | 78446 | 78463 | 78464 | 78465 | 78466 | 78467 | 78468 | 78469 | 78470 | 79183 | 80468 | 81992 | 81993 | 82032 | 82033 | 82034 | 82035 | 82036 | 82037 | 82038 | 82039 | 82062 | 82170 | 82171 | 82432 | 82433 | 82434 | 82435 | 82436 | 82437 | 82438 | 82439 | 82440 | 82441 | 82442 | 83882 | 83887 | 84736 | 84737 | 84738 | 84739 | 84740 | 84741 | 84742 | 84743 | 84744 | 84745 | 84746 | 84747 | 84748 | 84749 | 85037 | 85038 | 85039 | 85040 | 85041 | 85042 | 85043 | 85044 | 85045 | 85046 | 85047 | 85048 | 85049 | 85050