ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

[WEI] Attribute bus to people that paid their registration 

Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
This commit is contained in:
Yohann D'ANELLO 2021-09-12 20:10:50 +02:00
parent bb9a0a2593
commit f6d042c998
Signed by: ynerant
GPG Key ID: 3A75C55819C8CF85
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/wei/tables.py
View File

@ -193,7 +193,7 @@ class WEIRegistration1ATable(tables.Table):
model = WEIMembership model = WEIMembership
template_name = 'django_tables2/bootstrap4.html' template_name = 'django_tables2/bootstrap4.html'
fields = ('user', 'user__last_name', 'user__first_name', 'gender', fields = ('user', 'user__last_name', 'user__first_name', 'gender',
'user__profile__department', 'preferred_bus', ) 'user__profile__department', 'preferred_bus', 'membership__bus', )
row_attrs = { row_attrs = {
'class': 'table-row', 'class': 'table-row',
'id': lambda record: "row-" + str(record.pk), 'id': lambda record: "row-" + str(record.pk),

3
apps/wei/views.py
View File

@ -1174,7 +1174,8 @@ class WEI1AListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableView):
def get_queryset(self, filter_permissions=True, **kwargs): def get_queryset(self, filter_permissions=True, **kwargs):
qs = super().get_queryset(filter_permissions, **kwargs) qs = super().get_queryset(filter_permissions, **kwargs)
qs = qs.filter(first_year=True) qs = qs.filter(first_year=True, membership__isnull=False)
qs = qs.order_by('membership__bus')
return qs return qs
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):