gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 43267: [26.05.x] Reports - only send visible records to batch operations from DT view 

When opening report results in the new DataTables view, batch
operations should only send visible records. Same as the normal view.

Test plan:
1. Create and run a report that will display more resulsts than fit on
   one page
2. Click "Open in DataTables".
3. Note "Batch operations with X visible records" shows the default
   page size (=20), and open the "Batch operations" dropdown to
   send results to e.g. batch item modification or batch record
   modification.
4. Confirm only the values on the currently visible page are sent, not
   the entire set.
5. Change the DataTable's page, or filter/search within it, and repeat
=> Confirm the count and the sent values update to the number of visible records
6. Confirm the standard (non-DataTables) report view is unaffected.

Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2026-09-15 12:10:25 +02:00 committed by Lucas Gass
parent f19d25d60d
commit 5edd58772f
No known key found for this signature in database
GPG Key ID: 60B447398B0D36CA
1 changed files with 76 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
View File

@ -1156,9 +1156,11 @@
[% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers || batch_borrowernumbers || batch_reserve_ids ) || ( unlimited_total > 10 && limit <= 1000 ) %]
<div id="toolbar" class="btn-toolbar">
[% IF ( batch_biblionumbers || batch_itemnumbers || batch_cardnumbers || batch_borrowernumbers || batch_reserve_ids ) %]
<div class="btn-group">
<div class="btn-group" id="batch_mod_menu_wrapper" [% IF open_in_dt %]style="display:none"[% END %]>
<button class="btn btn-default btn-sm dropdown-toggle" type="button" id="batch_mod_menu" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
Batch operations with [% IF unlimited_total >= limit %][% results.size | html %][% ELSE %][% unlimited_total | html %][% END %] visible records
[% SET batch_op_count = unlimited_total >= limit ? results.size : unlimited_total %]
[% SET batch_op_count_html = '<span id="batch_op_count">' _ batch_op_count _ '</span>' %]
[% tnx( "Batch operations with {count} visible record", "Batch operations with {count} visible records", batch_op_count, { count = batch_op_count_html } ) | $raw %]
<span class="caret"></span>
</button>
<ul class="dropdown-menu" aria-labelledby="batch_mod_menu">
@ -1426,6 +1428,8 @@
</ul>
</div>
</td>
[% ELSIF header_row.$place.cell == 'reserve_id' || header_types.item(header_row.$place.cell) == 'reserve_id' %]
<td class="batch-op reserve_id" data-number="reserve_id">[% cells.cell | $raw %]</td>
[% ELSE %]
<td> [% cells.cell | $raw %] </td>
[% END %]
@ -1838,6 +1842,7 @@
const open_in_dt = [% open_in_dt ? 1 : 0 | html %];
const execute = [% execute ? 1 : 0 | html %];
let report_results_dt;
</script>
<script nonce="[% Koha.CSPNonce | $raw %]">
// if the report param form has multiselects override default form submission
@ -2277,7 +2282,9 @@
});
});
let report_table_settings = { columns };
$("#report_results").kohaTable({}, report_table_settings);
report_results_dt = $("#report_results").kohaTable({}, report_table_settings).DataTable();
syncBatchFormsWithVisibleResults();
report_results_dt.on("draw length page search", syncBatchFormsWithVisibleResults);
}
if (saved1) {
var rtable = $("#table_reports").kohaTable(
@ -2556,6 +2563,72 @@
$("#" + target_form).submit();
});
function syncBatchFormsWithVisibleResults() {
if (!report_results_dt) return;
var visible_rows = $(report_results_dt.rows({ page: "current" }).nodes());
$("#batch_op_count").text(visible_rows.length);
function visibleValues(type) {
return visible_rows
.find("td.batch-op[data-number='" + type + "']")
.map(function () {
var plain = $(this).find(".data-plain");
return (plain.length ? plain.text() : $(this).text()).trim();
})
.get()
.filter(function (v) {
return v.length;
});
}
function setTextarea(selector, values) {
$(selector).val(values.join("\n"));
}
function setHiddenInputs(form_selector, name, cls, values) {
var form = $(form_selector);
form.find("input[name='" + name + "']").remove();
values.forEach(function (v) {
$("<input>", {
type: "hidden",
name: name,
class: cls,
value: v,
}).appendTo(form);
});
}
var itemnumbers = visibleValues("itemnumber");
setHiddenInputs("#batch_item_modification", "itemnumber", "", itemnumbers);
setHiddenInputs("#batch_item_deletion", "itemnumber", "", itemnumbers);
var biblionumbers = visibleValues("biblionumber");
setTextarea("#batch_record_modification textarea[name='recordnumber_list']", biblionumbers);
setTextarea("#batch_record_deletion textarea[name='recordnumber_list']", biblionumbers);
setHiddenInputs("#batch_add_to_list", "biblionumber", "bib_to_list", biblionumbers);
var borrowernumbers = visibleValues("borrowernumber");
var cardnumbers = visibleValues("cardnumber");
setTextarea("#bor_num_list", borrowernumbers);
if (borrowernumbers.length) {
setTextarea("#borrowernumberlist", borrowernumbers);
setTextarea("#cardnumberlist", []);
} else {
setTextarea("#cardnumberlist", cardnumbers);
}
var reserveIds = visibleValues("reserve_id");
setTextarea("#reserve_ids_list", reserveIds);
var has_batchable_values = itemnumbers.length || biblionumbers.length || borrowernumbers.length || cardnumbers.length || reserveIds.length;
$("#batch_mod_menu").prop("disabled", !has_batchable_values);
// Prevent flashing the number of visible records in #batch_mod_menu
$("#batch_mod_menu_wrapper").show();
}
$("#batch_add_to_list").on("submit", function (e) {
e.preventDefault();
addToList();