Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ Changelog of TRS

- Date input fields now use the browser's much nicer regular date input widget.

- Big UI upgrade: moved from the old bootrap 2 to tailwindcss+daisyui.

- Project xls export is now date-based instead of week-based.


3.0 (2026-01-26)
----------------
Expand Down
25 changes: 15 additions & 10 deletions src/trs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2961,14 +2961,19 @@ def weeks(self):
)

@cached_property
def bookings_per_week_per_person(self):
bookings = (
Booking.objects.filter(booked_on=self.project, year_week__in=self.weeks)
.values("booked_by", "year_week")
.annotate(models.Sum("hours"))
)
def days(self):
result = []
for week in self.weeks:
result += week.days()
return result

@cached_property
def bookings_per_day_per_person(self):
bookings = Booking.objects.filter(
booked_on=self.project, year_week__in=self.weeks
).values("booked_by", "date", "hours")
return {
(booking["booked_by"], booking["year_week"]): (booking["hours__sum"])
(booking["booked_by"], booking["date"]): (booking["hours"])
for booking in bookings
}

Expand Down Expand Up @@ -2997,7 +3002,7 @@ def header_line(self):
"Verlies",
"",
]
result += [week.as_param() for week in self.weeks]
result += [day.isoformat() for day in self.days]
return result

@property
Expand All @@ -3020,8 +3025,8 @@ def excel_lines(self):
"",
]
result += [
self.bookings_per_week_per_person.get((person.pk, week.pk), 0)
for week in self.weeks
self.bookings_per_day_per_person.get((person.pk, day), 0)
for day in self.days
]

yield result
Expand Down
Loading