adam/afterhours-shift-manager
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/afterhours-shift-manager.git synced 2026-10-06 22:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix weekly schedule starting from today instead of Monday (#18)

Browse source 
The handler passed `now` as start_date, so mid-week runs showed
14 days from today instead of Mon–Sun x2. Also, day names were
derived from a static index (DAY_ORDER[i%7]) which assumed
index 0 = Monday — when start_date wasn't Monday, Saturday and
Sunday were mislabeled as Monday and Tuesday.

Fix: pass this week's Monday from the handler, and derive day
names from the actual date via strftime instead of a static list.

Fixes #17
This commit is contained in:
Adam Moussa 2026-04-08 13:36:34 -04:00 • committed by GitHub
parent 14f9723a87
commit fe6b780e12
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/blocks.py
View file

@ -5,7 +5,6 @@ from zoneinfo import ZoneInfo
EASTERN = ZoneInfo("America/New_York") EASTERN = ZoneInfo("America/New_York")
DAY_ORDER = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
WEEKEND_DAYS = {"Saturday", "Sunday"} WEEKEND_DAYS = {"Saturday", "Sunday"}
@ -47,7 +46,7 @@ def build_week_schedule(schedule, start_date: datetime | None = None) -> list[di
lines.append("") # visual separator between weeks lines.append("") # visual separator between weeks
date = start_date + timedelta(days=i) date = start_date + timedelta(days=i)
date_str = date.strftime("%Y-%m-%d") date_str = date.strftime("%Y-%m-%d")
day_name = DAY_ORDER[i % 7] day_name = date.strftime("%A")
is_today = date_str == today_str is_today = date_str == today_str
# Weekend day shift (8am–5pm) # Weekend day shift (8am–5pm)

7
src/weekly_post.py
View file

@ -172,10 +172,11 @@ def handler(event, context):
# Email pay summary to payroll # Email pay summary to payroll
_send_pay_email(week_label, pay_record) _send_pay_email(week_label, pay_record)
# --- Two-week schedule --- # --- Two-week schedule (always starts on Monday of this week) ---
blocks = build_week_schedule(schedule, start_date=now) this_monday = now - timedelta(days=now.weekday())
blocks = build_week_schedule(schedule, start_date=this_monday)
end_date = now + timedelta(days=13) end_date = this_monday + timedelta(days=13)
slack.chat_postMessage( slack.chat_postMessage(
channel=channel_id, channel=channel_id,
blocks=blocks, blocks=blocks,