From c35e0159db4f0a09344773cb07b4c8498b3027fc Mon Sep 17 00:00:00 2001 From: Mike Koch Date: Tue, 29 Mar 2016 22:12:39 -0400 Subject: [PATCH] Fix updating reminders --- internal-api/admin/calendar/index.php | 4 ++++ internal-api/dao/calendar_dao.php | 10 ++++++++++ js/calendar/mods-for-hesk-calendar.js | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/internal-api/admin/calendar/index.php b/internal-api/admin/calendar/index.php index ba69f761..657da316 100644 --- a/internal-api/admin/calendar/index.php +++ b/internal-api/admin/calendar/index.php @@ -55,6 +55,10 @@ if ($request_method === 'GET') { $event['all_day'] = hesk_POST('allDay') === 'true'; $event['comments'] = hesk_POST('comments'); $event['category'] = hesk_POST('categoryId'); + $event['reminder_amount'] = hesk_POST('reminderValue'); + $event['reminder_amount'] = $event['reminder_amount'] == '' ? null : $event['reminder_amount']; + $event['reminder_units'] = hesk_POST('reminderUnits'); + $event['reminder_user'] = $_SESSION['id']; update_event($event, $hesk_settings); diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php index a878acb7..c931a075 100644 --- a/internal-api/dao/calendar_dao.php +++ b/internal-api/dao/calendar_dao.php @@ -113,6 +113,16 @@ function update_event($event, $hesk_settings) { . hesk_dbEscape($event['title']) . "', `location` = '" . hesk_dbEscape($event['location']) . "', `comments` = '" . hesk_dbEscape($event['comments']) . "', `category` = " . intval($event['category']) . " WHERE `id` = " . intval($event['id']); + if ($event['reminder_amount'] != null) { + $delete_sql = "DELETE FROM `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` WHERE `event_id` = " . intval($event['id']) + . " AND `user_id` = " . intval($event['reminder_user']); + hesk_dbQuery($delete_sql); + $insert_sql = "INSERT INTO `" . hesk_dbEscape($hesk_settings['db_pfix']) . "calendar_event_reminder` (`user_id`, `event_id`, + `amount`, `unit`) VALUES (" . intval($event['reminder_user']) . ", " . intval($event['id']) . ", " . intval($event['reminder_amount']) . ", + " . intval($event['reminder_units']) . ")"; + hesk_dbQuery($insert_sql); + } + hesk_dbQuery($sql); } diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js index c97a66ad..184aae22 100644 --- a/js/calendar/mods-for-hesk-calendar.js +++ b/js/calendar/mods-for-hesk-calendar.js @@ -257,7 +257,7 @@ $(document).ready(function() { categoryName: $form.find('select[name="category"] :selected').text().trim(), action: 'update', reminderValue: $form.find('input[name="reminder-value"]').val(), - reminderUnits: $form.find('select[name="reminder-units"]').val() + reminderUnits: $form.find('select[name="reminder-unit"]').val() }; $.ajax({