diff --git a/backend b/backend index 87a229f..183bf60 160000 --- a/backend +++ b/backend @@ -1 +1 @@ -Subproject commit 87a229f791e2017898c1bba3b0e33a693a8d58fc +Subproject commit 183bf60fc089c76a9f1b9e9fde31d02b910d11a6 diff --git a/server/googleHandler.py b/server/googleHandler.py index 70c7cef..4794035 100644 --- a/server/googleHandler.py +++ b/server/googleHandler.py @@ -147,8 +147,8 @@ def fetchCalendarEvents(user, calendars, startDate, endDate): # handle weird colors from google color = event.get('colorId') if color == None: - newEvent.calendarHex = calendar.color - newEvent.evnetColorId = None + newEvent.colorHex = calendar.color + newEvent.eventColorId = None else: newEvent.eventColorId = color