AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-03 20:34:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Calendar Events use the ticket_scheule field to determine if a ticket is scheduled or not instead of status as scheduled is not a core status

Browse Source
This commit is contained in:
johnnyq
2024-03-30 16:55:11 -04:00
parent afcb0cffdc
commit 0a52e3a33d
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
calendar_events.php
View File

@@ -147,10 +147,15 @@ while ($row = mysqli_fetch_array($sql)) {
} }
//Tickets Created //Tickets Created
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id"); $sql = mysqli_query($mysqli, "SELECT * FROM clients
LEFT JOIN tickets ON client_id = ticket_client_id
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
LEFT JOIN users ON ticket_assigned_to = user_id"
);
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
$event_id = intval($row['ticket_id']); $event_id = intval($row['ticket_id']);
$ticket_status = strval($row['ticket_status']); $ticket_status = intval($row['ticket_status']);
$ticket_status_name = strval($row['ticket_status_name']);
$username = $row['user_name']; $username = $row['user_name'];
if (empty($username)) { if (empty($username)) {
$username = ""; $username = "";
@@ -159,14 +164,14 @@ while ($row = mysqli_fetch_array($sql)) {
$username = "[". substr($row['user_name'], 0, 9) . "...]"; $username = "[". substr($row['user_name'], 0, 9) . "...]";
} }
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status . "}"); $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status_name . "}");
$event_start = json_encode($row['ticket_created_at']); $event_start = json_encode($row['ticket_created_at']);
if ($ticket_status == "New") { if ($ticket_status == 1) {
$event_color = "red"; $event_color = "red";
} elseif ($ticket_status == "Open") { } elseif ($ticket_status == 2) {
$event_color = "blue"; $event_color = "blue";
} elseif ($ticket_status == "On Hold") { } elseif ($ticket_status == 3) {
$event_color = "grey"; $event_color = "grey";
} else { } else {
$event_color = "black"; $event_color = "black";
@@ -176,7 +181,12 @@ while ($row = mysqli_fetch_array($sql)) {
} }
//Tickets Scheduled //Tickets Scheduled
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule IS NOT NULL"); $sql = mysqli_query($mysqli, "SELECT * FROM clients
LEFT JOIN tickets ON client_id = ticket_client_id
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
LEFT JOIN users ON ticket_assigned_to = user_id
WHERE ticket_schedule IS NOT NULL"
);
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
$event_id = intval($row['ticket_id']); $event_id = intval($row['ticket_id']);
$username = $row['user_name']; $username = $row['user_name'];
@@ -188,7 +198,7 @@ while ($row = mysqli_fetch_array($sql)) {
} }
if (strtotime($row['ticket_schedule']) < time()) { if (strtotime($row['ticket_schedule']) < time()) {
if ($row['ticket_status'] == 'On Hold') { if (!empty($row['ticket_schedule']) {
$event_color = "red"; $event_color = "red";
} else { } else {
$event_color = "green"; $event_color = "green";
@@ -197,7 +207,7 @@ while ($row = mysqli_fetch_array($sql)) {
$event_color = "grey"; $event_color = "grey";
} }
$ticket_status = strval($row['ticket_status']); $ticket_status = strval($row['ticket_status_name']);
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status . "}"); $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status . "}");
$event_start = json_encode($row['ticket_schedule']); $event_start = json_encode($row['ticket_schedule']);

30
client_events.php
View File

@@ -147,10 +147,15 @@ while ($row = mysqli_fetch_array($sql)) {
} }
//Tickets Created //Tickets Created
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE client_id = $client_id"); $sql = mysqli_query($mysqli, "SELECT * FROM clients
LEFT JOIN tickets ON client_id = ticket_client_id
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
LEFT JOIN users ON ticket_assigned_to = user_id
WHERE client_id = $client_id");
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
$event_id = intval($row['ticket_id']); $event_id = intval($row['ticket_id']);
$ticket_status = strval($row['ticket_status']); $ticket_status = intval($row['ticket_status']);
$ticket_status_name = strval($row['ticket_status_name']);
$username = $row['user_name']; $username = $row['user_name'];
if (empty($username)) { if (empty($username)) {
$username = ""; $username = "";
@@ -159,14 +164,14 @@ while ($row = mysqli_fetch_array($sql)) {
$username = "[". substr($row['user_name'], 0, 9) . "...]"; $username = "[". substr($row['user_name'], 0, 9) . "...]";
} }
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status . "}"); $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " created - " . $row['ticket_subject'] . " " . $username . "{" . $ticket_status_name . "}");
$event_start = json_encode($row['ticket_created_at']); $event_start = json_encode($row['ticket_created_at']);
if ($ticket_status == "New") { if ($ticket_status == 1) {
$event_color = "red"; $event_color = "red";
} elseif ($ticket_status == "Open") { } elseif ($ticket_status == 2) {
$event_color = "blue"; $event_color = "blue";
} elseif ($ticket_status == "On Hold") { } elseif ($ticket_status == 3) {
$event_color = "grey"; $event_color = "grey";
} else { } else {
$event_color = "black"; $event_color = "black";
@@ -176,7 +181,12 @@ while ($row = mysqli_fetch_array($sql)) {
} }
//Tickets Scheduled //Tickets Scheduled
$sql = mysqli_query($mysqli, "SELECT * FROM clients LEFT JOIN tickets ON client_id = ticket_client_id LEFT JOIN users ON ticket_assigned_to = user_id WHERE ticket_schedule IS NOT NULL AND client_id = $client_id"); $sql = mysqli_query($mysqli, "SELECT * FROM clients
LEFT JOIN tickets ON client_id = ticket_client_id
LEFT JOIN ticket_statuses ON ticket_status = ticket_status_id
LEFT JOIN users ON ticket_assigned_to = user_id
WHERE ticket_schedule IS NOT NULL AND client_id = $client_id"
);
while ($row = mysqli_fetch_array($sql)) { while ($row = mysqli_fetch_array($sql)) {
$event_id = intval($row['ticket_id']); $event_id = intval($row['ticket_id']);
$username = $row['user_name']; $username = $row['user_name'];
@@ -188,7 +198,7 @@ while ($row = mysqli_fetch_array($sql)) {
} }
if (strtotime($row['ticket_schedule']) < time()) { if (strtotime($row['ticket_schedule']) < time()) {
if ($row['ticket_status'] == 'Scheduled') { if (!empty($row['ticket_schedule']) {
$event_color = "red"; $event_color = "red";
} else { } else {
$event_color = "green"; $event_color = "green";
@@ -197,8 +207,8 @@ while ($row = mysqli_fetch_array($sql)) {
$event_color = "grey"; $event_color = "grey";
} }
$ticket_status = strval($row['ticket_status']); $ticket_status_name = strval($row['ticket_status_name']);
$event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status . "}"); $event_title = json_encode($row['ticket_prefix'] . $row['ticket_number'] . " scheduled - " . $row['ticket_subject'] . " [" . $username . "]{" . $ticket_status_name . "}");
$event_start = json_encode($row['ticket_schedule']); $event_start = json_encode($row['ticket_schedule']);