Lines 309-318
Link Here
|
309 |
<td class="report_type"> |
309 |
<td class="report_type"> |
310 |
[% savedreport.type | html %] |
310 |
[% savedreport.type | html %] |
311 |
</td> |
311 |
</td> |
312 |
<td class="report_group"> |
312 |
<td data-search="[% savedreport.report_group | html %]" class="report_group"> |
313 |
[% savedreport.groupname | html %] |
313 |
[% savedreport.groupname | html %] |
314 |
</td> |
314 |
</td> |
315 |
<td> |
315 |
<td data-search="[% savedreport.report_subgroup | html %]"> |
316 |
[% savedreport.subgroupname | html %] |
316 |
[% savedreport.subgroupname | html %] |
317 |
</td> |
317 |
</td> |
318 |
<td class="report_notes"> |
318 |
<td class="report_notes"> |
Lines 1973-1981
Link Here
|
1973 |
$("#subgroup_filter").change(function() { |
1973 |
$("#subgroup_filter").change(function() { |
1974 |
var selected = $(this).find('option:selected'); |
1974 |
var selected = $(this).find('option:selected'); |
1975 |
var sg_id = $(selected).val(); |
1975 |
var sg_id = $(selected).val(); |
1976 |
var sg_name = $(selected).text(); |
|
|
1977 |
if (sg_id.length > 0) { |
1976 |
if (sg_id.length > 0) { |
1978 |
rtable.fnFilter('^' + sg_name + '$', 5, true, true, true, false); |
1977 |
const input = '^' + $.fn.dataTable.util.escapeRegex(sg_id) + '$'; |
|
|
1978 |
rtable.fnFilter(input, 5, true, false, true, false); |
1979 |
rtable.fnSetColumnVis(5, false); |
1979 |
rtable.fnSetColumnVis(5, false); |
1980 |
} else { |
1980 |
} else { |
1981 |
rtable.fnFilter('', 5); |
1981 |
rtable.fnFilter('', 5); |
Lines 2278-2292
Link Here
|
2278 |
rtable.fnSetColumnVis(5, true); |
2278 |
rtable.fnSetColumnVis(5, true); |
2279 |
|
2279 |
|
2280 |
var g_id = tab.find("a").data("tabname"); |
2280 |
var g_id = tab.find("a").data("tabname"); |
2281 |
var g_name = tab.find("a").text().trim(); |
2281 |
if (g_id === 'reports') { |
2282 |
|
2282 |
g_id = ''; |
2283 |
if ( g_name == _("All") ) { |
|
|
2284 |
g_id = ""; |
2285 |
g_name = ""; |
2286 |
} |
2283 |
} |
2287 |
|
2284 |
|
2288 |
if (g_id && g_id.length > 0) { |
2285 |
if (g_id && g_id.length > 0) { |
2289 |
rtable.fnFilter('^' + g_name + '$', 4, true, true, true, false); |
2286 |
const input = '^' + $.fn.dataTable.util.escapeRegex(g_id) + '$'; |
|
|
2287 |
rtable.fnFilter(input, 4, true, false, true, false); |
2290 |
rtable.fnSetColumnVis(4, false); |
2288 |
rtable.fnSetColumnVis(4, false); |
2291 |
for(var i in group_subgroups[g_id]) { |
2289 |
for(var i in group_subgroups[g_id]) { |
2292 |
$("#subgroup_filter").append( |
2290 |
$("#subgroup_filter").append( |
2293 |
- |
|
|