Skip to content

feature/term-weekend #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mole1424 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feature/term-weekend #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46f7bfb
refactor weekend events to be weekend rather than saturday
Mole1424 Feb 22, 2026
1f41c30
FURB110
Mole1424 Feb 22, 2026
9d5551b
Merge branch 'main' into feature/term-weekend
Mole1424 Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions events/ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,7 @@ def get_calendar(events: list[Event]) -> Calendar:
ical_event.add("location", event.location)
ical_event.add("uid", f"{event.id}@uwcs-fulcrum")
ical_event.add("dtstart", event.start_time)
ical_event.add(
"dtend", event.end_time or event.start_time + timedelta(hours=1)
)
ical_event.add("dtend", event.end_time or event.start_time + timedelta(hours=1))

@Mole1424 Mole1424 Mar 31, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tbh idk why this exists in the diff, but it passes ruff so yay

ical_event.add("dtstamp", datetime.now(timezone("Europe/London")))
ical_event.add(
"url",
Expand Down
15 changes: 13 additions & 2 deletions exec/publicity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,8 +745,19 @@ def create_multi_week(
) / NUM_WEEKS
week_width = term_width

# merge weekends into one day
for week in events[0]["terms"][0]["weeks"]:
days = week["days"]
weekend_events = []
for day in days:
if day["day"] in ["Saturday", "Sunday"]:
weekend_events.extend(day["events"])
# remove saturday and sunday, add weekend
week["days"] = [day for day in days if day["day"] not in ["Saturday", "Sunday"]]
week["days"].append({"day": "Weekend", "events": weekend_events})

# add week days
day_names = ["MON", "TUE", "WED", "THU", "FRI", "SAT"]
day_names = ["MON", "TUE", "WED", "THU", "FRI", "WEEKEND"]
day_size = week_height * TERM_DAY_SIZE
day_names_base = term_left + WEEK_NUM_WIDTH * term_width + day_size / 2
for i, day in enumerate(day_names):
Expand All @@ -762,7 +773,7 @@ def create_multi_week(
)

# add week events
day_names = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
day_names = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Weekend"]
week_base = term_top + TERM_DAY_TEXT_HEIGHT + TERM_WEEK_PADDING * term_height
text_base = week_base + week_height / 2
for i, week in enumerate(events[0]["terms"][0]["weeks"]):
Expand Down
Loading