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

Show events on calendar, fix all day issue

Browse Source
This commit is contained in:
Mike Koch 2016-01-26 08:59:33 -05:00
parent 1984f73cf2
commit 1173b23838
3 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal-api/admin/calendar/index.php
View File

@ -31,7 +31,7 @@ if ($request_method === 'GET') {
$event['location'] = hesk_POST('location'); $event['location'] = hesk_POST('location');
$event['start'] = hesk_POST('startTime'); $event['start'] = hesk_POST('startTime');
$event['end'] = hesk_POST('endTime'); $event['end'] = hesk_POST('endTime');
$event['all_day'] = hesk_POST('allDay'); $event['all_day'] = hesk_POST('allDay') === "true" ? true : false;
$event['comments'] = hesk_POST('comments'); $event['comments'] = hesk_POST('comments');
$event['create_ticket_date'] = hesk_POST('createTicketDate'); $event['create_ticket_date'] = hesk_POST('createTicketDate');
$event['assign_to'] = hesk_POST('assignTo'); $event['assign_to'] = hesk_POST('assignTo');

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

@ -10,10 +10,10 @@ function get_events($start, $end, $hesk_settings) {
$events = []; $events = [];
while ($row = hesk_dbFetchAssoc($rs)) { while ($row = hesk_dbFetchAssoc($rs)) {
$event['id'] = intval($row['id']); $event['id'] = intval($row['id']);
$event['start'] = intval($row['start']); $event['startTime'] = $row['start'];
$event['end'] = intval($row['end']); $event['endTime'] = $row['end'];
$event['all_day'] = $row['all_day'] ? true : false; $event['allDay'] = $row['all_day'] ? true : false;
$event['name'] = $row['name']; $event['title'] = $row['name'];
$event['location'] = $row['location']; $event['location'] = $row['location'];
$event['comments'] = $row['comments']; $event['comments'] = $row['comments'];
$event['create_ticket_date'] = $row['create_ticket_date'] != null ? intval($row['create_ticket_date']) : null; $event['create_ticket_date'] = $row['create_ticket_date'] != null ? intval($row['create_ticket_date']) : null;

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

@ -14,10 +14,9 @@ $(document).ready(function() {
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
var events = []; var events = [];
console.log(data);
$(data).each(function() { $(data).each(function() {
events.push(buildEvent(this.id, this)); events.push(buildEvent(this.id, this));
}) });
callback(events); callback(events);
//callback w/events here! //callback w/events here!
@ -74,8 +73,6 @@ $(document).ready(function() {
action: 'create' action: 'create'
}; };
console.log(data);
$.ajax({ $.ajax({
method: 'POST', method: 'POST',
url: getHelpdeskUrl() + '/internal-api/admin/calendar', url: getHelpdeskUrl() + '/internal-api/admin/calendar',
@ -84,8 +81,8 @@ $(document).ready(function() {
addToCalendar(id, data); addToCalendar(id, data);
$('#create-event-modal').modal('hide'); $('#create-event-modal').modal('hide');
}, },
failure: function(data) { error: function(data) {
console.log(data); console.error(data);
} }
}); });
}); });
@ -102,8 +99,8 @@ function buildEvent(id, dbObject) {
id: id, id: id,
title: dbObject.title, title: dbObject.title,
allDay: dbObject.allDay, allDay: dbObject.allDay,
start: dbObject.startTime, start: moment(dbObject.startTime),
end: dbObject.endTime, end: moment(dbObject.endTime),
comments: dbObject.comments, comments: dbObject.comments,
createTicketDate: dbObject.createTicketDate, createTicketDate: dbObject.createTicketDate,
assignTo: dbObject.assignTo, assignTo: dbObject.assignTo,