time period select on planned sessions view
This commit is contained in:
@@ -14623,14 +14623,6 @@ def plannedsessions_view(request,
|
|||||||
|
|
||||||
r = getrequestrower(request,userid=userid)
|
r = getrequestrower(request,userid=userid)
|
||||||
|
|
||||||
when = request.GET.get('when')
|
|
||||||
if when:
|
|
||||||
timeperiod = when
|
|
||||||
else:
|
|
||||||
timeperiod = 'thisweek'
|
|
||||||
|
|
||||||
startdate,enddate = get_dates_timeperiod(timeperiod)
|
|
||||||
|
|
||||||
if startdatestring:
|
if startdatestring:
|
||||||
try:
|
try:
|
||||||
startdate = iso8601.parse_date(startdatestring)
|
startdate = iso8601.parse_date(startdatestring)
|
||||||
@@ -14643,6 +14635,21 @@ def plannedsessions_view(request,
|
|||||||
except ParseError:
|
except ParseError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
|
when = request.GET.get('when')
|
||||||
|
if when:
|
||||||
|
timeperiod = when
|
||||||
|
startdate,enddate = get_dates_timeperiod(timeperiod)
|
||||||
|
else:
|
||||||
|
timeperiod = 'thisweek'
|
||||||
|
startdate1,enddate1 = get_dates_timeperiod(timeperiod)
|
||||||
|
|
||||||
|
if not startdatestring:
|
||||||
|
startdate = startdate1
|
||||||
|
|
||||||
|
if not enddatestring:
|
||||||
|
enddate = enddate1
|
||||||
|
|
||||||
try:
|
try:
|
||||||
trainingplan = TrainingPlan.objects.filter(
|
trainingplan = TrainingPlan.objects.filter(
|
||||||
startdate__lte = startdate,
|
startdate__lte = startdate,
|
||||||
|
|||||||
Reference in New Issue
Block a user