From a1e5dbda4e984c0ee370b88fdb7ec8c3f31533fe Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 19 Jun 2024 13:39:06 +0100 Subject: [PATCH] Bug 37047: (QA follow-up) Remove nesting of document ready function Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/js/tables/bookings.js | 178 +++++++++--------- 1 file changed, 88 insertions(+), 90 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js b/koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js index 78ed4cb0a67..585c1af94c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js +++ b/koha-tmpl/intranet-tmpl/prog/js/tables/bookings.js @@ -1,102 +1,100 @@ /* keep tidy */ // Bookings +var bookings_table; $(document).ready(function () { - var bookings_table; - $(document).ready(function () { - // Load bookings table on tab selection - $("#bookings-tab").on("click", function () { - if (!bookings_table) { - var today = new Date(); - var bookings_table_url = "/api/v1/bookings"; - bookings_table = $("#bookings_table").kohaTable( - { - ajax: { - url: bookings_table_url, + // Load bookings table on tab selection + $("#bookings-tab").on("click", function () { + if (!bookings_table) { + var today = new Date(); + var bookings_table_url = "/api/v1/bookings"; + bookings_table = $("#bookings_table").kohaTable( + { + ajax: { + url: bookings_table_url, + }, + embed: ["biblio", "item", "patron"], + columns: [ + { + data: "booking_id", + title: _("Booking ID"), }, - embed: ["biblio", "item", "patron"], - columns: [ - { - data: "booking_id", - title: _("Booking ID"), - }, - { - data: "biblio.title", - title: _("Title"), - searchable: true, - orderable: true, - render: function (data, type, row, meta) { - return $biblio_to_html(row.biblio, { - link: "bookings", - }); - }, + { + data: "biblio.title", + title: _("Title"), + searchable: true, + orderable: true, + render: function (data, type, row, meta) { + return $biblio_to_html(row.biblio, { + link: "bookings", + }); }, - { - data: "item.external_id", - title: _("Item"), - searchable: true, - orderable: true, - defaultContent: _("Any item"), - render: function (data, type, row, meta) { - if (row.item) { - return ( - row.item.external_id + - " (" + - row.booking_id + - ")" - ); - } else { - return null; - } - }, + }, + { + data: "item.external_id", + title: _("Item"), + searchable: true, + orderable: true, + defaultContent: _("Any item"), + render: function (data, type, row, meta) { + if (row.item) { + return ( + row.item.external_id + + " (" + + row.booking_id + + ")" + ); + } else { + return null; + } }, - { - data: "start_date", - title: _("Start date"), - searchable: true, - orderable: true, - render: function (data, type, row, meta) { - return $date(row.start_date); - }, + }, + { + data: "start_date", + title: _("Start date"), + searchable: true, + orderable: true, + render: function (data, type, row, meta) { + return $date(row.start_date); }, - { - data: "end_date", - title: _("End date"), - searchable: true, - orderable: true, - render: function (data, type, row, meta) { - return $date(row.end_date); - }, + }, + { + data: "end_date", + title: _("End date"), + searchable: true, + orderable: true, + render: function (data, type, row, meta) { + return $date(row.end_date); }, - { - data: "", - title: _("Actions"), - class: "actions", - searchable: false, - orderable: false, - render: function (data, type, row, meta) { - let result = ""; - if (CAN_user_circulate_manage_bookings) { - result += - '"; - } - return result; - }, + }, + { + data: "", + title: _("Actions"), + class: "actions", + searchable: false, + orderable: false, + render: function (data, type, row, meta) { + let result = ""; + if (CAN_user_circulate_manage_bookings) { + result += + '"; + } + return result; }, - ], - }, - table_settings_bookings_table, - 0, - { - patron_id: patron_borrowernumber, - end_date: { ">=": today.toISOString() }, - } - ); - } - }); + }, + ], + }, + table_settings_bookings_table, + 0, + { + patron_id: patron_borrowernumber, + end_date: { ">=": today.toISOString() }, + } + ); + } }); }); -- 2.45.2