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