Better Date filtering

Allow filtering by multiple date ranges or empty date.
Date ranges are separated by comma, an empty date is represented by '-'.

Author: schlatterbeck

CHANGES.txt

@@ -60,6 +60,8 @@ Features:
   fine.
 - Added markdown rendering using either markdown or markdown2.
   (Christof Meerwald)
+- Allow filtering by multiple date ranges or empty date. Date ranges are
+  separated by comma, an empty date is represented by '-'
 
 Fixed:
 

doc/overview.txt

@@ -544,7 +544,9 @@ Each type of property has its own appropriate filtering widget:
 - *string* properties appear as text fields supporting
   case-insensitive substring match
 - *date* properties appear as a text field which accepts a date
-  range with start, end or both
+  range with start, end or both. Multiple date ranges can be specified
+  separated by a comma. An empty date can be searched for by specifying
+  '-' instead of a date range
 - *link* properties appear as a group of selectable options
   (the filter selects the *union* of the sets of items
   associated with the active options)

roundup/backends/back_anydbm.py

@@ -1764,8 +1764,14 @@ def _filter(self, search_matches, filterspec, proptree,
                             l.append((STRING, k, re.compile(x, re.I)))
                 elif isinstance(propclass, hyperdb.Date):
                     try:
-                        date_rng = propclass.range_from_raw(v, self.db)
-                        l.append((DATE, k, date_rng))
+                        ranges = []
+                        for d in v.split(','):
+                            if d == '-':
+                                ranges.append(None)
+                                continue
+                            date_rng = propclass.range_from_raw(d, self.db)
+                            ranges.append(date_rng)
+                        l.append((DATE, k, ranges))
                     except ValueError:
                         # If range creation fails - ignore that search parameter
                         pass
@@ -1862,7 +1868,22 @@ def _filter(self, search_matches, filterspec, proptree,
                         else:
                             # RE search
                             match = v.search(nv)
-                    elif t == DATE or t == INTERVAL:
+                    elif t == DATE:
+                        for x in v:
+                            if x is None or nv is None:
+                                if nv is None and x is None:
+                                    match = 1
+                                    break
+                                continue
+                            elif x.to_value:
+                                if x.from_value <= nv <= x.to_value:
+                                    match = 1
+                                    break
+                            else:
+                                if x.from_value <= nv:
+                                    match = 1
+                                    break
+                    elif t == INTERVAL:
                         if nv is None:
                             match = v is None
                         else:

roundup/backends/rdbms_common.py

@@ -2609,14 +2609,24 @@ def _filter_sql (self, search_matches, filterspec, srt=[], grp=[], retr=0,
                     args = args + [dc(date.Date(x)) for x in v]
                 else:
                     try:
-                        # Try to filter on range of dates
-                        date_rng = propclass.range_from_raw(v, self.db)
-                        if date_rng.from_value:
-                            where.append('_%s._%s >= %s'%(pln, k, a))
-                            args.append(dc(date_rng.from_value))
-                        if date_rng.to_value:
-                            where.append('_%s._%s <= %s'%(pln, k, a))
-                            args.append(dc(date_rng.to_value))
+                        wh = []
+                        ar = []
+                        for d in v.split(','):
+                            w1 = []
+                            if d == '-':
+                                wh.append('_%s._%s is NULL'%(pln, k))
+                                continue
+                            # Try to filter on range of dates
+                            date_rng = propclass.range_from_raw(d, self.db)
+                            if date_rng.from_value:
+                                w1.append('_%s._%s >= %s'%(pln, k, a))
+                                ar.append(dc(date_rng.from_value))
+                            if date_rng.to_value:
+                                w1.append('_%s._%s <= %s'%(pln, k, a))
+                                ar.append(dc(date_rng.to_value))
+                            wh.append (' and '.join (w1))
+                        where.append ('(' + ' or '.join (wh) + ')')
+                        args.extend (ar)
                     except ValueError:
                         # If range creation fails - ignore that search parameter
                         pass

test/db_test_base.py

@@ -1883,6 +1883,18 @@ def testFilteringRangeMonths(self):
                 r = filt(None, dict(deadline='2001-%02d'%month))
                 assert len(r) == month, 'month %d != length %d'%(month, len(r))
 
+    def testFilteringDateRangeMulti(self):
+        ae, filter, filter_iter = self.filteringSetup()
+        self.db.issue.create(title='no deadline')
+        self.db.commit()
+        for filt in filter, filter_iter:
+            r = filt (None, dict(deadline='-'))
+            self.assertEqual(r, ['5'])
+            r = filt (None, dict(deadline=';2003-02-01,2004;'))
+            self.assertEqual(r, ['2', '4'])
+            r = filt (None, dict(deadline='-,;2003-02-01,2004;'))
+            self.assertEqual(r, ['2', '4', '5'])
+
     def testFilteringRangeInterval(self):
         ae, filter, filter_iter = self.filteringSetup()
         for filt in filter, filter_iter: