|
|
@ -6,7 +6,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
|
|
|
|
$start_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($start) . " / 1000), @@session.time_zone, '+00:00')";
|
|
|
|
$start_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($start) . " / 1000), @@session.time_zone, '+00:00')";
|
|
|
|
$end_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000), @@session.time_zone, '+00:00')";
|
|
|
|
$end_time_sql = "CONVERT_TZ(FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000), @@session.time_zone, '+00:00')";
|
|
|
|
|
|
|
|
|
|
|
|
$sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `category_color` ";
|
|
|
|
$sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `background_color`,
|
|
|
|
|
|
|
|
`categories`.`foreground_color` AS `foreground_color`, `categories`.`display_border_outline` AS `display_border` ";
|
|
|
|
|
|
|
|
|
|
|
|
if ($staff) {
|
|
|
|
if ($staff) {
|
|
|
|
$sql .= ",`reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` ";
|
|
|
|
$sql .= ",`reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit` ";
|
|
|
@ -47,7 +48,9 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
|
|
|
|
$event['comments'] = $row['comments'];
|
|
|
|
$event['comments'] = $row['comments'];
|
|
|
|
$event['categoryId'] = $row['category'];
|
|
|
|
$event['categoryId'] = $row['category'];
|
|
|
|
$event['categoryName'] = $row['category_name'];
|
|
|
|
$event['categoryName'] = $row['category_name'];
|
|
|
|
$event['categoryColor'] = $row['category_color'];
|
|
|
|
$event['backgroundColor'] = $row['background_color'];
|
|
|
|
|
|
|
|
$event['foregroundColor'] = $row['foreground_color'];
|
|
|
|
|
|
|
|
$event['displayBorder'] = $row['display_border'];
|
|
|
|
|
|
|
|
|
|
|
|
if ($staff) {
|
|
|
|
if ($staff) {
|
|
|
|
$event['reminderValue'] = $row['reminder_value'];
|
|
|
|
$event['reminderValue'] = $row['reminder_value'];
|
|
|
@ -63,7 +66,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
|
|
|
|
$current_date = hesk_date();
|
|
|
|
$current_date = hesk_date();
|
|
|
|
$hesk_settings['timeformat'] = $old_time_setting;
|
|
|
|
$hesk_settings['timeformat'] = $old_time_setting;
|
|
|
|
|
|
|
|
|
|
|
|
$sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `category_color`,
|
|
|
|
$sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`background_color` AS `background_color`,
|
|
|
|
|
|
|
|
`categories`.`foreground_color` AS `foreground_color`, `categories`.`display_border_outline` AS `display_border`,
|
|
|
|
CASE WHEN `due_date` < '{$current_date}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`,
|
|
|
|
CASE WHEN `due_date` < '{$current_date}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`owner` AS `owner_id`,
|
|
|
|
`tickets`.`priority` AS `priority`
|
|
|
|
`tickets`.`priority` AS `priority`
|
|
|
|
FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `tickets`
|
|
|
|
FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `tickets`
|
|
|
@ -94,7 +98,9 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
|
|
|
|
$event['url'] = $hesk_settings['hesk_url'] . '/' . $hesk_settings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId'];
|
|
|
|
$event['url'] = $hesk_settings['hesk_url'] . '/' . $hesk_settings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId'];
|
|
|
|
$event['categoryId'] = $row['category'];
|
|
|
|
$event['categoryId'] = $row['category'];
|
|
|
|
$event['categoryName'] = $row['category_name'];
|
|
|
|
$event['categoryName'] = $row['category_name'];
|
|
|
|
$event['categoryColor'] = $row['category_color'];
|
|
|
|
$event['backgroundColor'] = $row['background_color'];
|
|
|
|
|
|
|
|
$event['foregroundColor'] = $row['foreground_color'];
|
|
|
|
|
|
|
|
$event['displayBorder'] = $row['display_border'];
|
|
|
|
$event['owner'] = $row['owner_name'];
|
|
|
|
$event['owner'] = $row['owner_name'];
|
|
|
|
|
|
|
|
|
|
|
|
$priorities = array(
|
|
|
|
$priorities = array(
|
|
|
|