From 409c9377bbebf33d9bb75f1b317d7af980b2dc88 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 18 Aug 2023 11:21:37 +0100 Subject: [PATCH] Bug 33737: Fix patron bookings table display issues --- .../prog/en/includes/patron-detail-tabs.inc | 2 +- .../prog/en/modules/members/moremember.tt | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc index 430d7ef9ac2..0e6a0d402ea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc @@ -221,7 +221,7 @@ [% WRAPPER tab_panel tabname="bookings" %] [% IF ( bookings_count ) %] -
+
[% ELSE %]

Patron has nothing booked.

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index 664ed654f01..8aa84d7af6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -758,7 +758,7 @@ if ( !bookings_table ) { var today = new Date(); var bookings_table_url = "/api/v1/bookings"; - bookings_table = $('#bookings-table').kohaTable({ + bookings_table = $('#bookings_table').kohaTable({ "ajax": { "url": bookings_table_url }, @@ -770,9 +770,7 @@ "columns": [{ "data": "booking_id", "title": "Booking ID", - "visible": false, - "searchable": false, - "orderable": false + "visible": false }, { "data": "biblio.title", @@ -803,7 +801,7 @@ "searchable": true, "orderable": true, "render": function(data, type, row, meta) { - return $datetime(row.start_date); + return $date(row.start_date); } }, { @@ -812,7 +810,7 @@ "searchable": true, "orderable": true, "render": function(data, type, row, meta) { - return $datetime(row.end_date); + return $date(row.end_date); } }, { @@ -825,7 +823,7 @@ return result; } }] - }, [], 1, { patron_id: "[% patron.borrowernumber | html %]", end_date: { ">=": today.toISOString() } }); + }, [], 0, { patron_id: "[% patron.borrowernumber | html %]", end_date: { ">=": today.toISOString() } }); }; }); // Bookings -- 2.43.2