suppressing commutes and start of auto_wps
This commit is contained in:
@@ -1257,6 +1257,7 @@ class Rower(models.Model):
|
|||||||
verbose_name='Receive email notifications')
|
verbose_name='Receive email notifications')
|
||||||
|
|
||||||
imports_are_private = models.BooleanField(default=False, verbose_name='Make imports private by default')
|
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/Team
|
||||||
friends = models.ManyToManyField("self", blank=True)
|
friends = models.ManyToManyField("self", blank=True)
|
||||||
@@ -1295,6 +1296,9 @@ class Rower(models.Model):
|
|||||||
fastpaceotw = models.DurationField(
|
fastpaceotw = models.DurationField(
|
||||||
default=otwpacefast, verbose_name='Fastest OTW Pace')
|
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,
|
fav_analysis = models.CharField(default='compare', choices=favanalysischoices,
|
||||||
max_length=100,
|
max_length=100,
|
||||||
verbose_name='Favorite Analysis')
|
verbose_name='Favorite Analysis')
|
||||||
@@ -5177,6 +5181,7 @@ class AccountRowerForm(ModelForm):
|
|||||||
'defaultlandingpage',
|
'defaultlandingpage',
|
||||||
'defaultlandingpage2',
|
'defaultlandingpage2',
|
||||||
'defaultlandingpage3',
|
'defaultlandingpage3',
|
||||||
|
'show_commutes',
|
||||||
'offercoaching', 'autojoin', 'emailalternatives']
|
'offercoaching', 'autojoin', 'emailalternatives']
|
||||||
|
|
||||||
widgets = {
|
widgets = {
|
||||||
|
|||||||
@@ -104,6 +104,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{% for workout in workouts %}
|
{% for workout in workouts %}
|
||||||
|
{% if not workout.is_commute %}
|
||||||
<li class="grid_4 divlines">
|
<li class="grid_4 divlines">
|
||||||
{% if request.GET.selectworkouts %}
|
{% if request.GET.selectworkouts %}
|
||||||
<input type="checkbox" id="workoutid" value={{ workout.id|encode }} name="workoutid" />
|
<input type="checkbox" id="workoutid" value={{ workout.id|encode }} name="workoutid" />
|
||||||
@@ -198,6 +199,51 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</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 %}
|
||||||
|
|
||||||
|
{% 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 %}
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user