Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add workout sessions from the calendar view to the selected date

Roland Geider6d7688b2444e
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.html
index aa0f57a3c..4aedbb4ea 100644
--- a/wger/manager/templates/mobile/workout/calendar.html
+++ b/wger/manager/templates/mobile/workout/calendar.html
@@ -45,7 +45,7 @@ $(document).ready(function() {
<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 %}"
+ <a href="{% url 'workout-session-add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}"
data-role="button">{% trans "Add workout impression" %}</a>
{% endif %}
@@ -149,4 +149,4 @@ you can click on them to see the details.{% endblocktrans %}</p>
</ul>
</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.html
index 04a827014..6ab49a876 100644
--- a/wger/manager/templates/workout/calendar.html
+++ b/wger/manager/templates/workout/calendar.html
@@ -45,7 +45,7 @@ $(document).ready(function() {
{% if session %}
<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>
+ <a href="{% url 'workout-session-add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn modal-dialog">{% trans "Add workout impression" %}</a>
{% endif %}
</p>
{% if session %}
@@ -141,4 +141,4 @@ you can click on them to see the details.{% endblocktrans %}</p>
{% endfor %}
</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index 05ef773f7..abcb088db 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -148,9 +148,13 @@ class WorkoutTimerWorkoutSessionTestCase(WorkoutManagerTestCase):
WorkoutSession.objects.all().delete()
self.user_login('test')
+ today = datetime.date.today()
response = self.client.get(reverse('workout-timer', kwargs={'day_pk': 5}))
self.assertEqual(response.context['form_action'],
- reverse('workout-session-add', kwargs={'workout_pk': 3}))
+ reverse('workout-session-add', kwargs={'workout_pk': 3,
+ 'year': today.year,
+ 'month': today.month,
+ 'day': today.day}))
session = WorkoutSession()
session.user = User.objects.get(username='test')
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index 84df50a37..4ceb481a6 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -36,7 +36,10 @@ class AddWorkoutSessionTestCase(WorkoutManagerAddTestCase):
'''
object_class = WorkoutSession
- url = reverse_lazy('workout-session-add', kwargs={'workout_pk': 1})
+ url = reverse_lazy('workout-session-add', kwargs={'workout_pk': 1,
+ 'year': datetime.date.today().year,
+ 'month': datetime.date.today().month,
+ 'day': datetime.date.today().day})
pk = 4
data = {
'user': 1,
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 79b1c3728..16d08cbb8 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -69,7 +69,7 @@ urlpatterns = patterns('wger.manager.views',
name='workout-ical'),
# Workout session
- url(r'^workout/session/(?P<workout_pk>\d+)/add$',
+ url(r'^workout/session/(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
workout_session.WorkoutSessionAddView.as_view(),
name='workout-session-add'),
url(r'^workout/session/(?P<pk>\d+)/edit$',
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index e89983f36..0f6c3ca75 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -313,7 +313,11 @@ def timer(request, day_pk):
url = reverse('workout-session-edit', kwargs={'pk': session.pk})
session_form = WorkoutSessionHiddenFieldsForm(instance=session)
else:
- url = reverse('workout-session-add', kwargs={'workout_pk': day.training_id})
+ today = datetime.date.today()
+ url = reverse('workout-session-add', kwargs={'workout_pk': day.training_id,
+ 'year': today.year,
+ 'month': today.month,
+ 'day': today.day})
session_form = WorkoutSessionHiddenFieldsForm()
# Render template
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index ebcb9a0dd..31f45e588 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -18,6 +18,7 @@ import logging
import datetime
from django.http import HttpResponseForbidden
+from django.http import HttpResponseBadRequest
from django.core.urlresolvers import reverse
from django.utils.translation import ugettext as _
@@ -65,6 +66,20 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
form_class = WorkoutSessionForm
login_required = True
+ def get_date(self):
+ '''
+ Returns a date object from the URL parameters or None if no date
+ could be created
+ '''
+ try:
+ date = datetime.date(int(self.kwargs['year']),
+ int(self.kwargs['month']),
+ int(self.kwargs['day']))
+ except ValueError:
+ date = None
+
+ return date
+
def dispatch(self, request, *args, **kwargs):
'''
Check for ownership
@@ -73,13 +88,19 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
if workout.get_owner_object().user != request.user:
return HttpResponseForbidden()
+ if not self.get_date():
+ return HttpResponseBadRequest('You need to use a valid date')
+
return super(WorkoutSessionAddView, self).dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs):
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 impression')
+ kwargs={'workout_pk': self.kwargs['workout_pk'],
+ 'year': self.kwargs['year'],
+ 'month': self.kwargs['month'],
+ 'day': self.kwargs['day']})
+ context['title'] = _('New workout impression for the {0}'.format(self.get_date()))
return context
def get_success_url(self):
@@ -93,5 +114,5 @@ class WorkoutSessionAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
workout = Workout.objects.get(pk=self.kwargs['workout_pk'])
form.instance.workout = workout
form.instance.user = self.request.user
- form.instance.date = datetime.date.today()
+ form.instance.date = self.get_date()
return super(WorkoutSessionAddView, self).form_valid(form)