Merge pull request #26 from briis/version-2.0.4

Version 2.0.4

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog for Affaldshåndtering DK Home Assistant Integration
 
+  **Date**: `2024-03-xx`
+
+  ## What's Changed
+
+- Adding new Attribute `date_short`. Closing [#22](https://github.com/briis/affalddk/issues/22)
+- Fixing missing update of Calendard state. Closing [#27](https://github.com/briis/affalddk/issues/27)
+- Fixing missing Containers for Kerteminde. Closing [#19](https://github.com/briis/affalddk/issues/19)
+- Bump dependency `pyrenoweb` to 2.0.11
+
+---------------------------
+
+<details>
+  <summary><b>PREVIOUS CHANGES</b></summary>
+
   **Date**: `2024-03-10`
 
   This is a Hotfix release, only adding missing containers for some municipalities.
@@ -21,10 +35,6 @@ And create an issue with the data from the logfile, and the Municipality that ha
 - Fixing the Genbrug category for Egedal kommune
 - Bump dependency `pyrenoweb` to 2.0.10
 
----------------------------
-
-<details>
-  <summary><b>PREVIOUS CHANGES</b></summary>
 
   ## Version 2.0.2
 

custom_components/affalddk/calendar.py

@@ -77,12 +77,36 @@ def __init__(
     @property
     def event(self) -> CalendarEvent | None:
         """Return the next upcoming event."""
-        return self._event
+        item = None
+        _next_pickup = datetime.datetime(2030, 12, 31, 23, 59, 00)
+        _pickup_event: PickupType = None
+        _pickup_events: PickupType = None
+        if self._coordinator.data.pickup_events is None:
+            return None
+
+        # Find the next pickup event
+        for row in self._coordinator.data.pickup_events:
+            if row == 'next_pickup':
+                continue
+            _pickup_event: PickupType = self._coordinator.data.pickup_events.get(row)
+            if _pickup_event.date <= _next_pickup:
+                _next_pickup = _pickup_event.date
+                _pickup_events = _pickup_event
+                item = row
+
+        _start: dt = _pickup_events.date
+        _end: dt = _start + timedelta(days=1)
+        return CalendarEvent(
+            summary=NAME_LIST.get(item),
+            description=_pickup_events.description,
+            start=dt_util.as_local(_start),
+            end=dt_util.as_local(_end),
+        )
 
     async def async_get_events(self, hass: HomeAssistant, start_date: datetime.datetime, end_date: datetime.datetime) -> list[CalendarEvent]:
         """"Return calendar events within a datetime range."""
 
-        events = []
+        events: list[CalendarEvent] = []
         for item in self._coordinator.data.pickup_events:
             if self._coordinator.data.pickup_events.get(item) is None:
                 continue

custom_components/affalddk/const.py

@@ -1,6 +1,7 @@
 """Constants in renoweb component."""
 
 ATTR_DATE_LONG = "date_long"
+ATTR_DATE_SHORT = "date_short"
 ATTR_DURATION = "duration"
 ATTR_DESCRIPTION = "description"
 ATTR_LAST_UPDATE = "last_update"

custom_components/affalddk/manifest.json

@@ -12,7 +12,7 @@
     "iot_class": "cloud_polling",
     "issue_tracker": "https://github.com/briis/affalddk/issues",
     "requirements": [
-        "pyrenoweb==2.0.10"
+        "pyrenoweb==2.0.11"
     ],
-    "version": "2.0.3"
+    "version": "2.0.4"
 }

custom_components/affalddk/sensor.py

@@ -26,6 +26,7 @@
 from . import AffaldDKtDataUpdateCoordinator
 from .const import (
     ATTR_DATE_LONG,
+    ATTR_DATE_SHORT,
     ATTR_DESCRIPTION,
     ATTR_DURATION,
     ATTR_LAST_UPDATE,
@@ -270,6 +271,7 @@ def extra_state_attributes(self) -> None:
         return {
             ATTR_DATE: _date.date() if _date else None,
             ATTR_DATE_LONG: f"{_day_name_long} {_date.strftime("d. %d-%m-%Y") if _date else None}" ,
+            ATTR_DATE_SHORT: f"{_day_name} {_date.strftime("d. %d/%m") if _date else None}" ,
             ATTR_DESCRIPTION: self._pickup_events.description,
             ATTR_DURATION: _day_text,
             ATTR_ENTITY_PICTURE: f"/local/affalddk/{self._pickup_events.entity_picture}?{str(_current_date.timestamp())}",