Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow adding new workout sessions from the calendar view
Roland Geiderccc77258f558
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.htmlindex 273b72dd4..aa0f57a3c 100644--- a/wger/manager/templates/mobile/workout/calendar.html+++ b/wger/manager/templates/mobile/workout/calendar.html@@ -35,14 +35,19 @@ $(document).ready(function() {{% with first_log=tmp.list|first %}{% with session=first_log.get_workout_session %}- <a href="{{first_log.workout.get_absolute_url}}"- data-role="button">{{ first_log.workout }}</a>+ <a href="{{first_log.workout.get_absolute_url}}"+ data-role="button">{{ first_log.workout }}</a>- <a href="{% url 'workout-log' first_log.workout.id %}"- data-role="button">{% trans "Log overview" %}</a>+ <a href="{% url 'workout-log' first_log.workout.id %}"+ data-role="button">{% trans "Log overview" %}</a>- <a href="{% url 'workout-session-edit' session.pk %}"- data-role="button">{% trans "Edit session" %}</a>+ {% if session %}+ <a href="{% url 'workout-session-edit' session.pk %}"+ data-role="button">{% trans "Edit workout session" %}</a>+ {% else %}+ <a href="{% url 'workout-session-add' first_log.workout_id %}"+ data-role="button">{% trans "Add workout impression" %}</a>+ {% endif %}{% if session %}@@ -54,8 +59,9 @@ $(document).ready(function() {-/-{% endif %}<br><strong>{% trans "General impression" %}: </strong> {% trans session.get_impression_display %}<br>- <strong>{% trans "Notes" %}:</strong> {{session.notes}}+ <strong>{% trans "Notes" %}:</strong> {{session.notes|default:'-/-'}}</p>+ {% else %}{% endif %}{% endwith %}{% endwith %}diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.htmlindex 5491334d9..04a827014 100644--- a/wger/manager/templates/workout/calendar.html+++ b/wger/manager/templates/workout/calendar.html@@ -43,7 +43,9 @@ $(document).ready(function() {<a href="{{first_log.workout.get_absolute_url}}" class="btn">{{ first_log.workout }}</a><a href="{% url 'workout-log' first_log.workout.id %}" class="btn">{% trans "Log overview" %}</a>{% if session %}- <a href="{% url 'workout-session-edit' session.pk %}" class="btn modal-dialog">{% trans "Edit session" %}</a>+ <a href="{% url 'workout-session-edit' session.pk %}" class="btn modal-dialog">{% trans "Edit workout session" %}</a>+ {% else %}+ <a href="{% url 'workout-session-add' first_log.workout_id %}" class="btn modal-dialog">{% trans "Add workout impression" %}</a>{% endif %}</p>{% if session %}@@ -55,7 +57,7 @@ $(document).ready(function() {-/-{% endif %}<br><strong>{% trans "General impression" %}: </strong> {% trans session.get_impression_display %}<br>- <strong>{% trans "Notes" %}:</strong> {{session.notes}}+ <strong>{% trans "Notes" %}:</strong> {{session.notes|default:'-/-'}}</p>{% endif %}{% endwith %}diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.pyindex bf196412a..0f1a5b808 100644--- a/wger/manager/views/workout_session.py+++ b/wger/manager/views/workout_session.py@@ -49,13 +49,13 @@ class WorkoutSessionUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):def get_context_data(self, **kwargs):context = super(WorkoutSessionUpdateView, self).get_context_data(**kwargs)context['form_action'] = reverse('workout-session-edit', kwargs={'pk': self.object.id})- context['title'] = _('Edit workout session for %s') % self.object.date+ context['title'] = _('Edit workout impression for {0}').format(self.object.date)context['select_lists'] = ('impression', )return contextdef get_success_url(self):- return reverse('workout-log', kwargs={'pk': self.object.workout_id})+ return reverse('workout-calendar')class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):@@ -80,11 +80,12 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):context = super(WorkoutSessionAddView, self).get_context_data(**kwargs)context['form_action'] = reverse('workout-session-add',kwargs={'workout_pk': self.kwargs['workout_pk']})- context['title'] = _('New workout session')+ context['title'] = _('New workout impression')+ context['select_lists'] = ('impression', )return contextdef get_success_url(self):- return reverse('workout-log', kwargs={'pk': self.kwargs['workout_pk']})+ return reverse('workout-calendar')def form_valid(self, form):'''