Netsyms/Mods-for-HESK-Netsyms
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added owner and priority... still need to update the other pages

Browse Source
This commit is contained in:
Mike Koch 2016-05-29 19:05:28 -04:00
parent e01b7457fa
commit 097bded91a
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal-api/dao/calendar_dao.php
View File

@ -1,7 +1,7 @@
<?php
function get_events($start, $end, $hesk_settings, $staff = true) {
global $hesk_settings;
global $hesk_settings, $hesklang;
$sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color` ";
@ -62,11 +62,13 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
$hesk_settings['timeformat'] = $old_time_setting;
$sql = "SELECT `trackid`, `subject`, `due_date`, `category`, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`,
CASE WHEN `due_date` < '{$current_date}' THEN 1 ELSE 0 END AS `overdue`
CASE WHEN `due_date` < '{$current_date}' THEN 1 ELSE 0 END AS `overdue`, `owner`.`name` AS `owner_name`, `tickets`.`priority` AS `priority`
FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "tickets` AS `tickets`
INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories`
ON `categories`.`id` = `tickets`.`category`
AND `categories`.`usage` <> 2
LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "users` AS `owner`
ON `tickets`.`owner` = `owner`.`id`
WHERE `due_date` >= FROM_UNIXTIME(" . hesk_dbEscape($start) . " / 1000)
AND `due_date` <= FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000)
AND `status` IN (SELECT `id` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "statuses` WHERE `IsClosed` = 0) ";
@ -81,12 +83,23 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
$event['type'] = 'TICKET';
$event['trackingId'] = $row['trackid'];
$event['subject'] = $row['subject'];
$event['title'] = '[' . $row['trackid'] . '] ' . $row['subject'];
$event['startTime'] = $row['due_date'];
$event['url'] = $hesk_settings['hesk_url'] . '/' . $hesk_settings['admin_dir'] . '/admin_ticket.php?track=' . $event['trackingId'];
$event['categoryId'] = $row['category'];
$event['categoryName'] = $row['category_name'];
$event['categoryColor'] = $row['overdue'] ? '#dd0000' : $row['category_color'];
$event['owner'] = $row['owner_name'];
$priorities = array(
0 => $hesklang['critical'],
1 => $hesklang['high'],
2 => $hesklang['medium'],
3 => $hesklang['low']
);
$event['priority'] = $priorities[$row['priority']];
$events[] = $event;
}
}

13
js/calendar/mods-for-hesk-calendar.js
View File

@ -58,11 +58,15 @@ $(document).ready(function() {
contents = $('.ticket-popover-template').html();
$contents = $(contents);
if (event.owner === null) {
$contents.find('.popover-owner').hide();
}
$contents.find('.popover-tracking-id span').text(event.trackingId).end()
.find('.popover-owner span').text('// TODO').end()
.find('.popover-subject span').text(event.title).end()
.find('.popover-owner span').text(event.owner).end()
.find('.popover-subject span').text(event.subject).end()
.find('.popover-category span').text(event.categoryName).end()
.find('.popover-priority span').text('// TODO');
.find('.popover-priority span').text(event.priority);
} else {
if (event.location === '') {
$contents.find('.popover-location').hide();
@ -243,6 +247,7 @@ function buildEvent(id, dbObject) {
if (dbObject.type == 'TICKET') {
return {
title: dbObject.title,
subject: dbObject.subject,
trackingId: dbObject.trackingId,
start: moment(dbObject.startTime),
url: dbObject.url,
@ -252,6 +257,8 @@ function buildEvent(id, dbObject) {
categoryId: dbObject.categoryId,
categoryName: dbObject.categoryName,
className: 'category-' + dbObject.categoryId,
owner: dbObject.owner,
priority: dbObject.priority,
textColor: calculateTextColor(dbObject.categoryColor)
};
}