stephan/bloombase
1
0
Fork 0
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions

fix: pruning_status uses 6-month window for overdue detection

Browse source
This commit is contained in:
Stephan Kerkman 2026-05-28 09:46:49 +02:00
parent 6b189842dc
commit 62a0d32619
1 changed files with 7 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
plants/utils/pruning.py
View file

@ -12,9 +12,9 @@ def pruning_status(plant, today=None):
""" """
Returns one of: 'overdue', 'due_this_month', 'upcoming', 'no_schedule'. Returns one of: 'overdue', 'due_this_month', 'upcoming', 'no_schedule'.
Checks the most recent past pruning month within 12 months. If it was A scheduled month is 'overdue' only if its most recent occurrence is within
not logged the plant is overdue. Uses a 12-month rolling window so the past 6 months and was not logged. Beyond 6 months, the next occurrence
December is correctly caught when checked in January. is sooner than the missed one, so it is 'upcoming'.
""" """
if today is None: if today is None:
today = date.today() today = date.today()
@ -26,36 +26,18 @@ def pruning_status(plant, today=None):
logs = plant.pruning_logs.all() logs = plant.pruning_logs.all()
logged = {(log.pruned_on.year, log.pruned_on.month) for log in logs} logged = {(log.pruned_on.year, log.pruned_on.month) for log in logs}
# Check if this month is scheduled
if today.month in months: if today.month in months:
if (today.year, today.month) not in logged: if (today.year, today.month) not in logged:
return 'due_this_month' return 'due_this_month'
else:
# This month is scheduled and already logged -> upcoming
return 'upcoming' return 'upcoming'
# Look for any scheduled month in the past 12 months (excluding this month, which we handled above).
# Stop at the first scheduled month we encounter going backwards.
for i in range(1, 13): for i in range(1, 13):
past = months_before(today, i) past = months_before(today, i)
if past.month in months: if past.month in months:
# Found a past scheduled month if i >= 6:
return 'upcoming'
if (past.year, past.month) not in logged: if (past.year, past.month) not in logged:
# Determine if this past month represents an actual overdue condition
if past.year == today.year:
# Same year, past month -> overdue
return 'overdue'
else:
# Previous year. It's overdue if:
# - past.month < today.month (e.g., Aug 2025 when today >= Aug)
# - OR wrap-around: today is early (1-3) and past.month >= some threshold
if past.month < today.month:
return 'overdue'
# Wrap-around when today is early and we're looking at previous year
# Consider any month in previous year as overdue if today is Jan-Mar
elif today.month <= 3:
return 'overdue' return 'overdue'
return 'upcoming' return 'upcoming'
# No past scheduled month found
return 'upcoming' return 'upcoming'