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

Remove tracking ID from title, show icon instead

Browse Source
This commit is contained in:
Mike Koch 2016-05-30 22:05:52 -04:00
parent cc11a481f5
commit aeb59d6722
3 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@ 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['title'] = $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'];

16
js/calendar/mods-for-hesk-calendar-admin-readonly.js
View File

@ -65,8 +65,14 @@ $(document).ready(function() {
}
var $eventMarkup = $(this);
var eventTitle = event.title;
if (event.fontIconMarkup != undefined) {
eventTitle = event.fontIconMarkup + ' ' + eventTitle;
}
$eventMarkup.popover({
title: event.title,
title: eventTitle,
html: true,
content: $contents,
animation: true,
@ -76,6 +82,11 @@ $(document).ready(function() {
},
eventMouseout: function() {
$(this).popover('destroy');
},
eventRender: function(event, element) {
if (event.fontIconMarkup !== undefined) {
element.find('span.fc-title').html(event.fontIconMarkup + ' ' + element.find('span.fc-title').text());
}
}
});
@ -98,7 +109,8 @@ function buildEvent(id, dbObject) {
className: 'category-' + dbObject.categoryId,
owner: dbObject.owner,
priority: dbObject.priority,
textColor: calculateTextColor(dbObject.categoryColor)
textColor: calculateTextColor(dbObject.categoryColor),
fontIconMarkup: '<i class="fa fa-ticket"></i>'
};
}

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

@ -79,8 +79,14 @@ $(document).ready(function() {
}
var $eventMarkup = $(this);
var eventTitle = event.title;
if (event.fontIconMarkup != undefined) {
eventTitle = event.fontIconMarkup + '&nbsp;' + eventTitle;
}
$eventMarkup.popover({
title: event.title,
title: eventTitle,
html: true,
content: $contents,
animation: true,
@ -88,12 +94,17 @@ $(document).ready(function() {
placement: 'auto'
}).popover('show');
},
eventMouseout: function(event) {
eventMouseout: function() {
$(this).popover('destroy');
},
dayRender: function(date, cell) {
var $cell = $(cell);
$cell.attr('title', 'Click to add event');
},
eventRender: function(event, element) {
if (event.fontIconMarkup !== undefined) {
element.find('span.fc-title').html(event.fontIconMarkup + '&nbsp;' + element.find('span.fc-title').text());
}
}
});
@ -259,7 +270,8 @@ function buildEvent(id, dbObject) {
className: 'category-' + dbObject.categoryId,
owner: dbObject.owner,
priority: dbObject.priority,
textColor: calculateTextColor(dbObject.categoryColor)
textColor: calculateTextColor(dbObject.categoryColor),
fontIconMarkup: '<i class="fa fa-ticket"></i>'
};
}