From 1173b2383817bdd6d6c98dcde5e02e42f0dcc324 Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Tue, 26 Jan 2016 08:59:33 -0500
Subject: [PATCH] Show events on calendar, fix all day issue

---
 internal-api/admin/calendar/index.php |  2 +-
 internal-api/dao/calendar_dao.php     |  8 ++++----
 js/calendar/mods-for-hesk-calendar.js | 13 +++++--------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/internal-api/admin/calendar/index.php b/internal-api/admin/calendar/index.php
index f46a6c78..56b9f922 100644
--- a/internal-api/admin/calendar/index.php
+++ b/internal-api/admin/calendar/index.php
@@ -31,7 +31,7 @@ if ($request_method === 'GET') {
         $event['location'] = hesk_POST('location');
         $event['start'] = hesk_POST('startTime');
         $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['create_ticket_date'] = hesk_POST('createTicketDate');
         $event['assign_to'] = hesk_POST('assignTo');
diff --git a/internal-api/dao/calendar_dao.php b/internal-api/dao/calendar_dao.php
index 01f8d1a0..217afa23 100644
--- a/internal-api/dao/calendar_dao.php
+++ b/internal-api/dao/calendar_dao.php
@@ -10,10 +10,10 @@ function get_events($start, $end, $hesk_settings) {
     $events = [];
     while ($row = hesk_dbFetchAssoc($rs)) {
         $event['id'] = intval($row['id']);
-        $event['start'] = intval($row['start']);
-        $event['end'] = intval($row['end']);
-        $event['all_day'] = $row['all_day'] ? true : false;
-        $event['name'] = $row['name'];
+        $event['startTime'] = $row['start'];
+        $event['endTime'] = $row['end'];
+        $event['allDay'] = $row['all_day'] ? true : false;
+        $event['title'] = $row['name'];
         $event['location'] = $row['location'];
         $event['comments'] = $row['comments'];
         $event['create_ticket_date'] = $row['create_ticket_date'] != null ? intval($row['create_ticket_date']) : null;
diff --git a/js/calendar/mods-for-hesk-calendar.js b/js/calendar/mods-for-hesk-calendar.js
index f2ad0e9f..8fcf4b03 100644
--- a/js/calendar/mods-for-hesk-calendar.js
+++ b/js/calendar/mods-for-hesk-calendar.js
@@ -14,10 +14,9 @@ $(document).ready(function() {
                 dataType: 'json',
                 success: function(data) {
                     var events = [];
-                    console.log(data);
                     $(data).each(function() {
                         events.push(buildEvent(this.id, this));
-                    })
+                    });
                     callback(events);
 
                     //callback w/events here!
@@ -74,8 +73,6 @@ $(document).ready(function() {
             action: 'create'
         };
 
-        console.log(data);
-
         $.ajax({
             method: 'POST',
             url: getHelpdeskUrl() + '/internal-api/admin/calendar',
@@ -84,8 +81,8 @@ $(document).ready(function() {
                 addToCalendar(id, data);
                 $('#create-event-modal').modal('hide');
             },
-            failure: function(data) {
-                console.log(data);
+            error: function(data) {
+                console.error(data);
             }
         });
     });
@@ -102,8 +99,8 @@ function buildEvent(id, dbObject) {
         id: id,
         title: dbObject.title,
         allDay: dbObject.allDay,
-        start: dbObject.startTime,
-        end: dbObject.endTime,
+        start: moment(dbObject.startTime),
+        end: moment(dbObject.endTime),
         comments: dbObject.comments,
         createTicketDate: dbObject.createTicketDate,
         assignTo: dbObject.assignTo,