sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

removed virtual races from sessions edit/create/view

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-21 10:29:51 +02:00
parent a099aea328
commit 9b7d385b1c
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rowers/plannedsessions.py
View File

@@ -451,7 +451,8 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(),
manager=m, manager=m,
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate, enddate__gte=startdate,
).order_by("preferreddate","startdate","enddate") ).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race')
return sps return sps
@@ -462,14 +463,16 @@ def get_sessions(r,startdate=date.today(),
rower__in=[r], rower__in=[r],
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate, enddate__gte=startdate,
).order_by("preferreddate","startdate","enddate") ).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race')
return sps return sps
def get_my_session_ids(r): def get_my_session_ids(r):
sps = PlannedSession.objects.filter( sps = PlannedSession.objects.filter(
rower__in=[r] rower__in=[r]
).order_by("preferreddate","startdate","enddate") ).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race')
return [ps.id for ps in sps] return [ps.id for ps in sps]

19
rowers/views.py
View File

@@ -12387,13 +12387,6 @@ def plannedsession_multiclone_view(
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,rowerid=rowerid)
# if 'startdate' in request.session:
# startdate = iso8601.parse_date(request.session['startdate'])
# if 'enddate' in request.session:
# enddate = iso8601.parse_date(request.session['enddate'])
if timeperiod != 'none': if timeperiod != 'none':
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -12448,7 +12441,8 @@ def plannedsession_multiclone_view(
rower__in=[r], rower__in=[r],
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate).order_by( enddate__gte=startdate).order_by(
"startdate","preferreddate","enddate") "startdate","preferreddate","enddate").exclude(
sessiontype='race')
query = request.GET.get('q') query = request.GET.get('q')
if query: if query:
@@ -12590,7 +12584,8 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
sessioncreateform = PlannedSessionForm(initial=forminitial) sessioncreateform = PlannedSessionForm(initial=forminitial)
sps = get_sessions(r,startdate=startdate,enddate=enddate) sps = get_sessions(r,startdate=startdate,enddate=enddate).exclude(
sessiontype='race')
try: try:
trainingplan = TrainingPlan.objects.filter( trainingplan = TrainingPlan.objects.filter(
startdate__lte = startdate, startdate__lte = startdate,
@@ -12640,7 +12635,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
rower__in=[r], rower__in=[r],
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate, enddate__gte=startdate,
).order_by("startdate","preferreddate","enddate") ).order_by("startdate","preferreddate","enddate").exclude(
sessiontype='race')
else: else:
qset = [] qset = []
else: else:
@@ -12652,7 +12648,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
manager = request.user, manager = request.user,
startdate__lte=enddate, startdate__lte=enddate,
enddate__gte=startdate, enddate__gte=startdate,
).order_by("startdate","preferreddate","enddate") ).order_by("startdate","preferreddate","enddate").exclude(
sessiontype='race')