ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-11-20 21:38:28 +01:00
Code Issues Releases Wiki Activity

Merge branch 'main' into note_sheet

Browse Source
This commit is contained in:
Ehouarn
2025-11-20 17:50:11 +01:00
parent 0fad2a876d 0240ea5388
commit bac9ed2353
30 changed files with 1258 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/food/views.py
View File

@@ -81,11 +81,15 @@ class FoodListView(ProtectQuerysetMixin, LoginRequiredMixin, MultiTableMixin, Li
search_table = qs.filter(PermissionBackend.filter_queryset(self.request, Food, 'view'))
# table open
open_table = self.get_queryset().order_by('expiry_date').filter(
open_table = self.get_queryset().filter(
Q(polymorphic_ctype__model='transformedfood')
| Q(polymorphic_ctype__model='basicfood', basicfood__date_type='DLC')).filter(
expiry_date__lt=timezone.now(), end_of_life='').filter(
PermissionBackend.filter_queryset(self.request, Food, 'view'))
open_table = open_table.union(self.get_queryset().filter(
Q(end_of_life='', order__iexact='open')
).filter(
PermissionBackend.filter_queryset(self.request, Food, 'view'))).order_by('expiry_date')
# table served
served_table = self.get_queryset().order_by('-pk').filter(
end_of_life='', is_ready=True).exclude(