feat: Allow diaper change without type

jcgoette · Jun 5, 2022 · 740e929 · 740e929
1 parent 5d18d1d
commit 740e929
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/custom_components/babybuddy/sensor.py b/custom_components/babybuddy/sensor.py
@@ -98,7 +98,7 @@ def update_entities() -> None:
         "add_diaper_change",
         {
             vol.Optional(ATTR_TIME): vol.Any(cv.datetime, cv.time),
-            vol.Required(ATTR_TYPE, default=DEFAULT_DIAPER_TYPE): vol.In(DIAPER_TYPES),
+            vol.Optional(ATTR_TYPE): vol.In(DIAPER_TYPES),
             vol.Optional(ATTR_COLOR): vol.In(DIAPER_COLORS),
             vol.Optional(ATTR_AMOUNT): cv.positive_int,
             vol.Optional(ATTR_NOTES): cv.string,
@@ -228,7 +228,7 @@ async def async_add_bmi(
 
     async def async_add_diaper_change(
         self,
-        type: str,
+        type: str | None = None,
         time: datetime | time | None = None,
         color: str | None = None,
         amount: int | None = None,
@@ -240,8 +240,6 @@ async def async_add_diaper_change(
             return
         data = {
             ATTR_CHILD: self.child[ATTR_ID],
-            ATTR_WET: type == "Wet and Solid" or type.lower() == ATTR_WET,
-            ATTR_SOLID: type == "Wet and Solid" or type.lower() == ATTR_SOLID,
         }
         if time:
             try:
@@ -250,6 +248,9 @@ async def async_add_diaper_change(
             except ValidationError as err:
                 _LOGGER.error(err)
                 return
+        if type:
+            data[ATTR_WET] = type == "Wet and Solid" or type.lower() == ATTR_WET
+            data[ATTR_SOLID] = type == "Wet and Solid" or type.lower() == ATTR_SOLID
         if color:
             data[ATTR_COLOR] = color.lower()
         if amount:

diff --git a/custom_components/babybuddy/services.yaml b/custom_components/babybuddy/services.yaml
@@ -69,8 +69,6 @@ add_diaper_change:
     type:
       name: Diaper type
       description: Type of diaper change
-      required: true
-      default: wet
       selector:
         select:
           options: