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

Consolidate WEEKEND_DAYS and fix weekday pickup button labels

Browse source 
Import WEEKEND_DAYS from shared.schedule instead of redefining in
blocks.py and weekly-post/app.py. Gate pickup button day/night
labels on weekends only, matching all other display surfaces.
This commit is contained in:
Adam Moussa 2026-05-12 19:34:01 -04:00
parent c3b35ed62e
commit cbf36b30ff
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/shared/python/shared/blocks.py
View file

@ -3,9 +3,9 @@
from datetime import datetime, timedelta from datetime import datetime, timedelta
from zoneinfo import ZoneInfo from zoneinfo import ZoneInfo
EASTERN = ZoneInfo("America/New_York") from shared.schedule import WEEKEND_DAYS
WEEKEND_DAYS = {"Saturday", "Sunday"} EASTERN = ZoneInfo("America/New_York")
SHIFT_LABELS = { SHIFT_LABELS = {
@ -97,7 +97,8 @@ def build_week_schedule(schedule, start_date: datetime | None = None) -> list[di
elements = [] elements = []
for date_str, shift_type in open_shifts: for date_str, shift_type in open_shifts:
dt = datetime.strptime(date_str, "%Y-%m-%d") dt = datetime.strptime(date_str, "%Y-%m-%d")
label = "Day" if shift_type == "day" else "Night" day_name = dt.strftime("%A")
label = f" {SHIFT_LABELS[shift_type]}" if day_name in WEEKEND_DAYS else ""
action_suffix = "_day" if shift_type == "day" else "" action_suffix = "_day" if shift_type == "day" else ""
elements.append( elements.append(
{ {

5
src/weekly-post/app.py
View file

@ -11,7 +11,7 @@ import boto3
from slack_sdk import WebClient from slack_sdk import WebClient
from shared.blocks import build_pay_summary_blocks, build_week_schedule from shared.blocks import build_pay_summary_blocks, build_week_schedule
from shared.schedule import FALLBACK_EXTENSION, ShiftSchedule from shared.schedule import FALLBACK_EXTENSION, WEEKEND_DAYS, ShiftSchedule
from shared.secrets import get_secret from shared.secrets import get_secret
logger = logging.getLogger() logger = logging.getLogger()
@ -30,9 +30,6 @@ DAY_ORDER = [
] ]
WEEKEND_DAYS = {"Saturday", "Sunday"}
def _add_shift_to_pay(schedule, breakdown, totals, date, day_name, shift_type="night"): def _add_shift_to_pay(schedule, breakdown, totals, date, day_name, shift_type="night"):
"""Resolve a shift and add it to the pay breakdown if assigned.""" """Resolve a shift and add it to the pay breakdown if assigned."""
date_str = date.strftime("%Y-%m-%d") date_str = date.strftime("%Y-%m-%d")