fix: Change var names everywhere per 37baa40

jcgoette · Jan 8, 2023 · 6f22b46 · 6f22b46
1 parent c046c7a
commit 6f22b46
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 20 deletions.
diff --git a/custom_components/babybuddy/sensor.py b/custom_components/babybuddy/sensor.py
@@ -89,16 +89,16 @@ def update_entities() -> None:
         "add_bmi",
         {
             vol.Required(ATTR_BMI): cv.positive_float,
-            vol.Optional(ATTR_DATE): cv.date,
+            vol.Optional("bmi_date"): cv.date,
             vol.Optional(ATTR_NOTES): cv.string,
         },
         "async_add_bmi",
     )
     platform.async_register_entity_service(
         "add_diaper_change",
         {
-            vol.Optional(ATTR_TIME): vol.Any(cv.datetime, cv.time),
-            vol.Optional(ATTR_TYPE): vol.In(DIAPER_TYPES),
+            vol.Optional("change_time"): vol.Any(cv.datetime, cv.time),
+            vol.Optional("diaper_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,
@@ -109,7 +109,7 @@ def update_entities() -> None:
         "add_head_circumference",
         {
             vol.Required(ATTR_HEAD_CIRCUMFERENCE_UNDERSCORE): cv.positive_float,
-            vol.Optional(ATTR_DATE): cv.date,
+            vol.Optional("head_circ_date"): cv.date,
             vol.Optional(ATTR_NOTES): cv.string,
         },
         "async_add_head_circumference",
@@ -118,7 +118,7 @@ def update_entities() -> None:
         "add_height",
         {
             vol.Required(ATTR_HEIGHT): cv.positive_float,
-            vol.Optional(ATTR_DATE): cv.date,
+            vol.Optional("height_date"): cv.date,
             vol.Optional(ATTR_NOTES): cv.string,
         },
         "async_add_height",
@@ -127,15 +127,15 @@ def update_entities() -> None:
         "add_note",
         {
             vol.Required(ATTR_NOTE): cv.string,
-            vol.Optional(ATTR_TIME): vol.Any(cv.datetime, cv.time),
+            vol.Optional("note_time"): vol.Any(cv.datetime, cv.time),
         },
         "async_add_note",
     )
     platform.async_register_entity_service(
         "add_pumping",
         {
             vol.Required(ATTR_AMOUNT): cv.positive_int,
-            vol.Optional(ATTR_TIME): vol.Any(cv.datetime, cv.time),
+            vol.Optional("pumping_time"): vol.Any(cv.datetime, cv.time),
             vol.Optional(ATTR_NOTES): cv.string,
         },
         "async_add_pumping",
@@ -144,7 +144,7 @@ def update_entities() -> None:
         "add_temperature",
         {
             vol.Required(ATTR_TEMPERATURE): cv.positive_float,
-            vol.Optional(ATTR_TIME): vol.Any(cv.datetime, cv.time),
+            vol.Optional("temperature_time"): vol.Any(cv.datetime, cv.time),
             vol.Optional(ATTR_NOTES): cv.string,
         },
         "async_add_temperature",
@@ -153,7 +153,7 @@ def update_entities() -> None:
         "add_weight",
         {
             vol.Required(ATTR_WEIGHT): cv.positive_float,
-            vol.Optional(ATTR_DATE): cv.date,
+            vol.Optional("weight_date"): cv.date,
             vol.Optional(ATTR_NOTES): cv.string,
         },
         "async_add_weight",

diff --git a/custom_components/babybuddy/services.yaml b/custom_components/babybuddy/services.yaml
@@ -18,7 +18,7 @@ add_bmi:
           max: 100.0
           step: 0.1
           mode: box
-    date:
+    bmi_date:
       name: BMI date
       description: BMI date in YYYY-MM-DD format
       example: "2022-06-20"
@@ -67,13 +67,13 @@ add_diaper_change:
       domain: sensor
       device_class: babybuddy_child
   fields:
-    time:
+    change_time:
       name: Change time
       description: Change time
       example: "15:00:00"
       selector:
         time:
-    type:
+    diaper_type:
       name: Diaper type
       description: Type of diaper change
       example: Wet
@@ -137,7 +137,7 @@ add_feeding:
       example: "15:10:00"
       selector:
         time:
-    type:
+    feed_type:
       name: Feeding type
       description: Feeding type
       example: Breast milk
@@ -200,7 +200,7 @@ add_head_circumference:
           max: 100.0
           step: 0.1
           mode: box
-    date:
+    head_circ_date:
       name: Head circumference date
       description: Head circumference date in YYYY-MM-DD format
       example: "2022-06-20"
@@ -234,7 +234,7 @@ add_height:
           max: 100.0
           step: 0.1
           mode: box
-    date:
+    height_date:
       name: Height date
       description: Height date in YYYY-MM-DD format
       example: "2022-06-20"
@@ -265,7 +265,7 @@ add_note:
       selector:
         text:
           multiline: true
-    time:
+    note_time:
       name: Note time
       description: Note time
       example: "15:00:00"
@@ -290,7 +290,7 @@ add_pumping:
           min: 1
           max: 10
           mode: box
-    time:
+    pumping_time:
       name: Pumping time
       description: Pumping time
       example: "15:00:00"
@@ -358,7 +358,7 @@ add_temperature:
           max: 150.0
           step: 0.1
           mode: box
-    time:
+    temperature_time:
       name: Temperature time
       description: Temperature time
       example: "15:00:00"
@@ -426,7 +426,7 @@ add_weight:
           max: 100.0
           step: 0.1
           mode: box
-    date:
+    weight_date:
       name: Weight date
       description: Weight date in YYYY-MM-DD format
       example: "2022-06-20"

diff --git a/custom_components/babybuddy/switch.py b/custom_components/babybuddy/switch.py
@@ -85,7 +85,7 @@ def update_entities() -> None:
     platform.async_register_entity_service(
         "add_feeding",
         {
-            vol.Required(ATTR_TYPE): vol.In(FEEDING_TYPES),
+            vol.Required("feed_type"): vol.In(FEEDING_TYPES),
             vol.Required(ATTR_METHOD): vol.In(FEEDING_METHODS),
             **COMMON_FIELDS,
             vol.Optional(ATTR_AMOUNT): cv.positive_float,