diff --git a/smash/web/tests/view/test_utils.py b/smash/web/tests/view/test_utils.py new file mode 100644 index 0000000000000000000000000000000000000000..ba1df2735e2b85d48cc3884560800401b9f07ccf --- /dev/null +++ b/smash/web/tests/view/test_utils.py @@ -0,0 +1,22 @@ +import logging + +from django.test import TestCase + +from web.utils import get_weekdays_in_period + +from datetime import date +import datetime + +logger = logging.getLogger(__name__) + +class Utils(TestCase): + def test_get_weekdays_in_period(self): + fromdate = date(2018,10,9) + todate = date(2018,10,12) + weekdays = get_weekdays_in_period(fromdate, todate) + self.assertEqual(weekdays, {2, 3, 4}) + + todate = datetime.datetime(2018, 10, 12, 00, 00, 00) + fromdate = datetime.datetime(2018, 10, 9, 00, 00, 00) + weekdays = get_weekdays_in_period(fromdate, todate) + self.assertEqual(weekdays, {2, 3, 4}) \ No newline at end of file diff --git a/smash/web/utils.py b/smash/web/utils.py index 81a18cfec87bf008d0d9f5fe78c9960fee9edf6a..6578824e68422a2dcad45b0aca19027e8ac375d4 100644 --- a/smash/web/utils.py +++ b/smash/web/utils.py @@ -33,9 +33,9 @@ def get_weekdays_in_period(fromdate, todate): fromdate = datetime.datetime(2018, 10, 3, 15, 00, 00) todate = datetime.datetime.today() - but they must have the same format ! - - + but both dates must have the same format ! + todate is not included in the range + Weekdays are returned as isoweekdays like the form described in week_choices from constants.py (starting at 1) ''' if todate < fromdate: