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

Return reminder information and display on edit modal

Browse Source
This commit is contained in:
Mike Koch 2016-03-10 21:56:52 -05:00
parent fe42a83100
commit 5ada01e09d
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
admin/calendar.php
View File

@ -369,6 +369,29 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
</div> </div>
</div> </div>
</div> </div>
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label for="reminder" class="col-sm-3 control-label">
Reminder
<i class="fa fa-question-circle settingsquestionmark"
data-toggle="tooltip"
title="Receive an e-mail reminder for this event. Only you will receive this reminder email."></i>
</label>
<div class="col-sm-2">
<input type="text" name="reminder-value" class="form-control" placeholder="#">
</div>
<div class="col-sm-4">
<select name="reminder-unit" class="form-control">
<option value="0">minutes before event</option>
<option value="1">hours before event</option>
<option value="2">days before event</option>
<option value="3">weeks before event</option>
</select>
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">

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

@ -1,11 +1,16 @@
<?php <?php
function get_events($start, $end, $hesk_settings, $staff = true) { function get_events($start, $end, $hesk_settings, $staff = true) {
$sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color` $sql = "SELECT `events`.*, `categories`.`name` AS `category_name`, `categories`.`color` AS `category_color`,
`reminders`.`amount` AS `reminder_value`, `reminders`.`unit` AS `reminder_unit`
FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` AS `events` FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event` AS `events`
INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories` INNER JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "categories` AS `categories`
ON `events`.`category` = `categories`.`id` ON `events`.`category` = `categories`.`id` ";
WHERE `start` >= FROM_UNIXTIME(" . hesk_dbEscape($start) if ($staff) {
$sql .= "LEFT JOIN `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` AS `reminders` ON
`reminders`.`user_id` = " . intval($_SESSION['id']) . " AND `reminders`.`event_id` = `events`.`id`";
}
$sql .= "WHERE `start` >= FROM_UNIXTIME(" . hesk_dbEscape($start)
. " / 1000) AND `end` <= FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000) AND `categories`.`usage` <> 1"; . " / 1000) AND `end` <= FROM_UNIXTIME(" . hesk_dbEscape($end) . " / 1000) AND `categories`.`usage` <> 1";
if (!$staff) { if (!$staff) {
@ -27,6 +32,8 @@ function get_events($start, $end, $hesk_settings, $staff = true) {
$event['categoryId'] = $row['category']; $event['categoryId'] = $row['category'];
$event['categoryName'] = $row['category_name']; $event['categoryName'] = $row['category_name'];
$event['categoryColor'] = $row['category_color']; $event['categoryColor'] = $row['category_color'];
$event['reminderValue'] = $row['reminder_value'];
$event['reminderUnit'] = $row['reminder_unit'];
$events[] = $event; $events[] = $event;
} }

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

@ -407,7 +407,9 @@ function displayEditModal(date) {
.find('textarea[name="comments"]').val(date.comments).end() .find('textarea[name="comments"]').val(date.comments).end()
.find('input[name="start-date"]').val(date.start.format('YYYY-MM-DD')).end() .find('input[name="start-date"]').val(date.start.format('YYYY-MM-DD')).end()
.find('input[name="end-date"]').val(date.end.format('YYYY-MM-DD')).end() .find('input[name="end-date"]').val(date.end.format('YYYY-MM-DD')).end()
.find('input[name="id"]').val(date.id).end(); .find('input[name="id"]').val(date.id).end()
.find('input[name="reminder-value"]').val(date.reminderValue).end()
.find('select[name="reminder-units"]').val(date.reminderUnits).end();
var createTicketLink = getHelpdeskUrl() + '/' + getAdminDirectory() + '/new_ticket.php?subject='; var createTicketLink = getHelpdeskUrl() + '/' + getAdminDirectory() + '/new_ticket.php?subject=';
createTicketLink += encodeURI('[' + date.start.format('YYYY-MM-DD') + '] ' + date.title); createTicketLink += encodeURI('[' + date.start.format('YYYY-MM-DD') + '] ' + date.title);