Attachment 111555 Details for Bug 26032 – Bug 26032: Add 'is new' filter in items search

[patch] Bug 26032: Add 'is new' filter in items search

Bug-26032-Add-is-new-filter-in-items-search.patch (text/plain), 3.78 KB, created by Fridolin Somers on 2020-10-13 12:56:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fridolin Somers

Created: 2020-10-13 12:56:09 UTC

Size: 3.78 KB

patch

obsolete

>From 375e9a75836a882e61752728dddfa2c24f729af7 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Tue, 21 Jul 2020 11:43:55 +0200
>Subject: [PATCH] Bug 26032: Add 'is new' filter in items search
>
>In items search, add a filter on value of items.new_status with a Ignore/Yes/No.
>Yes meaning != 0, No meaning = 0, with considering that NULL value is like 0.
>
>This patch adds 'isnull' option to filter, this may be reused on other
>fields.
>
>Test plan :
>1) Define an item subfield on items.new_status with authorised values YES_NO (0 or 1)
>2) Edit an item A to set new_status=1
>3) Edit an item B to set new_status=0
>4) Perform an item search with 'is new' = 'ignore' => you get all items
>5) Perform an item search with 'is new' = 'yes' => you get item A
>6) Perform an item search with 'is new' = 'no' => you get all items but A
>---
> C4/Items.pm                                              | 9 +++++++++
> catalogue/itemsearch.pl                                  | 5 ++++-
> .../prog/en/modules/catalogue/itemsearch.tt              | 2 ++
> 3 files changed, 15 insertions(+), 1 deletion(-)
>
>diff --git a/C4/Items.pm b/C4/Items.pm
>index 9da7f61fc6..a2983f4eea 100644
>--- a/C4/Items.pm
>+++ b/C4/Items.pm
>@@ -1333,6 +1333,7 @@ sub _SearchItems_build_where_fragment {
>         if ( (0 < grep { $_ eq $field } @columns) or (substr($field, 0, 5) eq 'marc:') ) {
>             my $op = $filter->{operator};
>             my $query = $filter->{query};
>+            my $ifnull = $filter->{ifnull};
> 
>             if (!$op or (0 == grep { $_ eq $op } @operators)) {
>                 $op = '='; # default operator
>@@ -1373,6 +1374,10 @@ sub _SearchItems_build_where_fragment {
>                 $column = $field;
>             }
> 
>+            if ( defined $ifnull ) {
>+                $column = "IFNULL($column, ?)";
>+            }
>+
>             if (ref $query eq 'ARRAY') {
>                 if ($op eq '=') {
>                     $op = 'IN';
>@@ -1389,6 +1394,10 @@ sub _SearchItems_build_where_fragment {
>                     args => [ $query ],
>                 };
>             }
>+
>+            if ( defined $ifnull ) {
>+                unshift @{ $where_fragment->{args} }, $ifnull;
>+            }
>         }
>     }
> 
>diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl
>index 48d4c775b4..4c4415533a 100755
>--- a/catalogue/itemsearch.pl
>+++ b/catalogue/itemsearch.pl
>@@ -164,12 +164,15 @@ if (scalar keys %params > 0) {
>     push @{ $filter->{filters} }, $f;
> 
>     # Yes/No parameters
>-    foreach my $p (qw( damaged )) {
>+    foreach my $p (qw( damaged new_status )) {
>         my $v = $cgi->param($p) // '';
>         my $f = {
>             field => $p,
>             query => 0,
>         };
>+        if ( $p eq 'new_status' ) {
>+            $f->{ifnull} = 0;
>+        }
>         if ($v eq 'yes') {
>             $f->{operator} = '!=';
>             push @{ $filter->{filters} }, $f;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>index 0290678ab4..22d3ca6cc9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/itemsearch.tt
>@@ -29,6 +29,7 @@
>     [% CASE 'damaged' %]<span>Damaged</span>
>     [% CASE 'itemlost' %]<span>Lost</span>
>     [% CASE 'withdrawn' %]<span>Withdrawn</span>
>+    [% CASE 'new_status' %]<span>Is new</span>
>   [% END %]
> [% END %]
> 
>@@ -194,6 +195,7 @@
>               <span class="hint">(inclusive)</span>
>             </div>
>             [% INCLUDE form_field_radio_yes_no name="damaged" %]
>+            [% INCLUDE form_field_radio_yes_no name="new_status" %]
>             <div class="form-field">
>               <label class="form-field-label" for="issues_op">Checkout count:</label>
>               <select id="issues_op" name="issues_op">
>-- 
>2.28.0

Actions: View | Diff | Splinter Review

Attachments on bug 26032: 107141 | 107142 | 111554 | 111555 | 111834 | 111961 | 111962 | 111963 | 112500 | 112501 | 112502 | 112707 | 112708 | 112709 | 112710 | 112809 | 112810 | 112811 | 112812 | 112915 | 112916 | 112917 | 112918