The function day_summary() was calling check_no_overlap() for every hour of every day in the calendar.
This resulted in approximately 30 days × up to 24 hours ≈ 700+ calls per page load.
Each call to check_no_overlap() executed multiple database queries (booking_object, lab_equipment, labs, proximity checks, overlap checks, etc.), leading to an estimated 5,000–6,000 database queries per page render.

The function check_no_overlap() is intended for booking validation, not for display logic.

Resolution:
Replaced calls to check_no_overlap() in the calendar rendering with a lightweight in-memory overlap check - function has_overlap($entriesForDay, $start, $end).

Changes made:
Refactored/replaced showMonth() with showMonth_2() to minimise queries (old code still present for checking if needed)
Added has_overlap() to check booking clashes using the preloaded $entries array
Updated day_summary_2() to use has_overlap() instead of check_no_overlap()
Updated calling code to pass daily booking entries into day_summary_2()

Result:
Page load time reduced from approximately 75 seconds to 0.2 seconds, redundant database queries eliminated.
Month view now uses a single query with in-memory processing.

multi-day bookings that were > month, or crossed the month boundary were given an hours value for the entire booking instead of the time used in the month (or date range) requested for the BIF report. Code updated to limit the charge/hours to the max in the month.

BIF reports containing wrong data. The cleanFileName function was cutting the filename off at 35 characters, so longer lab names were being shortened and as Bath have similar, long-named labs, this was resulting in the same filename for multiple facilities and cached files resulting in the wrong data in BIF downloads.

Fix: updated cleanFileName to default to 120 chars - 39 limit was from legacy need to restrice filename length elsewhere.
Fix: updated charging.php as it was stripping the / from tempFiles/filename.csv resulting in files being stored outside of the tempFiles directory

extends FEC option previous asked for so now have 3 cost categories (for Bath/ Fin module users)

$costCategory=array("0"⇒"Internal", "1"⇒"FEC", "2"⇒"Charity");

updates to
- project_codes.php [done dev/live]
- make_bookable.php > charging tab [done on dev]
- project_codes/charging.php [done on dev]

needs testing before going to live [testing complete]

moved to live [done]

issue with multiday bookings allowing the user to book more than max booking time e.g. max booking 5 days, user can book 7 days.

* update: this is only admin/lab owners, so shouldn't be an issue for normal kit users *

API keys in location_search were wrong/out of date.

Updated with keys from 02/2024
[ulabequipment@gmail.com account]

faculty/department list incorrect.

change to:

[Faculty of Engineering & Design]
Architecture & Civil Engineering
Chemical Engineering
Electronic & Electrical Engineering
Mechanical Engineering

[Faculty of Humanities & Social Sciences]
Economics
Education
Health
Politics, Languages & International Studies
Psychology
Social & Policy Sciences

[Faculty of Science]
Chemistry
Computer Science
Life Sciences
Mathematical Sciences
Natural Sciences
Physics
Core research facilities

[School of Management]
Accounting, Finance & Law
Marketing, Business & Society
Information, Decisions & Operations
Strategy & Organisation

user reporting emails not being sent. User account has emails switched on. No users listed as recipients in report. requires further checking.

update: the inc_notifications code had a typo ($bins instead of $binds) stopping the lab_ID being passed correctly when calling incident function from site home page. Fix in place on DEV and live.

add webcal format calendar to allow users to subscribe to equipment to view bookings on their calendar app e.g. Outlook, Mail etc.

note, restricted to non-free accounts.

test