provisions for international date formats in selecting plan period
This commit is contained in:
@@ -9,6 +9,7 @@ from django.db import IntegrityError
|
||||
import uuid
|
||||
from django.conf import settings
|
||||
import pytz
|
||||
from dateutil import parser
|
||||
from utils import myqueue,calculate_age,totaltime_sec_to_string
|
||||
import re
|
||||
import django_rq
|
||||
@@ -484,8 +485,13 @@ def get_dates_timeperiod(request,startdatestring='',enddatestring=''):
|
||||
enddatestring = request.GET.get('enddate')
|
||||
|
||||
if startdatestring and enddatestring:
|
||||
startdate = dt.datetime.strptime(startdatestring,'%Y-%m-%d').date()
|
||||
enddate = dt.datetime.strptime(enddatestring,'%Y-%m-%d').date()
|
||||
try:
|
||||
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)
|
||||
|
||||
return startdate,enddate
|
||||
|
||||
daterangetester = re.compile('^(\d+-\d+-\d+)\/(\d+-\d+-\d+)')
|
||||
|
||||
Reference in New Issue
Block a user