diff --git a/admin/database_updates/2.7.4.php b/admin/database_updates/2.7.4.php new file mode 100644 index 000000000..e256538c7 --- /dev/null +++ b/admin/database_updates/2.7.4.php @@ -0,0 +1,26 @@ + + +
+
New Closure Day
+ +
+
+ + +
+
+ +
+ + +
+
+ +
+ +
+ + +
+
+ + SLA clocks do not run on this day at all, the same as a day outside your business days. Open tickets have their targets recalculated when you save. +
+ +
+ + +
+
+ + 0 AND ticket_closed_at IS NULL AND ticket_archived_at IS NULL"); - while ($ticket_row = mysqli_fetch_assoc($sql_tickets)) { - applyTicketSla($ticket_row['ticket_id'], $ticket_row['ticket_sla_id']); - $restamped++; - } + $restamped = restampOpenSlaTickets(); logAudit("Settings", "Edit", "$session_name edited SLA / business hours settings"); @@ -128,6 +123,105 @@ if (isset($_POST['edit_sla_settings'])) { } +if (isset($_POST['add_holiday'])) { + + validateCSRFToken(); + + // Deliberately NOT validateDate() - that falls back to today's date on bad + // input, which would silently close the office today. Reject instead. The + // round-trip comparison also catches impossible dates like 2026-02-30, + // which createFromFormat would otherwise roll forward into March. + $holiday_date_input = $_POST['holiday_date'] ?? ''; + $parsed_date = DateTime::createFromFormat('Y-m-d', $holiday_date_input); + + if (!$parsed_date || $parsed_date->format('Y-m-d') !== $holiday_date_input) { + flashAlert("Enter a valid date for the closure day.", 'error'); + redirect(); + } + + $holiday_name_input = trim($_POST['holiday_name'] ?? ''); + if ($holiday_name_input === '') { + flashAlert("Enter a name for the closure day.", 'error'); + redirect(); + } + + $holiday_date = escapeSql($holiday_date_input); + $holiday_name = escapeSql($holiday_name_input); + + // INSERT IGNORE rather than an error: the date is UNIQUE, and re-adding a day + // that is already listed is a no-op the operator does not need telling about + mysqli_query($mysqli, "INSERT IGNORE INTO business_holidays SET holiday_date = '$holiday_date', holiday_name = '$holiday_name'"); + + getBusinessHolidays(true); + $restamped = restampOpenSlaTickets(); + + logAudit("Settings", "Create", "$session_name added SLA closure day $holiday_date - $holiday_name"); + + flashAlert("Closure day added - targets recalculated on $restamped open ticket(s)"); + + redirect(); + +} + +if (isset($_POST['delete_holiday'])) { + + validateCSRFToken(); + + $holiday_id = intval($_POST['holiday_id']); + + $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT holiday_date, holiday_name FROM business_holidays WHERE holiday_id = $holiday_id LIMIT 1")); + if (!$row) { + flashAlert("Closure day not found.", 'error'); + redirect(); + } + $holiday_date = escapeSql($row['holiday_date']); + $holiday_name = escapeSql($row['holiday_name']); + + mysqli_query($mysqli, "DELETE FROM business_holidays WHERE holiday_id = $holiday_id"); + + getBusinessHolidays(true); + $restamped = restampOpenSlaTickets(); + + logAudit("Settings", "Delete", "$session_name removed SLA closure day $holiday_date - $holiday_name"); + + flashAlert("Closure day removed - targets recalculated on $restamped open ticket(s)"); + + redirect(); + +} + +if (isset($_POST['generate_holidays'])) { + + validateCSRFToken(); + + $holiday_year = intval($_POST['holiday_year']); + + if ($holiday_year < 2000 || $holiday_year > 2100) { + flashAlert("Enter a year between 2000 and 2100.", 'error'); + redirect(); + } + + // Existing rows win - INSERT IGNORE leaves a hand-entered name on a date the + // generator also produces, so running this over a partly-filled year is safe + $added = 0; + foreach (usFederalHolidays($holiday_year) as $holiday) { + $holiday_date = escapeSql($holiday['date']); + $holiday_name = escapeSql($holiday['name']); + mysqli_query($mysqli, "INSERT IGNORE INTO business_holidays SET holiday_date = '$holiday_date', holiday_name = '$holiday_name'"); + $added += mysqli_affected_rows($mysqli) > 0 ? 1 : 0; + } + + getBusinessHolidays(true); + $restamped = restampOpenSlaTickets(); + + logAudit("Settings", "Create", "$session_name generated $added US federal holiday closure day(s) for $holiday_year"); + + flashAlert("Added $added US federal holiday(s) for $holiday_year - targets recalculated on $restamped open ticket(s)"); + + redirect(); + +} + if (isset($_POST['save_sla_assignments'])) { validateCSRFToken(); diff --git a/admin/sla.php b/admin/sla.php index 35e7e1189..7cbac6283 100644 --- a/admin/sla.php +++ b/admin/sla.php @@ -22,6 +22,15 @@ while ($active_sla_row = mysqli_fetch_assoc($sql_active_slas)) { $active_slas[intval($active_sla_row['sla_id'])] = $active_sla_row['sla_name']; } +// Closure days, newest first - past ones are kept as a record of what was applied +$holidays = []; +$sql_holidays = mysqli_query($mysqli, "SELECT holiday_date, holiday_id, holiday_name FROM business_holidays ORDER BY holiday_date DESC"); +while ($holiday_row = mysqli_fetch_assoc($sql_holidays)) { + $holidays[] = $holiday_row; +} + +$holiday_year = intval(date('Y')); + // Global default assignments: [priority] = sla_id (per-client overrides live on the client edit modal) $assignments = []; $sql_assignments = mysqli_query($mysqli, "SELECT sla_assignment_priority, sla_assignment_sla_id FROM sla_assignments WHERE sla_assignment_client_id = 0"); @@ -196,4 +205,70 @@ while ($assignment_row = mysqli_fetch_assoc($sql_assignments)) { +
+
+

Holidays & Closure Days

+
+
+ +
+ + +
+
+ +
+
+ +
+ +

+ SLA clocks stop completely on these dates, the same as a day outside your business days. + Use them for public holidays or any other day the office is shut. Adding or removing one + recalculates the targets on every open ticket. +

+ + +

No closure days configured - SLA clocks run on every business day.

+ +
+ + + + + + + + + + + + "> + + + + + + + +
DateDayNameAction
+
+ + + +
+
+
+ + +
+
+ holiday name so the day-walk in addBusinessMinutes and +// businessMinutesBetween can do an O(1) lookup rather than a query per day - +// those loops run up to 731 iterations. +// +// Callers that have just written to business_holidays pass true, same contract +// as getSlaSettings(). +function getBusinessHolidays($refresh = false) +{ + global $mysqli; + + static $holidays = null; + + if ($refresh) { + $holidays = null; + } + + if (!is_null($holidays)) { + return $holidays; + } + + $holidays = []; + + $sql = mysqli_query($mysqli, "SELECT holiday_date, holiday_name FROM business_holidays"); + if ($sql) { + while ($row = mysqli_fetch_assoc($sql)) { + $holidays[$row['holiday_date']] = $row['holiday_name']; + } + } + + return $holidays; +} + +// US federal holidays for a calendar year, as a list of ['date' => 'Y-m-d', +// 'name' => string]. Six of the eleven float on an nth-weekday rule, which +// strtotime() understands directly, so no recurrence table is needed - the +// generator writes concrete dates and the lookup above stays an exact match. +// +// Fixed-date holidays are shifted to the OBSERVED day (Saturday -> the Friday +// before, Sunday -> the Monday after), because that is the weekday a business +// actually closes. The floating ones always land on a Monday or Thursday and +// need no shift. +function usFederalHolidays($year) +{ + $year = intval($year); + + $observed = function ($date) { + $day = intval(date('N', strtotime($date))); + if ($day == 6) { + return date('Y-m-d', strtotime($date . ' -1 day')); + } + if ($day == 7) { + return date('Y-m-d', strtotime($date . ' +1 day')); + } + return $date; + }; + + $fixed = [ + "$year-01-01" => "New Year's Day", + "$year-06-19" => 'Juneteenth', + "$year-07-04" => 'Independence Day', + "$year-11-11" => 'Veterans Day', + "$year-12-25" => 'Christmas Day', + ]; + + $floating = [ + "third monday of january $year" => 'Martin Luther King Jr. Day', + "third monday of february $year" => "Presidents' Day", + "last monday of may $year" => 'Memorial Day', + "first monday of september $year" => 'Labor Day', + "second monday of october $year" => 'Columbus Day', + "fourth thursday of november $year" => 'Thanksgiving Day', + ]; + + $holidays = []; + + foreach ($fixed as $date => $name) { + $holidays[] = ['date' => $observed($date), 'name' => $name]; + } + + foreach ($floating as $rule => $name) { + $holidays[] = ['date' => date('Y-m-d', strtotime($rule)), 'name' => $name]; + } + + usort($holidays, function ($a, $b) { + return strcmp($a['date'], $b['date']); + }); + + return $holidays; +} + +// Re-stamp every open SLA ticket. Business hours and closure days both feed the +// due-date math, so anything that changes the calendar has to run this or the +// change only applies to tickets raised afterwards - which is the opposite of +// what an operator adding next week's shutdown expects. Returns the count. +function restampOpenSlaTickets() +{ + global $mysqli; + + $restamped = 0; + + $sql = mysqli_query($mysqli, "SELECT ticket_id, ticket_sla_id FROM tickets WHERE ticket_sla_id > 0 AND ticket_closed_at IS NULL AND ticket_archived_at IS NULL"); + while ($row = mysqli_fetch_assoc($sql)) { + applyTicketSla($row['ticket_id'], $row['ticket_sla_id']); + $restamped++; + } + + return $restamped; +} + // Add $minutes of business time to a datetime, honouring the configured -// business days and hours. Returns a Y-m-d H:i:s string in the app timezone +// business days and hours, and skipping closure days entirely. Returns a +// Y-m-d H:i:s string in the app timezone // (includes/inc_set_timezone.php has already set it). With no usable business // calendar configured the clock is treated as 24x7. function addBusinessMinutes($start_datetime, $minutes) @@ -82,6 +193,8 @@ function addBusinessMinutes($start_datetime, $minutes) return $cursor->format('Y-m-d H:i:s'); } + $holidays = getBusinessHolidays(); + $remaining_seconds = $minutes * 60; // Walk forward a day at a time consuming available business time. Interval @@ -90,10 +203,13 @@ function addBusinessMinutes($start_datetime, $minutes) // the honest reading. Guard: two years of calendar. for ($i = 0; $i < 731; $i++) { - if (in_array(intval($cursor->format('N')), $business_days)) { + $date_key = $cursor->format('Y-m-d'); - $window_start = new DateTime($cursor->format('Y-m-d') . " $day_start"); - $window_end = new DateTime($cursor->format('Y-m-d') . " $day_end"); + // A closure day yields no business time, same as a non-business weekday + if (in_array(intval($cursor->format('N')), $business_days) && !isset($holidays[$date_key])) { + + $window_start = new DateTime($date_key . " $day_start"); + $window_end = new DateTime($date_key . " $day_end"); if ($cursor < $window_start) { $cursor = $window_start; @@ -123,7 +239,8 @@ function addBusinessMinutes($start_datetime, $minutes) // Business minutes elapsed between two datetimes - the inverse of // addBusinessMinutes, used to measure how much of a resolution budget an -// interval actually consumed. +// interval actually consumed. Skips closure days for the same reason: time +// nobody was working must not be charged to a ticket's budget. function businessMinutesBetween($start_datetime, $end_datetime) { $start = new DateTime($start_datetime); @@ -142,6 +259,8 @@ function businessMinutesBetween($start_datetime, $end_datetime) return intval(floor(($end->getTimestamp() - $start->getTimestamp()) / 60)); } + $holidays = getBusinessHolidays(); + $seconds = 0; $cursor = clone $start; @@ -152,10 +271,12 @@ function businessMinutesBetween($start_datetime, $end_datetime) break; } - if (in_array(intval($cursor->format('N')), $business_days)) { + $date_key = $cursor->format('Y-m-d'); - $window_start = new DateTime($cursor->format('Y-m-d') . " $day_start"); - $window_end = new DateTime($cursor->format('Y-m-d') . " $day_end"); + if (in_array(intval($cursor->format('N')), $business_days) && !isset($holidays[$date_key])) { + + $window_start = new DateTime($date_key . " $day_start"); + $window_end = new DateTime($date_key . " $day_end"); $from = $cursor > $window_start ? $cursor : $window_start; $to = $end < $window_end ? $end : $window_end;