diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index ce71c7c8..1064db19 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -706,6 +706,7 @@ def get_team(request): def get_dates_timeperiod(request,startdatestring='',enddatestring='', defaulttimeperiod='thisweek'): # set start end date according timeperiod + # should always return datetime.date timeperiod = request.GET.get('when') @@ -720,8 +721,8 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring='', startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date() enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date() except ValueError: - startdate = parser.parse(startdatestring,fuzzy=True) - enddate = parser.parse(enddatestring, fuzzy=True) + startdate = parser.parse(startdatestring,fuzzy=True).date() + enddate = parser.parse(enddatestring, fuzzy=True).date() return startdate,enddate diff --git a/rowers/tests/test_simplefunctions.py b/rowers/tests/test_simplefunctions.py index 22cc3140..547f7a6e 100644 --- a/rowers/tests/test_simplefunctions.py +++ b/rowers/tests/test_simplefunctions.py @@ -11,11 +11,26 @@ from django.http import Http404 from rowers.views import get_workout +class TestDateTime(TestCase): + def setUp(self): + self.factory = RequestFactory() + + def tearDown(self): + pass + + def test_get_dates(self): + request = self.factory.get('/rowers/sessions/create/user/230/?startdate=13.01.2020&enddate=19.01.2020') + startdate,enddate = get_dates_timeperiod(request) + + teststart = datetime.date(2020,1,1) + self.assertTrue(teststart