added date range filter + defaulter fixed

apps/users/admin.py

@@ -1,22 +1,24 @@
 from django.contrib import admin
 from django.apps import apps
 from django.http import HttpResponse
+from django.utils import timezone
+from django.utils.html import format_html
+from rangefilter.filter import DateRangeFilter 
 from tablib import Dataset
 from .models import *
 from import_export.admin import ImportExportModelAdmin
 from .resources import *
 from xlsxwriter import Workbook
 from datetime import date, datetime
 import io
-from django.utils import timezone
-from django.utils.html import format_html
+
 
 
 class NightPassAdmin(admin.ModelAdmin):
     list_display = ( 'user','date', 'campus_resource','hostel_check_out', 'check_in', 'check_out', 'hostel_check_in', 'defaulter')
     search_fields = ('pass_id', 'user')
     actions = ['export_as_xlsx']
-    list_filter = ('date', 'campus_resource', 'defaulter')
+    list_filter = (('date', DateRangeFilter),'campus_resource', 'defaulter')
     autocomplete_fields = ('user', 'campus_resource') 
 
     def user(self, obj):

apps/users/management/commands/check_defaulters.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand
 from ...models import NightPass, Student
-from datetime import date, timedelta
+from datetime import date, timedelta, datetime, time
 
 def check_defaulters():
     previous_day_nightpasses = NightPass.objects.filter(date=date.today()-timedelta(days=1))
@@ -11,6 +11,14 @@ def check_defaulters():
             defaulter = True
             remarks+= "Did not go to Location. "
         else:
+            if nightpass.hostel_checkout_time:
+                if (nightpass.check_in_time - nightpass.hostel_checkout_time) > timedelta(minutes=20):
+                    defaulter = True
+                    remarks+= "Entered library after 20mins. "
+            else:
+                if (nightpass.check_in_time - datetime.combine(nightpass.check_in_time.date(), time(20,50))) > timedelta(minutes=20):
+                    defaulter = True
+                    remarks+= "Entered library after 20mins. "
             if not nightpass.check_out:
                 defaulter=True
                 remarks+= "Left library unethically. "

core/settings.py

@@ -53,7 +53,8 @@
     'import_export',
     'django_crontab',
     'hijack',
-    'hijack.contrib.admin'
+    'hijack.contrib.admin',
+    'rangefilter'
 ]
 
 

requirements.txt

@@ -12,4 +12,5 @@ django-import-export
 django-crontab
 uuid
 tablib
-XlsxWriter
+XlsxWriter
+django-admin-rangefilter