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

Merge branch 'develop' into feature/redesign

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-21 19:07:46 +02:00
parent dea2b5f0d7 9b7d385b1c
commit b5d62d78c9
3 changed files with 33 additions and 37 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,
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("preferreddate","startdate","enddate")
).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race')
return sps
@@ -462,14 +463,16 @@ def get_sessions(r,startdate=date.today(),
rower__in=[r],
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("preferreddate","startdate","enddate")
).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race')
return sps
def get_my_session_ids(r):
sps = PlannedSession.objects.filter(
rower__in=[r]
).order_by("preferreddate","startdate","enddate")
).order_by("preferreddate","startdate","enddate").exclude(
sessiontype='race')
return [ps.id for ps in sps]

34
rowers/templates/redesign.html
View File

@@ -6,6 +6,8 @@
<h1>Main</h1>
<p>Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh <a href="">fermentum</a> in.
</p>
<p>Vestibulum consectetur sit amet nisi ut consectetur. Praesent efficitur, nibh vitae fringilla scelerisque, est neque faucibus quam, in iaculis purus libero eget mauris. Curabitur et luctus sapien, ac gravida orci. Aliquam erat volutpat. In hac habitasse platea dictumst. Aenean commodo, arcu a commodo efficitur, libero dolor mollis turpis, non posuere orci leo eget enim. Curabitur sit amet elementum orci, pulvinar dignissim urna. Morbi id ex eu ex congue laoreet. Aenean tincidunt dolor justo, semper pretium libero luctus nec. Ut vulputate metus accumsan leo imperdiet tincidunt. Phasellus nec rutrum dolor. Cras imperdiet sollicitudin arcu, id interdum nibh <a href="">fermentum</a> in.
</p>
{% endblock %}
{% block sidebar %}
@@ -20,9 +22,9 @@
<label for="sub-group-1">Sub Group 1</label>
<ul>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
<li class="has-children">
@@ -35,15 +37,15 @@
<label for="sub-group-level-3">Sub Group Level 3</label>
<ul>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
@@ -52,8 +54,8 @@
<label for="group-2">Group 2</label>
<ul>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
@@ -62,8 +64,8 @@
<label for="group-3">Group 3</label>
<ul>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
@@ -77,12 +79,12 @@
<label for="sub-group-3">Sub Group 3</label>
<ul>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Image</a></li>
<li><a href="#0">Link</a></li>
<li><a href="#0">Link</a></li>
</ul>
</li>
</ul> <!-- cd-accordion-menu -->

25
rowers/views.py
View File

@@ -12387,13 +12387,6 @@ def plannedsession_multiclone_view(
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':
startdate,enddate = get_dates_timeperiod(timeperiod)
@@ -12448,7 +12441,8 @@ def plannedsession_multiclone_view(
rower__in=[r],
startdate__lte=enddate,
enddate__gte=startdate).order_by(
"startdate","preferreddate","enddate")
"startdate","preferreddate","enddate").exclude(
sessiontype='race')
query = request.GET.get('q')
if query:
@@ -12590,7 +12584,8 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0):
sessioncreateform = PlannedSessionForm(initial=forminitial)
sps = get_sessions(r,startdate=startdate,enddate=enddate)
sps = get_sessions(r,startdate=startdate,enddate=enddate).exclude(
sessiontype='race')
try:
trainingplan = TrainingPlan.objects.filter(
startdate__lte = startdate,
@@ -12640,7 +12635,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
rower__in=[r],
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("startdate","preferreddate","enddate")
).order_by("startdate","preferreddate","enddate").exclude(
sessiontype='race')
else:
qset = []
else:
@@ -12652,7 +12648,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
manager = request.user,
startdate__lte=enddate,
enddate__gte=startdate,
).order_by("startdate","preferreddate","enddate")
).order_by("startdate","preferreddate","enddate").exclude(
sessiontype='race')
@@ -12728,12 +12725,6 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek',
startdate,enddate = get_dates_timeperiod(timeperiod)
try:
trainingplan = TrainingPlan.objects.filter(
startdate__lte = startdate,
rower = r,
enddate__gte = enddate)[0]
except IndexError:
trainingplan = None
sps = []