Attachment 167763 Details for Bug 37077 – Bug 37077: Fix report muti select for zero and single selections

[patch] Bug 37077: Fix report muti select for zero and single selections

Bug-37077-Fix-report-muti-select-for-zero-and-sing.patch (text/plain), 3.34 KB, created by Brendan Lawlor on 2024-06-14 19:31:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brendan Lawlor

Created: 2024-06-14 19:31:30 UTC

Size: 3.34 KB

patch

obsolete

>From 048a89fb5ddd6cb5dcac1ae74b92d72a0f8441d1 Mon Sep 17 00:00:00 2001
>From: Brendan Lawlor <blawlor@clamsnet.org>
>Date: Fri, 14 Jun 2024 19:11:56 +0000
>Subject: [PATCH] Bug 37077: Fix report muti select for zero and single
> selections
>
>This patch updates the javascript overriding the form submission when reports have multi select parameters.
>
>When there are more than one multi selects, and the user selcts one value from each, it skips updating the value of the select, so it doens't send duplicate parameters anymore.
>
>If there are no selections made it will pass '%' for all values. This allows the multi select to be optional in the report. If no selections are made it is assumed that you are not using that parameter to limit the report.
>
>Test plan:
>1. Go to Reports and create a report from SQL
>   select *
>   from items
>   where
>   homebranch in <<Libraries|branches:in>>
>   and
>   itype in <<Item type|itemtypes:in>>
>3. Run the report but pick only 1 library and 1 item type
>4. Click the "Show SQL code"
>5. Notice that the two parameters were filled correctly
>6. Run the report again with zero selections
>7. Click the "Show SQL code"
>8. Notice that the '%' is used for the parameter
>9. Run the report again with combinations of single, multiple and zero selections
>10. confirm the SQL code is generated as you would expect.
>---
> .../prog/en/modules/reports/guided_reports_start.tt   | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>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 50f7a65a4f..755f497bda 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
>@@ -882,7 +882,7 @@
>                                                 <label for="sql_params_[% sql_param.labelid | html %]">[% sql_param.entry | html %]:</label>
>                                                 [% IF (sql_param.select_multiple) %]
>                                                     <select name="[%- sql_param.input.name | html -%]" tabindex="1"  id="[%- sql_param.input.id | html -%]" multiple>
>-                                                        <option value="null" hidden></option>
>+                                                        <option value="%" hidden></option>
>                                                 [% ELSE %]
>                                                     <select name="[%- sql_param.input.name | html -%]" tabindex="1"  id="[%- sql_param.input.id | html -%]">
>                                                 [% END %]
>@@ -1581,8 +1581,13 @@
> 
>             $('#report_param_form').on('submit', function(e) {
>                 $('#report_param_form').find('select[multiple]').each( function (i) {
>-                    var $selected = $('option:first', this).val();
>-                    $(this).val($selected);
>+                    if( $(this).find('option:selected').length === 0 ) {
>+                        $(this).val(['%']);
>+                    }
>+                    else if( $(this).find('option:selected').length > 1 ) {                    
>+                        var $selected = $('option:first', this).val();
>+                        $(this).val($selected);
>+                    }  
>                 });
>             });
>         }
>-- 
>2.39.2

Actions: View | Diff | Splinter Review

Attachments on bug 37077: 167762 | 167763 | 167765 | 167785 | 169987