Self hosted FLOSS fitness/workout, nutrition and weight tracker
Some improvements to the UX when marking workouts as templates
Roland Geider058c2188bdeb
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.pyindex 44080a124..7a3ec2d92 100644--- a/wger/manager/api/views.py+++ b/wger/manager/api/views.py@@ -35,13 +35,12 @@ from wger.manager.api.serializers import (ScheduleStepSerializer,SetSerializer,SettingSerializer,- WorkoutCanonicalFormSerializer,WorkoutAndTemplateSerializer,WorkoutCanonicalFormSerializer,WorkoutLogSerializer,WorkoutSerializer,WorkoutSessionSerializer,- WorkoutTemplateSerializer+ WorkoutTemplateSerializer,)from wger.manager.models import (Day,diff --git a/wger/manager/forms.py b/wger/manager/forms.pyindex eef2e9671..7a3d5030a 100644--- a/wger/manager/forms.py+++ b/wger/manager/forms.py@@ -69,7 +69,20 @@ class WorkoutForm(ModelForm):class Meta:model = Workout- exclude = ('user', )+ fields = (+ 'name',+ 'description',+ )+++class WorkoutMakeTemplateForm(ModelForm):++ class Meta:+ model = Workout+ fields = (+ 'is_template',+ 'is_public',+ )class WorkoutCopyForm(Form):diff --git a/wger/manager/models/workout.py b/wger/manager/models/workout.pyindex 9f293fd63..8fa1db8eb 100644--- a/wger/manager/models/workout.py+++ b/wger/manager/models/workout.py@@ -17,21 +17,21 @@# Djangofrom django.contrib.auth.models import Userfrom django.core.cache import cache+from django.core.exceptions import ValidationErrorfrom django.db import modelsfrom django.urls import reversefrom django.utils.translation import gettext_lazy as _# wger-from wger.utils.cache import (- cache_mapper,- reset_workout_canonical_form,-)-from wger.manager.helpers import MusclesHelperfrom wger.manager.managers import (WorkoutAndTemplateManager,WorkoutManager,WorkoutTemplateManager,)+from wger.utils.cache import (+ cache_mapper,+ reset_workout_canonical_form,+)class Workout(models.Model):@@ -70,19 +70,25 @@ class Workout(models.Model):)is_template = models.BooleanField(verbose_name=_('Workout template'),- help_text=_('Marking a workout as a template will freeze it and allow you to '- 'make copies of it'),+ help_text=_(+ 'Marking a workout as a template will freeze it and allow you to '+ 'make copies of it'+ ),default=False,null=False,)is_public = models.BooleanField(verbose_name=_('Public template'),- help_text=_('A public template will be available to other users'),+ help_text=_('A public template is be available to other users'),default=False,null=False,)- user = models.ForeignKey(User, verbose_name=_('User'), on_delete=models.CASCADE)+ user = models.ForeignKey(+ User,+ verbose_name=_('User'),+ on_delete=models.CASCADE,+ )def get_absolute_url(self):"""@@ -102,6 +108,12 @@ class Workout(models.Model):else:return "{0} ({1})".format(_('Workout'), self.creation_date)+ def clean(self):+ if self.is_public and not self.is_template:+ raise ValidationError(+ _('You must mark this workout as a template before declaring it public')+ )+def save(self, *args, **kwargs):"""Reset all cached infosdiff --git a/wger/manager/templates/workout/template_view.html b/wger/manager/templates/workout/template_view.htmlindex d53984cbb..23a892bb2 100644--- a/wger/manager/templates/workout/template_view.html+++ b/wger/manager/templates/workout/template_view.html@@ -47,9 +47,13 @@</div>{% endfor %}-<a href="{% url 'manager:templates:make-workout' workout.id %}" class="btn btn-outline-info">- {% translate "Make workout" %}-</a>+{% if is_owner %}+<div class="col text-center">+ <a href="{% url 'manager:templates:make-workout' workout.id %}" class="btn btn-outline-primary">+ {% translate "Mark as workout" %}+ </a>+</div>+{% endif %}{% endblock %}diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.htmlindex f68055eae..b457ff1e2 100644--- a/wger/manager/templates/workout/view.html+++ b/wger/manager/templates/workout/view.html@@ -220,9 +220,9 @@ an appointment for each training day with the appropriate exercises.{% endblockt<span class="{% fa_class 'calendar' %}"></span>{% translate "Export calendar file" %}</a>- <a href="{% url 'manager:workout:copy' workout.id %}" class="dropdown-item wger-modal-dialog">+ <a href="{% url 'manager:workout:make-template' workout.id %}" class="dropdown-item wger-modal-dialog"><span class="{% fa_class 'clone' %}"></span>- {% translate "Make a copy of this workout" %}+ {% translate "Mark as template" %}</a>{% if is_owner %}<div class="dropdown-divider"></div>diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex 658127a80..b328295a3 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -69,12 +69,12 @@ patterns_templates = [name='public',),path(- '<int:pk>/view/',+ '<int:pk>/view',workout.template_view,name='view',),path(- '<int:pk>/make-workout/',+ '<int:pk>/make-workout',workout.make_workout,name='make-workout',),@@ -93,22 +93,27 @@ patterns_workout = [name='add',),path(- '<int:pk>/copy/',+ '<int:pk>/copy',workout.copy_workout,name='copy',),path(- '<int:pk>/edit/',+ '<int:pk>/edit',workout.WorkoutEditView.as_view(),name='edit',),path(- '<int:pk>/delete/',+ '<int:pk>/make-template',+ workout.WorkoutMakeTemplateView.as_view(),+ name='make-template',+ ),+ path(+ '<int:pk>/delete',workout.WorkoutDeleteView.as_view(),name='delete',),path(- '<int:pk>/view/',+ '<int:pk>/view',workout.view,name='view',),@@ -211,27 +216,27 @@ patterns_session = [# sub patterns for workout dayspatterns_day = [path(- '<int:pk>/edit/',+ '<int:pk>/edit',login_required(day.DayEditView.as_view()),name='edit',),path(- '<int:workout_pk>/day/add/',+ '<int:workout_pk>/day/add',login_required(day.DayCreateView.as_view()),name='add',),path(- '<int:pk>/delete/',+ '<int:pk>/delete',day.delete,name='delete',),path(- '<int:id>/view/',+ '<int:id>/view',day.view,name='view',),path(- '<int:pk>/log/add/',+ '<int:pk>/log/add',log.add,name='log',),@@ -240,12 +245,12 @@ patterns_day = [# sub patterns for workout setspatterns_set = [path(- 'day/<int:day_pk>/set/add/',+ 'day/<int:day_pk>/set/add',set.create,name='add',),path(- 'get-formset/<int:exercise_pk>/<int:reps>/',+ 'get-formset/<int:exercise_pk>/<int:reps>',set.get_formset,name='get-formset',), # Used by JS@@ -255,7 +260,7 @@ patterns_set = [name='delete',),path(- '<int:pk>/edit/',+ '<int:pk>/edit',set.edit,name='edit',),@@ -274,7 +279,7 @@ patterns_schedule = [name='add',),path(- '<int:pk>/view/',+ '<int:pk>/view',schedule.view,name='view',),@@ -284,12 +289,12 @@ patterns_schedule = [name='start',),path(- '<int:pk>/edit/',+ '<int:pk>/edit',schedule.ScheduleEditView.as_view(),name='edit',),path(- '<int:pk>/delete/',+ '<int:pk>/delete',schedule.ScheduleDeleteView.as_view(),name='delete',),diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.pyindex 4f79206b7..421e59d16 100644--- a/wger/manager/views/workout.py+++ b/wger/manager/views/workout.py@@ -54,6 +54,7 @@ from crispy_forms.layout import Submitfrom wger.manager.forms import (WorkoutCopyForm,WorkoutForm,+ WorkoutMakeTemplateForm,)from wger.manager.models import (Schedule,@@ -153,7 +154,7 @@ def template_view(request, pk):context['workout'] = templatecontext['muscles'] = template.canonical_representation['muscles']- context['is_owner'] = False+ context['is_owner'] = template.user == request.usercontext['owner_user'] = userreturn render(request, 'workout/template_view.html', context)@@ -288,6 +289,20 @@ class WorkoutEditView(WgerFormMixin, LoginRequiredMixin, UpdateView):return context+class WorkoutMakeTemplateView(WgerFormMixin, LoginRequiredMixin, UpdateView):+ """+ Generic view to update an existing workout routine+ """++ model = Workout+ form_class = WorkoutMakeTemplateForm++ def get_context_data(self, **kwargs):+ context = super(WorkoutMakeTemplateView, self).get_context_data(**kwargs)+ context['title'] = _('Mark as template')+ return context++class LastWeightHelper:"""Small helper class to retrieve the last workout log for a certain