implemented custom date and time range filter

Author: earonne

django_filters/fields.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from django_filters.widgets import RangeWidget, LookupTypeWidget
+from django_filters.widgets import RangeWidget, LookupTypeWidget, DateRangeWidget, DateTimeRangeWidget
 
 class RangeField(forms.MultiValueField):
     widget = RangeWidget
@@ -32,3 +32,33 @@ def __init__(self, field, lookup_choices, *args, **kwargs):
 
     def compress(self, data_list):
         return data_list
+
+class DateRangeField(forms.MultiValueField):
+    widget = DateRangeWidget
+
+    def __init__(self, *args, **kwargs):
+        fields = (
+            forms.DateField(),
+            forms.DateField(),
+        )
+        super(DateRangeField, self).__init__(fields, *args, **kwargs)
+
+    def compress(self, data_list):
+        if data_list:
+            return slice(*data_list)
+        return None
+
+class DateTimeRangeField(forms.MultiValueField):
+    widget = DateTimeRangeWidget
+
+    def __init__(self, *args, **kwargs):
+        fields = (
+            forms.DateTimeField(),
+            forms.DateTimeField(),
+        )
+        super(DateTimeRangeField, self).__init__(fields, *args, **kwargs)
+
+    def compress(self, data_list):
+        if data_list:
+            return slice(*data_list)
+        return None

django_filters/filters.py

@@ -5,13 +5,14 @@
 from django.db.models.sql.constants import QUERY_TERMS
 from django.utils.translation import ugettext_lazy as _
 
-from django_filters.fields import RangeField, LookupTypeField
+from django_filters.fields import RangeField, LookupTypeField, DateRangeField, DateTimeRangeField
 
 __all__ = [
     'Filter', 'CharFilter', 'BooleanFilter', 'ChoiceFilter',
     'MultipleChoiceFilter', 'DateFilter', 'DateTimeFilter', 'TimeFilter',
     'ModelChoiceFilter', 'ModelMultipleChoiceFilter', 'NumberFilter',
-    'RangeFilter', 'DateRangeFilter', 'AllValuesFilter',
+    'RangeFilter', 'DateRangeFilter', 'AllValuesFilter', 
+    'CustomDateRangeFilter', 'CustomDateTimeRangeFilter'
 ]
 
 LOOKUP_TYPES = sorted(QUERY_TERMS.keys())
@@ -153,6 +154,22 @@ def filter(self, qs, value):
             value = ''
         return self.options[value][1](qs, self.name)
 
+class CustomDateRangeFilter(Filter):
+    field_class = DateRangeField
+
+    def filter(self, qs, value):
+        if value:
+            return qs.filter(**{'%s__range' % self.name: (value.start, value.stop)})
+        return qs
+        
+class CustomDateTimeRangeFilter(Filter):
+    field_class = DateTimeRangeField
+
+    def filter(self, qs, value):
+        if value:
+            return qs.filter(**{'%s__range' % self.name: (value.start, value.stop)})
+        return qs
+
 class AllValuesFilter(ChoiceFilter):
     @property
     def field(self):

django_filters/widgets.py

@@ -81,3 +81,29 @@ def decompress(self, value):
         if value is None:
             return [None, None]
         return value
+
+class DateRangeWidget(forms.MultiWidget):
+    def __init__(self, attrs=None):
+        widgets = (forms.DateInput(attrs=attrs), forms.DateInput(attrs=attrs))
+        super(DateRangeWidget, self).__init__(widgets, attrs)
+
+    def decompress(self, value):
+        if value:
+            return [value.start, value.stop]
+        return [None, None]
+
+    def format_output(self, rendered_widgets):
+        return u'-'.join(rendered_widgets)
+
+class DateTimeRangeWidget(forms.MultiWidget):
+    def __init__(self, attrs=None):
+        widgets = (forms.DateTimeInput(attrs=attrs), forms.DateTimeInput(attrs=attrs))
+        super(DateTimeRangeWidget, self).__init__(widgets, attrs)
+
+    def decompress(self, value):
+        if value:
+            return [value.start, value.stop]
+        return [None, None]
+
+    def format_output(self, rendered_widgets):
+        return u'-'.join(rendered_widgets)