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

Merge tag 'v3.15' into develop

Browse Source 
v3.15
This commit is contained in:
Sander Roosendaal
2017-06-15 17:34:45 +02:00
parent e4d0e38b80 e9f00236fb
commit 7ac40b0c0d
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/models.py
View File

@@ -349,7 +349,7 @@ def checkworkoutuser(user,workout):
# Workout # Workout
class Workout(models.Model): class Workout(models.Model):
workouttypes = ( workuttypes = (
('water','On-water'), ('water','On-water'),
('rower','Indoor Rower'), ('rower','Indoor Rower'),
('skierg','Ski Erg'), ('skierg','Ski Erg'),

8
rowers/templates/list_workouts.html
View File

@@ -71,11 +71,18 @@
</thead> </thead>
<tbody> <tbody>
{% for workout in workouts %} {% for workout in workouts %}
{% if workout.rankingpiece %}
<tr style="font-weight:bold">
{% else %}
<tr> <tr>
{% endif %}
<td> {{ workout.date |truncatechars:15}} </td> <td> {{ workout.date |truncatechars:15}} </td>
<td> {{ workout.starttime }} </td> <td> {{ workout.starttime }} </td>
<td> <td>
{% if workout.user.user == user or user == team.manager %} {% if workout.user.user == user or user == team.manager %}
{% if workout.rankingpiece %}
[RANKING PIECE]
{% endif %}
{% if workout.name != '' %} {% if workout.name != '' %}
<a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td> <a href="/rowers/workout/{{ workout.id }}/edit">{{ workout.name }}</a> </td>
{% else %} {% else %}
@@ -107,7 +114,6 @@
<a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete <a class="small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete
</td> </td>
</tr> </tr>
{% endfor %} {% endfor %}