From c02d6d4cf0a33502a5072b7d3b5b7371ee191c27 Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 21 May 2024 13:33:53 -0400 Subject: [PATCH] Add Recurring Tickets NextDate to the Calendars --- calendar_events.php | 23 +++++++++++++++++++++++ client_events.php | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/calendar_events.php b/calendar_events.php index 68841c31..b9c0275c 100644 --- a/calendar_events.php +++ b/calendar_events.php @@ -180,6 +180,29 @@ while ($row = mysqli_fetch_array($sql)) { echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },"; } + // Recurring Tickets + $sql = mysqli_query($mysqli, "SELECT * FROM clients + LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id + LEFT JOIN users ON scheduled_ticket_assigned_to = user_id" + ); + while ($row = mysqli_fetch_array($sql)) { + $event_id = intval($row['scheduled_ticket_id']); + $client_id = intval($row['client_id']); + $username = $row['user_name']; + $frequency = $row['scheduled_ticket_frequency']; + if (empty($username)) { + $username = ""; + } else { + //Limit to characters and add ... + $username = "[". substr($row['user_name'], 0, 9) . "...]"; + } + + $event_title = json_encode("R Ticket ($frequency) - " . $row['scheduled_ticket_subject'] . " " . $username); + $event_start = json_encode($row['scheduled_ticket_next_run']); + + echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'client_recurring_tickets.php?client_id=$client_id' },"; + } + //Tickets Scheduled $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id diff --git a/client_events.php b/client_events.php index 590b202e..f4777ed7 100644 --- a/client_events.php +++ b/client_events.php @@ -180,6 +180,29 @@ while ($row = mysqli_fetch_array($sql)) { echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'ticket.php?ticket_id=$event_id' },"; } + // Recurring Tickets + $sql = mysqli_query($mysqli, "SELECT * FROM clients + LEFT JOIN scheduled_tickets ON client_id = scheduled_ticket_client_id + LEFT JOIN users ON scheduled_ticket_assigned_to = user_id" + ); + while ($row = mysqli_fetch_array($sql)) { + $event_id = intval($row['scheduled_ticket_id']); + $client_id = intval($row['client_id']); + $username = $row['user_name']; + $frequency = $row['scheduled_ticket_frequency']; + if (empty($username)) { + $username = ""; + } else { + //Limit to characters and add ... + $username = "[". substr($row['user_name'], 0, 9) . "...]"; + } + + $event_title = json_encode("R Ticket ($frequency) - " . $row['scheduled_ticket_subject'] . " " . $username); + $event_start = json_encode($row['scheduled_ticket_next_run']); + + echo "{ id: $event_id, title: $event_title, start: $event_start, color: '$event_color', url: 'client_recurring_tickets.php?client_id=$client_id' },"; + } + //Tickets Scheduled $sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id