Fuji/Fuji
1
0
Fork 1
Code Issues 5 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fix exams/homeworks on start/end of the week not being found

Browse source
This commit is contained in:
Marceli Franczyk 2025-05-30 18:35:03 +02:00
parent 1b218a3c23
commit b72ba90f78
1 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/sqlitehandlernr.py
View file

@ -230,15 +230,23 @@ def fetch_all_notes():
return notes return notes
def fetch_exams_for_week(specific_day: date): def fetch_exams_for_week(specific_day: date):
start_of_week = specific_day - timedelta(days=specific_day.weekday()) # Monday # Get start of week (Monday)
start_of_week = specific_day - timedelta(days=specific_day.weekday())
# Get end of week (Sunday)
end_of_week = start_of_week + timedelta(days=6) end_of_week = start_of_week + timedelta(days=6)
print(f"Fetching exams between {start_of_week} and {end_of_week}") # Debug print
with Session(engine) as session: with Session(engine) as session:
exams = session.query(Exam).filter( exams = session.query(Exam).filter(
Exam.deadline >= start_of_week, Exam.deadline >= start_of_week.date() if isinstance(start_of_week, datetime) else start_of_week,
Exam.deadline < end_of_week Exam.deadline <= end_of_week.date() if isinstance(end_of_week, datetime) else end_of_week
).all() ).all()
# Debug print results
for exam in exams:
print(f"Found exam: {exam.subject} on {exam.deadline}")
return exams return exams
def fetch_homework_for_week(specific_day: date): def fetch_homework_for_week(specific_day: date):
@ -246,12 +254,15 @@ def fetch_homework_for_week(specific_day: date):
end_of_week = start_of_week + timedelta(days=6) end_of_week = start_of_week + timedelta(days=6)
with Session(engine) as session: with Session(engine) as session:
homework = session.query(Homework).filter( homeworks = session.query(Homework).filter(
Homework.deadline >= start_of_week, Homework.deadline >= start_of_week.date() if isinstance(start_of_week, datetime) else start_of_week,
Homework.deadline < end_of_week Homework.deadline <= end_of_week.date() if isinstance(end_of_week, datetime) else end_of_week
).all() ).all()
return homework for homework in homeworks:
print(f"Found homeworks: {homework.subject} on {homework.deadline}")
return homeworks
def fetch_timetable_for_day(day: datetime): def fetch_timetable_for_day(day: datetime):
with Session(engine) as session: with Session(engine) as session: