View | Details | Raw Unified | Return to bug 35943
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt (-11 / +8 lines)
Lines 320-329 Link Here
320
                                                        <td class="report_type">
320
                                                        <td class="report_type">
321
                                                            [% savedreport.type | html %]
321
                                                            [% savedreport.type | html %]
322
                                                        </td>
322
                                                        </td>
323
                                                        <td class="report_group">
323
                                                        <td data-search="[% savedreport.report_group | html %]" class="report_group">
324
                                                            [% savedreport.groupname | html %]
324
                                                            [% savedreport.groupname | html %]
325
                                                        </td>
325
                                                        </td>
326
                                                        <td>
326
                                                        <td data-search="[% savedreport.report_subgroup | html %]">
327
                                                            [% savedreport.subgroupname | html %]
327
                                                            [% savedreport.subgroupname | html %]
328
                                                        </td>
328
                                                        </td>
329
                                                        <td class="report_notes">
329
                                                        <td class="report_notes">
Lines 1968-1976 Link Here
1968
                $("#subgroup_filter").change(function() {
1968
                $("#subgroup_filter").change(function() {
1969
                    var selected = $(this).find('option:selected');
1969
                    var selected = $(this).find('option:selected');
1970
                    var sg_id = $(selected).val();
1970
                    var sg_id = $(selected).val();
1971
                    var sg_name = $(selected).text();
1972
                    if (sg_id.length > 0) {
1971
                    if (sg_id.length > 0) {
1973
                        rtable.fnFilter('^' + sg_name + '$', 5, true, true, true, false);
1972
                        const input = '^' + $.fn.dataTable.util.escapeRegex(sg_id) + '$';
1973
                        rtable.fnFilter(input, 5, true, false, true, false);
1974
                        rtable.fnSetColumnVis(5, false);
1974
                        rtable.fnSetColumnVis(5, false);
1975
                    } else {
1975
                    } else {
1976
                        rtable.fnFilter('', 5);
1976
                        rtable.fnFilter('', 5);
Lines 2281-2295 Link Here
2281
            rtable.fnSetColumnVis(5, true);
2281
            rtable.fnSetColumnVis(5, true);
2282
2282
2283
            var g_id = tab.find("a").data("tabname");
2283
            var g_id = tab.find("a").data("tabname");
2284
            var g_name = tab.find("a").text().trim();
2284
            if (g_id === 'reports') {
2285
2285
                g_id = '';
2286
            if ( g_name == _("All") ) {
2287
                g_id = "";
2288
                g_name = "";
2289
            }
2286
            }
2290
2287
2291
            if (g_id && g_id.length > 0) {
2288
            if (g_id && g_id.length > 0) {
2292
                rtable.fnFilter('^' + g_name + '$', 4, true, true, true, false);
2289
                const input = '^' + $.fn.dataTable.util.escapeRegex(g_id) + '$';
2290
                rtable.fnFilter(input, 4, true, false, true, false);
2293
                rtable.fnSetColumnVis(4, false);
2291
                rtable.fnSetColumnVis(4, false);
2294
                for(var i in group_subgroups[g_id]) {
2292
                for(var i in group_subgroups[g_id]) {
2295
                    $("#subgroup_filter").append(
2293
                    $("#subgroup_filter").append(
2296
- 

Return to bug 35943