feat: chores at set times of day (#1119)

Author: tempus2016

custom_components/taskmate/__init__.py

@@ -135,7 +135,7 @@
 )
 from .coordinator import TaskMateCoordinator
 from .frontend import async_register_cards, async_register_frontend
-from .models import REJECT_REASON_MAX, Badge, BadgeCriterion
+from .models import REJECT_REASON_MAX, Badge, BadgeCriterion, validate_chore_times
 from .panel import async_register_panel
 from .websocket import async_register_websocket_commands
 
@@ -589,6 +589,7 @@ async def handle_complete_chore(call: ServiceCall) -> None:
                 note=call.data.get("note", ""),
                 suggested_points=call.data.get("suggested_points", 0),
                 quantity=call.data.get("quantity", 0),
+                time_id=call.data.get("time_id", ""),
             )
         except ValueError as err:
             # Only genuinely bad input (unknown chore/child) raises now — expected
@@ -1189,7 +1190,13 @@ async def handle_add_chore(call: ServiceCall) -> None:
         deadline_at = ""
         if expires_in:
             deadline_at = (dt_util.now() + timedelta(minutes=expires_in)).isoformat()
-        await coordinator.async_add_chore(
+        # Set times are checked before the chore exists, so a bad set refuses
+        # the whole call rather than leaving an ordinary chore behind.
+        try:
+            times = validate_chore_times(call.data.get("times"), team_size=call.data.get("team_size", 0))
+        except ValueError as err:
+            raise ServiceValidationError(str(err)) from err
+        chore = await coordinator.async_add_chore(
             name=call.data[ATTR_CHORE_NAME],
             description=call.data.get(ATTR_CHORE_DESCRIPTION, ""),
             points=call.data.get(ATTR_CHORE_POINTS, 10),
@@ -1204,6 +1211,10 @@ async def handle_add_chore(call: ServiceCall) -> None:
             team_points_mode=call.data.get("team_points_mode", "each"),
             team_bonus=call.data.get("team_bonus", 0),
         )
+        if times:
+            chore.times = times
+            chore.times_bonus = call.data.get("times_bonus", 0)
+            await coordinator.async_update_chore(chore)
 
     async def handle_add_badge(call: ServiceCall) -> None:
         """Handle the add_badge service call (custom only)."""
@@ -1336,6 +1347,8 @@ async def handle_rebuild_badges(call: ServiceCall) -> None:
                 ),
                 # Quantity chores: how many units the child did.
                 vol.Optional("quantity"): vol.All(vol.Coerce(int), vol.Range(min=0, max=10000)),
+                # Which set time this ticks off; blank = the one open now.
+                vol.Optional("time_id"): cv.string,
             }
         ),
     )
@@ -1871,6 +1884,10 @@ async def handle_rebuild_badges(call: ServiceCall) -> None:
                 vol.Optional("team_size", default=0): vol.All(vol.Coerce(int), vol.Range(min=0, max=TEAM_SIZE_MAX)),
                 vol.Optional("team_points_mode", default="each"): vol.In(TEAM_POINTS_MODES),
                 vol.Optional("team_bonus", default=0): cv.positive_int,
+                # Set times (several times a day): a list of
+                # {name, start "HH:MM", end "HH:MM", points}.
+                vol.Optional("times"): vol.All(cv.ensure_list, [dict]),
+                vol.Optional("times_bonus", default=0): vol.All(vol.Coerce(int), vol.Range(min=0, max=1000)),
             }
         ),
     )

custom_components/taskmate/coord_chores.py

@@ -17,6 +17,7 @@
     NOTIF_TYPE_MANDATORY_PARENT_ALERT,
     NOTIF_TYPE_MANDATORY_REMINDER,
 )
+from .coord_set_times import set_time_label
 from .models import MandatoryMiss, parse_datetime
 
 # How often the escalation ladder is re-evaluated (FEAT-6).
@@ -100,6 +101,8 @@ async def async_recheck_mandatory_miss(self, chore_id: str, child_id: str, day:
         chore = self.get_chore(chore_id)
         if not chore or not getattr(chore, "mandatory", False):
             return 0
+        if isinstance(getattr(chore, "times", None), list) and chore.times:
+            return await self.async_detect_set_time_misses(day=day)
         period_id = self._effective_period_for(chore, child_id, day)
         if not self._period_has_ended(period_id, day):
             return 0
@@ -114,6 +117,9 @@ async def async_detect_mandatory_misses(self, period_id: str, day: date) -> int:
                 continue
             if not getattr(chore, "enabled", True):
                 continue
+            # Set times have a miss per time (async_detect_set_time_misses).
+            if isinstance(getattr(chore, "times", None), list) and chore.times:
+                continue
             if not self._is_chore_scheduled_for_date(chore, day):
                 continue
             for child_id in self._mandatory_owers(chore, day):
@@ -183,7 +189,7 @@ async def async_apply_mandatory_penalty(self, miss_id: str) -> None:
         if miss is None:
             return
         chore = next((c for c in self.storage.get_chores() if c.id == miss.chore_id), None)
-        name = getattr(chore, "name", "chore")
+        name = set_time_label(chore, getattr(miss, "time_id", "")) if chore else "chore"
         if miss.penalty_points > 0:
             await self.async_remove_points(
                 miss.child_id,
@@ -275,7 +281,10 @@ async def async_escalate_mandatory_misses(self, now: datetime | None = None) ->
         for miss in self.storage.get_mandatory_misses():
             if miss.due_date != today_iso:
                 continue  # only escalate same-day misses (skips midnight backfill)
-            if self._child_completed_today(miss.chore_id, miss.child_id, now.date()):
+            if getattr(miss, "time_id", ""):
+                if self.set_time_miss_done(miss, now.date()):
+                    continue
+            elif self._child_completed_today(miss.chore_id, miss.child_id, now.date()):
                 continue
             created = parse_datetime(miss.created_at)
             if created is None:
@@ -298,7 +307,7 @@ async def async_escalate_mandatory_misses(self, now: datetime | None = None) ->
             ctx = {
                 "child_id": miss.child_id,
                 "child_name": getattr(child, "name", ""),
-                "chore_name": getattr(chore, "name", "chore"),
+                "chore_name": set_time_label(chore, getattr(miss, "time_id", "")) if chore else "chore",
             }
             for stage in range(miss.escalation_stage + 1, target + 1):
                 if stage in (1, 2):
@@ -357,7 +366,13 @@ def arm_mandatory_schedules(self) -> None:
 
     @callback
     def _escalation_tick(self, now: datetime) -> None:
-        self.hass.async_create_task(self.async_escalate_mandatory_misses(now))
+        # Set times close all through the day, so their misses are checked
+        # on the same tick rather than at fixed period ends.
+        self.hass.async_create_task(self._async_set_time_then_escalate(now))
+
+    async def _async_set_time_then_escalate(self, now: datetime) -> None:
+        await self.async_detect_set_time_misses(now)
+        await self.async_escalate_mandatory_misses(now)
 
     def _make_mandatory_period_cb(self, period_id: str):
         @callback
@@ -389,13 +404,16 @@ async def async_catchup_mandatory_misses(self) -> None:
         for hour, minute, period_id in self._mandatory_period_end_times():
             if dt_time(hour, minute) <= cur:
                 await self.async_detect_mandatory_misses(period_id, today)
+        await self.async_detect_set_time_misses(now)
 
     async def async_detect_anytime_mandatory_misses(self) -> None:
         """Midnight: raise misses for incomplete mandatory 'anytime' chores for the
         day that just ended, then prune the postpone override map (new day starts clean)."""
         self._ensure_mandatory_state()
         yesterday = (dt_util.now() - timedelta(days=1)).date()
         await self.async_detect_mandatory_misses("anytime", yesterday)
+        # A set time that closed in the last minutes of yesterday.
+        await self.async_detect_set_time_misses(day=yesterday)
         self.mandatory_postpone = {}
 
     # ---- maintenance -------------------------------------------------------
@@ -421,7 +439,8 @@ def mandatory_misses_state(self) -> list[dict]:
         out = []
         for m in self.storage.get_mandatory_misses():
             d = m.to_dict()
-            d["chore_name"] = getattr(chores.get(m.chore_id), "name", "")
+            chore = chores.get(m.chore_id)
+            d["chore_name"] = set_time_label(chore, getattr(m, "time_id", "")) if chore else ""
             d["child_name"] = getattr(children.get(m.child_id), "name", "")
             out.append(d)
         return out