Merge pull request #212 from bruxy70/development

Calendar workaround - partial rollback
bruxy70 · Nov 23, 2020 · 4224b05 · 4224b05
2 parents a760168 + 8a99abc
commit 4224b05
Showing 1 changed file with 20 additions and 14 deletions.
diff --git a/custom_components/garbage_collection/calendar.py b/custom_components/garbage_collection/calendar.py
@@ -114,13 +114,16 @@ async def async_get_events(self, hass, start_datetime, end_datetime):
                     event = {
                         "uid": entity,
                         "summary": garbage_collection.name,
-                        "start": {"date": start.strftime("%Y-%m-%d %H:%M")},
-                        "end": {
-                            "date": datetime.combine(
-                                start, garbage_collection.expire_after
-                            ).strftime("%Y-%m-%d %H:%M")
-                        },
-                        "allDay": False,
+                        "start": {"date": start.strftime("%Y-%m-%d")},
+                        "end": {"date": end.strftime("%Y-%m-%d")},
+                        "allDay": True,
+                        # "start": {"date": start.strftime("%Y-%m-%d %H:%M")},
+                        # "end": {
+                        #     "date": datetime.combine(
+                        #         start, garbage_collection.expire_after
+                        #     ).strftime("%Y-%m-%d %H:%M")
+                        # },
+                        # "allDay": False,
                     }
                 events.append(event)
                 start = await garbage_collection.async_find_next_date(
@@ -155,13 +158,16 @@ def update(self):
                     event = {
                         "uid": entity,
                         "summary": state_object.attributes.get("friendly_name"),
-                        "start": {"date": start.strftime("%Y-%m-%d %H:%M")},
-                        "end": {
-                            "date": datetime.combine(
-                                start, garbage_collection.expire_after
-                            ).strftime("%Y-%m-%d %H:%M")
-                        },
-                        "allDay": False,
+                        "start": {"date": start.strftime("%Y-%m-%d")},
+                        "end": {"date": end.strftime("%Y-%m-%d")},
+                        "allDay": True,
+                        # "start": {"date": start.strftime("%Y-%m-%d %H:%M")},
+                        # "end": {
+                        #     "date": datetime.combine(
+                        #         start, garbage_collection.expire_after
+                        #     ).strftime("%Y-%m-%d %H:%M")
+                        # },
+                        # "allDay": False,
                     }
                 events.append(event)
         events.sort(key=lambda x: x["start"]["date"])