sessions now also work with date range

rowers/plannedsessions.py

@@ -10,7 +10,7 @@ import uuid
 from django.conf import settings
 import pytz
 from utils import myqueue,calculate_age,totaltime_sec_to_string
-
+import re
 import django_rq
 queue = django_rq.get_queue('default')
 queuelow = django_rq.get_queue('low')
@@ -426,6 +426,8 @@ def remove_rower_session(r,ps):
 
 def get_dates_timeperiod(timeperiod):
     # set start end date according timeperiod
+    daterangetester = re.compile('^(\d+-\d+-\d+)\/(\d+-\d+-\d+)')
+
     if timeperiod=='today':
         startdate=date.today()
         enddate=date.today()
@@ -466,6 +468,19 @@ def get_dates_timeperiod(timeperiod):
         enddate = startdate+timezone.timedelta(days=32)
         enddate = enddate.replace(day=1)
         enddate = enddate-timezone.timedelta(days=1)
+    elif daterangetester.match(timeperiod):
+        startdatestring = daterangetester.match(timeperiod).group(1)
+        enddatestring = daterangetester.match(timeperiod).group(2)
+        try:
+            startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date()
+            enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date()
+            if startdate > enddate:
+                startdate2 = enddate
+                enddate = startdate
+                startdate = startdate2
+        except ValueError:
+            startdate = date.today()
+            enddate = date.today()            
     else:
         startdate = date.today()
         enddate = date.today()

rowers/uploads.py

@@ -20,7 +20,6 @@ from subprocess import call
 import re
 
 from verbalexpressions import VerEx
-import re
 
 import django_rq
 queue = django_rq.get_queue('default')