From 0f47ff15dde8f75ed3e5e1ffc6b23b8877d67020 Mon Sep 17 00:00:00 2001
From: Raphael Maenle <raphael@maenle.net>
Date: Sat, 30 May 2020 23:33:55 +0200
Subject: [PATCH] fixes bug where color hex values where not passed along
 (variable mixup)

---
 backend                 | 2 +-
 server/googleHandler.py | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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