From 35d65378dccc355dbd2cdf93d980ee24e087d54e Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 2 Dec 2024 11:55:53 +0100 Subject: [PATCH] Bug 26553: Replace KohaTable with kohaTable - OPAC Signed-off-by: Lucas Gass --- .../en/modules/opac-course-details.tt | 29 ++++---- .../en/modules/opac-course-reserves.tt | 33 ++++----- .../bootstrap/en/modules/opac-detail.tt | 70 +++++++++++-------- .../bootstrap/en/modules/opac-holdshistory.tt | 24 +++---- .../en/modules/opac-readingrecord.tt | 31 ++++---- .../en/modules/opac-search-history.tt | 26 +++---- 6 files changed, 114 insertions(+), 99 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt index 27836cf3c6a..4300a1ebb70 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-details.tt @@ -126,20 +126,23 @@ [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt index ee3c7f95dfd..d701e521ec5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-course-reserves.tt @@ -75,23 +75,24 @@ [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt index 38ce3032663..9bca3319d8e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt @@ -1744,41 +1744,49 @@ var table_settings = [% TablesSettings.GetTableSettings( 'opac', 'biblio-detail', 'holdingst', 'json' ) | $raw %]; - KohaTable("#holdingst", { - dom: '<"clearfix">t', - "columnDefs": [ - { "className": "dtr-control", "orderable": false, "targets": -1 } - ], - "bKohaColumnsUseNames": true, - "responsive": { - "details": { "type": 'column', "target": -1 } - } - }, table_settings); - - KohaTable("#otherholdingst", { - dom: '<"clearfix">t', - "columnDefs": [ - { "className": "dtr-control", "orderable": false, "targets": -1 } - ], - "bKohaColumnsUseNames": true, - "responsive": { - "details": { "type": 'column', "target": -1 } - } - }, table_settings); + $("#holdingst").kohaTable( + { + dom: '<"clearfix">t', + columnDefs: [ + { className: "dtr-control", orderable: false, targets: -1 }, + ], + bKohaColumnsUseNames: true, + responsive: { + details: { type: "column", target: -1 }, + }, + }, + table_settings + ); + $("#otherholdingst").kohatable( + { + dom: '<"clearfix">t', + columnDefs: [ + { className: "dtr-control", orderable: false, targets: -1 }, + ], + bKohaColumnsUseNames: true, + responsive: { + details: { type: "column", target: -1 }, + }, + }, + table_settings + ); var serial_table_settings = [% TablesSettings.GetTableSettings( 'opac', 'biblio-detail', 'subscriptionst', 'json' ) | $raw %]; - KohaTable("#subscriptionst", { - dom: '<"clearfix">t', - "sorting": [[ 1, "desc" ]], - "bKohaColumnsUseNames": true, - "responsive": { - "details": { "type": 'column', "target": -1 } + $("#subscriptionst").kohaTable( + { + dom: '<"clearfix">t', + sorting: [[1, "desc"]], + bKohaColumnsUseNames: true, + responsive: { + details: { type: "column", target: -1 }, + }, + columnDefs: [ + { className: "dtr-control", orderable: false, targets: -1 }, + ], }, - "columnDefs": [ - { "className": "dtr-control", "orderable": false, "targets": -1 } - ], - }, serial_table_settings); + serial_table_settings + ); var dTables = $("#holdingst,#subscriptionst,#otherholdingst"); $('a[data-bs-toggle="tab"]').on('shown.bs.tab', function (event) { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt index cca64a62748..1eb0597e29d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-holdshistory.tt @@ -185,18 +185,18 @@ $('#sort').change(function() { $('#sortform').submit(); }); - var table = KohaTable("#table_holdshistory", { - "dom": '<"top"<"table_entries"i><"table_controls"fB>>t', - "autoWidth": false, - "sorting": [[4, 'desc']], - "columnDefs": [ - { "sType": "anti-the", "aTargets" : [ "anti-the" ] } - ], - "language": { - "search": "_INPUT_", - "searchPlaceholder": _("Search") - } - }); + var table = $("#table_holdshistory").kohaTable( + { + dom: '<"top"<"table_entries"i><"table_controls"fB>>t', + autoWidth: false, + sorting: [[4, "desc"]], + columnDefs: [{ sType: "anti-the", aTargets: ["anti-the"] }], + language: { + search: "_INPUT_", + searchPlaceholder: _("Search"), + }, + }, + ); }); [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt index 24b95d3e5dc..9d8c6d6116c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt @@ -231,21 +231,24 @@ $('#sortform').submit(); }); - var table = KohaTable("#readingrec", { - "dom": '<"top"<"table_entries"i><"table_controls"fB>>t', - "language": { - "search": "_INPUT_", - "searchPlaceholder": _("Search") + var table = $("#readingrec").kohaTable( + { + dom: '<"top"<"table_entries"i><"table_controls"fB>>t', + language: { + search: "_INPUT_", + searchPlaceholder: _("Search"), + }, + responsive: { + details: { type: "column", target: -1 }, + }, + columnDefs: [ + { className: "dtr-control", orderable: false, targets: [-1] }, + { visible: false, targets: [0] }, + { orderable: false, targets: [1] }, + ], }, - "responsive": { - "details": {"type": 'column',"target": -1} - }, - "columnDefs": [ - { "className": "dtr-control","orderable": false,"targets": [-1] }, - { "visible": false, "targets": [0]}, - { "orderable": false, "targets": [1]} - ], - }); + ); + let table_dt = table.DataTable(); $("#tabs a[data-bs-toggle='tab']").on("shown.bs.tab", function (e) { diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index 1d35a87e8f9..9bb6cb09d19 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -294,24 +294,24 @@ $(document).ready(function() { // We show table ordered by descending dates by default // (so that the more recent query is shown first) - var table = KohaTable(".historyt", { - "order": [[ 1, "desc" ]], - "dom": '<"top"<"table_entries"><"table_controls"fB>>t', - "columnDefs": [ - { "targets": [ 0 ], "sortable": false, "searchable": false }, - { "className": 'dtr-control', "orderable": false, "targets": -1 } + let history_tables = $(".historyt").kohaTable({ + order: [[1, "desc"]], + dom: '<"top"<"table_entries"><"table_controls"fB>>t', + columnDefs: [ + { targets: [0], sortable: false, searchable: false }, + { className: "dtr-control", orderable: false, targets: -1 }, ], - "language": { - "search": "_INPUT_", - "searchPlaceholder": _("Search") + language: { + search: "_INPUT_", + searchPlaceholder: _("Search"), }, - "responsive": { - "details": { "type": 'column',"target": -1 } + responsive: { + details: { type: "column", target: -1 }, }, }); - $('a[data-bs-toggle="tab"]').on('shown.bs.tab', function (e) { - table.DataTable().responsive.recalc(); + $('a[data-bs-toggle="tab"]').on("shown.bs.tab", function (e) { + history_tables.DataTable().responsive.recalc(); }); $(".CheckNone").click(function(e){ -- 2.34.1