diff --git a/admin/calendar.php b/admin/calendar.php index d0b01176..78131e53 100644 --- a/admin/calendar.php +++ b/admin/calendar.php @@ -101,6 +101,24 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php'); +
+
+

+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
diff --git a/js/calendar/mods-for-hesk-calendar-admin-readonly.js b/js/calendar/mods-for-hesk-calendar-admin-readonly.js index 3d1a65d9..c9cb3cff 100644 --- a/js/calendar/mods-for-hesk-calendar-admin-readonly.js +++ b/js/calendar/mods-for-hesk-calendar-admin-readonly.js @@ -110,7 +110,7 @@ function buildEvent(id, dbObject) { owner: dbObject.owner, priority: dbObject.priority, textColor: calculateTextColor(dbObject.categoryColor), - fontIconMarkup: '' + fontIconMarkup: getIcon(dbObject) }; } @@ -129,10 +129,21 @@ function buildEvent(id, dbObject) { color: dbObject.categoryColor === '' || dbObject.categoryColor === null ? '#fff' : dbObject.categoryColor, textColor: calculateTextColor(dbObject.categoryColor), reminderValue: dbObject.reminderValue == null ? '' : dbObject.reminderValue, - reminderUnits: dbObject.reminderUnits + reminderUnits: dbObject.reminderUnits, + fontIconMarkup: '' }; } +function getIcon(dbObject) { + var endOfDay = moment(dbObject.startTime).endOf("day"); + + if (moment(endOfDay).isBefore(moment())) { + return ''; + } + + return ''; +} + function calculateTextColor(color) { if (color === null || color === '') { return 'black'; diff --git a/language/en/text.php b/language/en/text.php index 6b8b4814..ff8aef38 100644 --- a/language/en/text.php +++ b/language/en/text.php @@ -107,6 +107,8 @@ $hesklang['events'] = 'Events'; $hesklang['add_files'] = ' Add File'; $hesklang['select_all_title_case'] = 'Select All'; $hesklang['deselect_all_title_case'] = 'Deselect All'; +$hesklang['event'] = 'Event'; +$hesklang['overdue_ticket'] = 'Overdue ticket'; // ADDED OR MODIFIED IN Mods for HESK 2.5.2 $hesklang['manage_statuses'] = 'Manage Statuses';