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

suppressing commutes and start of auto_wps

Browse Source
This commit is contained in:
Sander Roosendaal
2025-01-09 13:47:43 +01:00
parent 062c1ac229
commit d9ffc16127
2 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/models.py
View File

@@ -1257,6 +1257,7 @@ class Rower(models.Model):
verbose_name='Receive email notifications')
imports_are_private = models.BooleanField(default=False, verbose_name='Make imports private by default')
show_commutes = models.BooleanField(default=False, verbose_name='Show commutes in workout list')
# Friends/Team
friends = models.ManyToManyField("self", blank=True)
@@ -1295,6 +1296,9 @@ class Rower(models.Model):
fastpaceotw = models.DurationField(
default=otwpacefast, verbose_name='Fastest OTW Pace')
running_wps = models.FloatField(default=400.0, verbose_name='Running Work per Stroke')
running_wps_erg = models.FloatField(default=500.0, verbose_name='Running Work per Stroke (ergometer)')
fav_analysis = models.CharField(default='compare', choices=favanalysischoices,
max_length=100,
verbose_name='Favorite Analysis')
@@ -5177,6 +5181,7 @@ class AccountRowerForm(ModelForm):
'defaultlandingpage',
'defaultlandingpage2',
'defaultlandingpage3',
'show_commutes',
'offercoaching', 'autojoin', 'emailalternatives']
widgets = {

48
rowers/templates/list_workouts.html
View File

@@ -104,6 +104,7 @@
{% endif %}
{% for workout in workouts %}
{% if not workout.is_commute %}
<li class="grid_4 divlines">
{% if request.GET.selectworkouts %}
<input type="checkbox" id="workoutid" value={{ workout.id|encode }} name="workoutid" />
@@ -198,7 +199,52 @@
</div>
</div>
</li>
{% elif user.rower.show_commutes %}
<li class="grid_4 divlines">
<div class="workoutcontainer">
<div class="workoutelement">
<span style="font-size: smaller"><i class="fa-solid fa-train"></i></span>
</div>
<div class="workoutelement">
<span style="color:#555">Distance</span>
{{ workout.distance|distanceprint }}
</div>
<div class="workoutelement">
<span style="color:#555">Time</span>
{{ workout.duration |durationprint:"%H:%M:%S.%f" }}
</div>
<div class="workoutelement">
{% if workout|may_edit:request %}
<a class="small"
href={% url rower.defaultlandingpage id=workout.id|encode %}
title="{{ rower.defaultlandingpage|verbose }}">
<i class="{{ rower.defaultlandingpage|landingicon }}"></i></a>
{% else %}
&nbsp;
{% endif %}
</div>
<div class="workoutelement">
{% if workout|may_edit:request %}
{% if rower.defaultlandingpage2 != 'workout_delete' %}
<a class="small"
href={% url rower.defaultlandingpage2 id=workout.id|encode %}
title="{{ rower.defaultlandingpage2|verbose }}">
<i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a>
{% else %}
<a class="small"
href={% url rower.defaultlandingpage2 id=workout.id|encode %}
title="{{ rower.defaultlandingpage2|verbose }}">
<i class="{{ rower.defaultlandingpage2|landingicon }}"></i></a>
{% endif %}
{% else %}
&nbsp;
{% endif %}
</div>
</div>
</li>
{% endif %}
{% endfor %}
{% else %}