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

Get started on ticket popover. Still a couple TODO items

Browse Source
This commit is contained in:
Mike Koch 2016-05-29 02:03:53 -04:00
parent 0fdc62734c
commit e663b9605f
3 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
admin/calendar.php
View File

@ -495,6 +495,30 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div>
</div>
</div>
<div class="ticket-popover-template" style="display: none">
<div>
<div class="popover-tracking-id">
<strong><?php echo $hesklang['trackID']; ?></strong>
<span></span>
</div>
<div class="popover-owner">
<strong><?php echo $hesklang['owner']; ?></strong>
<span></span>
</div>
<div class="popover-subject">
<strong><?php echo $hesklang['subject']; ?></strong>
<span></span>
</div>
<div class="popover-category">
<strong><?php echo $hesklang['category']; ?></strong>
<span></span>
</div>
<div class="popover-priority">
<strong><?php echo $hesklang['priority']; ?></strong>
<span></span>
</div>
</div>
</div>
<div style="display: none">
<p id="lang_error_loading_events"><?php echo $hesklang['error_loading_events']; ?></p>
<p id="lang_error_deleting_event"><?php echo $hesklang['error_deleting_event']; ?></p>

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

@ -1,6 +1,8 @@
<?php
function get_events($start, $end, $hesk_settings, $staff = true) {
global $hesk_settings;
$sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color` ";
if ($staff) {
@ -65,8 +67,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories`
ON `categories`.`id` = `tickets`.`category`
AND `categories`.`usage` <> 2
WHERE `due_date` >= FROM_UNIXTIME(" . intval($start) . " / 1000)
AND `due_date` <= FROM_UNIXTIME(" . intval($end) . " / 1000)
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) ";
mfh_log_debug('Calendar', $sql, '');

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

@ -44,29 +44,36 @@ $(document).ready(function() {
eventDrop: respondToDragAndDrop,
eventResize: respondToDragAndDrop,
eventMouseover: function(event) {
if (event.type === 'TICKET') {
// Don't build a popover for tickets
return;
}
var contents = $('.popover-template').html();
var $contents = $(contents);
var format = 'dddd, MMMM Do YYYY';
var endDate = event.end == null ? event.start : event.end;
if (!event.allDay) {
if (!event.allDay && event.type !== 'TICKET') {
format += ', HH:mm';
}
if (event.location === '') {
$contents.find('.popover-location').hide();
if (event.type === 'TICKET') {
contents = $('.ticket-popover-template').html();
$contents = $(contents);
$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-category span').text(event.categoryName).end()
.find('.popover-priority span').text('// TODO');
} else {
if (event.location === '') {
$contents.find('.popover-location').hide();
}
$contents.find('.popover-category span').text(event.categoryName).end()
.find('.popover-location span').text(event.location).end()
.find('.popover-from span').text(event.start.format(format)).end()
.find('.popover-to span').text(endDate.format(format));
}
$contents.find('.popover-category span').text(event.categoryName).end()
.find('.popover-location span').text(event.location).end()
.find('.popover-from span').text(event.start.format(format)).end()
.find('.popover-to span').text(endDate.format(format));
var $eventMarkup = $(this);
$eventMarkup.popover({
title: event.title,
@ -78,11 +85,6 @@ $(document).ready(function() {
}).popover('show');
},
eventMouseout: function(event) {
if (event.type === 'TICKET') {
// There's no popover to destroy
return;
}
$(this).popover('destroy');
},
dayRender: function(date, cell) {
@ -248,6 +250,7 @@ function buildEvent(id, dbObject) {
allDay: true,
type: dbObject.type,
categoryId: dbObject.categoryId,
categoryName: dbObject.categoryName,
className: 'category-' + dbObject.categoryId,
textColor: calculateTextColor(dbObject.categoryColor)
};