diff --git a/collabs/admin.py b/collabs/admin.py index 38760d0..bf8b06a 100644 --- a/collabs/admin.py +++ b/collabs/admin.py @@ -10,6 +10,7 @@ from django import forms from datetime import datetime + def is_member(user, group): return user.groups.filter(name=group).exists() @@ -43,13 +44,21 @@ class Collabs_hour_Admin(admin.ModelAdmin): def get_rangefilter_dtDate_default(self, request): - return ('01/05/2022', '01/05/2022') + + return (datetime.today().replace(day=1), datetime.today()) def get_queryset(self, request): queryset = super(Collabs_hour_Admin, self).get_queryset(request) if not is_member(request.user, "Administration"): queryset = queryset.filter(userName=request.user.username) + if not "dtDate__range__gte" in request.GET.keys(): + start, end = self.get_rangefilter_dtDate_default(request) + queryset = queryset.filter(dtDate__range=[start,end]) + print("PASS if QUERY") + + print(request.GET.keys()) + return queryset