CMS/cmsmanage
2
0
Fork 0
Code Issues 8 Pull Requests 3 Actions Projects 1 Releases Activity

membershipworks: Use unique name for sum of count of EventExt.meeting_times

Browse Source
This commit is contained in:
Adam Goldsmith 2024-01-22 00:36:58 -05:00
parent df621988f6
commit 599b7f7785
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
membershipworks/models.py
View File

@ -433,7 +433,7 @@ class EventExtQuerySet(models.QuerySet["EventExt"]):
return method( return method(
count__sum=Sum("count", filter=F("occurred")), count__sum=Sum("count", filter=F("occurred")),
instructor__count=Count("instructor", distinct=True, filter=F("occurred")), instructor__count=Count("instructor", distinct=True, filter=F("occurred")),
meeting_times__count=Count("meeting_times__count", filter=F("occurred")), meeting_times__count__sum=Sum("meeting_times__count", filter=F("occurred")),
duration__sum=Sum("duration", filter=F("occurred")), duration__sum=Sum("duration", filter=F("occurred")),
person_hours__sum=Sum("person_hours", filter=F("occurred")), person_hours__sum=Sum("person_hours", filter=F("occurred")),
event_count=Count("eid", filter=F("occurred")), event_count=Count("eid", filter=F("occurred")),

2
membershipworks/templates/membershipworks/event_index_report.dj.html
View File

@ -31,7 +31,7 @@
<td>{{ year.canceled_event_count }}</td> <td>{{ year.canceled_event_count }}</td>
<td>{{ year.count__sum }}</td> <td>{{ year.count__sum }}</td>
<td>{{ year.instructor__count }}</td> <td>{{ year.instructor__count }}</td>
<td>{{ year.meeting_times__count }}</td> <td>{{ year.meeting_times__count__sum }}</td>
<td>{{ year.duration__sum|duration_as_hours }}</td> <td>{{ year.duration__sum|duration_as_hours }}</td>
<td>{{ year.person_hours__sum|duration_as_hours }}</td> <td>{{ year.person_hours__sum|duration_as_hours }}</td>
</tr> </tr>

2
membershipworks/templates/membershipworks/event_year_report.dj.html
View File

@ -32,7 +32,7 @@
<td>{{ month.canceled_event_count }}</td> <td>{{ month.canceled_event_count }}</td>
<td>{{ month.count__sum }}</td> <td>{{ month.count__sum }}</td>
<td>{{ month.instructor__count }}</td> <td>{{ month.instructor__count }}</td>
<td>{{ month.meeting_times__count }}</td> <td>{{ month.meeting_times__count__sum }}</td>
<td>{{ month.duration__sum|duration_as_hours }}</td> <td>{{ month.duration__sum|duration_as_hours }}</td>
<td>{{ month.person_hours__sum|duration_as_hours }}</td> <td>{{ month.person_hours__sum|duration_as_hours }}</td>
</tr> </tr>