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

Display notice when event is overdue

Browse Source
This commit is contained in:
Mike Koch 2016-05-31 12:33:42 -04:00
parent aeb59d6722
commit 075fcf3125
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,7 +91,7 @@ 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['overdue'] ? '#dd0000' : $row['category_color']; $event['categoryColor'] = $row['category_color'];
$event['owner'] = $row['owner_name']; $event['owner'] = $row['owner_name'];
$priorities = array( $priorities = array(

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

@ -112,7 +112,7 @@ $(document).ready(function() {
// Hard-code the view name so the modal treats this as an "all-day" event. // Hard-code the view name so the modal treats this as an "all-day" event.
var viewName = 'month'; var viewName = 'month';
displayCreateModal(moment(), viewName); displayCreateModal(moment(), viewName);
}) });
$('#create-form input[name="all-day"]').change(function() { $('#create-form input[name="all-day"]').change(function() {
@ -271,7 +271,7 @@ function buildEvent(id, dbObject) {
owner: dbObject.owner, owner: dbObject.owner,
priority: dbObject.priority, priority: dbObject.priority,
textColor: calculateTextColor(dbObject.categoryColor), textColor: calculateTextColor(dbObject.categoryColor),
fontIconMarkup: '<i class="fa fa-ticket"></i>' fontIconMarkup: getIcon(dbObject)
}; };
} }
@ -290,10 +290,21 @@ function buildEvent(id, dbObject) {
color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor, color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor,
textColor: calculateTextColor(dbObject.categoryColor), textColor: calculateTextColor(dbObject.categoryColor),
reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue, reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue,
reminderUnits: dbObject.reminderUnits reminderUnits: dbObject.reminderUnits,
fontIconMarkup: '<i class="fa fa-calendar"></i>'
}; };
} }
function getIcon(dbObject) {
var endOfDay = moment(dbObject.startTime).endOf("day");
if (moment(endOfDay).isBefore(moment())) {
return '<i class="fa fa-exclamation-triangle"></i>';
}
return '<i class="fa fa-ticket"></i>';
}
function calculateTextColor(color) { function calculateTextColor(color) {
if (color === null || color === '') { if (color === null || color === '') {
return 'black'; return 'black';
@ -398,7 +409,7 @@ function displayEditModal(date) {
function updateCategoryVisibility() { function updateCategoryVisibility() {
$('input[name="category-toggle"]').each(function() { $('input[name="category-toggle"]').each(function() {
$this = $(this); var $this = $(this);
if ($this.is(':checked')) { if ($this.is(':checked')) {
$('.category-' + $this.val()).show(); $('.category-' + $this.val()).show();
@ -419,6 +430,10 @@ function respondToDragAndDrop(event, delta, revertFunc) {
dueDate: event.start.format('YYYY-MM-DD') dueDate: event.start.format('YYYY-MM-DD')
}, },
success: function() { success: function() {
event.fontIconMarkup = getIcon({
startTime: event.start
});
$('#calendar').fullCalendar('updateEvent', event);
$.jGrowl($('#lang_ticket_due_date_updated').text(), { theme: 'alert-success', closeTemplate: '' }); $.jGrowl($('#lang_ticket_due_date_updated').text(), { theme: 'alert-success', closeTemplate: '' });
}, },
error: function() { error: function() {