Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Show the workout session in the calendar view

Roland Geiderf0e6e2eddd03
diff --git a/wger/manager/models.py b/wger/manager/models.py
index ca162f4fc..8318a6ed6 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -649,6 +649,20 @@ class WorkoutLog(models.Model):
'''
return self
+ def get_workout_session(self, date=None):
+ '''
+ Returns the corresponding workout session
+
+ :return the WorkoutSession object or None if nothing was found
+ '''
+ if not date:
+ date = self.date
+
+ try:
+ return WorkoutSession.objects.filter(user=self.user).get(date=date)
+ except WorkoutSession.DoesNotExist:
+ return None
+
class WorkoutSession(models.Model):
'''
@@ -681,8 +695,7 @@ class WorkoutSession(models.Model):
'''
date = Html5DateField(verbose_name=_('Date'),
- editable=False,
- auto_now_add=True)
+ editable=False)
'''
The date the workout session was performed
'''
diff --git a/wger/manager/templates/day/log.html b/wger/manager/templates/day/log.html
index c8b373a41..ba6da2114 100644
--- a/wger/manager/templates/day/log.html
+++ b/wger/manager/templates/day/log.html
@@ -99,6 +99,10 @@ $(document).ready(function () {
{% block sidebar %}
+<h3>{% trans "Info" %}</h3>
+<p>{% blocktrans %}The description for a workout session (impression, notes, time)
+will only be saved if there is no entry for the given date.{% endblocktrans %}</p>
+
<h3>{% trans "Options" %}</h3>
<p>
<a href="{% url 'workout-view' day.training.id %}">
diff --git a/wger/manager/templates/mobile/day/log.html b/wger/manager/templates/mobile/day/log.html
index 9cdee07d8..aae2805a8 100644
--- a/wger/manager/templates/mobile/day/log.html
+++ b/wger/manager/templates/mobile/day/log.html
@@ -87,6 +87,10 @@
{% block sidebar %}
+<h3>{% trans "Info" %}</h3>
+<p>{% blocktrans %}The description for a workout session (impression, notes, time)
+will only be saved if there is no entry for the given date.{% endblocktrans %}</p>
+
<h3>{% trans "Options" %}</h3>
<p>
<a href="{% url 'workout-view' day.training.id %}"
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.html
index c81472f6e..96f95c3d1 100644
--- a/wger/manager/templates/mobile/workout/calendar.html
+++ b/wger/manager/templates/mobile/workout/calendar.html
@@ -33,16 +33,31 @@ $(document).ready(function() {
{# TODO: what if some of the entries don't belong to a workout? #}
{% with tmp=grouped_logs|first %}
{% with first_log=tmp.list|first %}
- <div class="ui-grid-a">
- <div class="ui-block-a">
- <a href="{{first_log.workout.get_absolute_url}}" data-role="button">{% trans "Workout" %}</a>
+ <div class="ui-grid-a">
+ <div class="ui-block-a">
+ <a href="{{first_log.workout.get_absolute_url}}"
+ data-role="button"
+ data-icon="arrow-r">{% trans "Workout" %}</a>
+ </div>
+ <div class="ui-block-b">
+ <a href="{% url 'workout-log' first_log.workout.id %}"
+ data-role="button"
+ data-icon="arrow-r">{% trans "Log overview" %}</a>
+ </div>
</div>
- <div class="ui-block-b">
- <a href="{% url 'workout-log' first_log.workout.id %}" data-role="button">{% trans "Log overview" %}</a>
- </div>
- </div>
+
+ {% with session=first_log.get_workout_session %}
+ {% if session %}
+ <p>
+ <strong>{% trans "Notes" %}:</strong> {{session.notes}}<br>
+ <strong>{% trans "General impression" %}: </strong> {% trans session.get_impression_display %}<br>
+ <strong>{% trans "Time" %}:</strong> {{session.time_start|time:"H:i"}} - {{session.time_end|time:"H:i"}}
+ </p>
+ {% endif %}
+ {% endwith %}
{% endwith %}
{% endwith %}
+
<ul class="grouper-list">
{% for i in grouped_logs %}
<li>{{i.grouper}}
diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.html
index 1f624c1f0..9bd34519d 100644
--- a/wger/manager/templates/workout/calendar.html
+++ b/wger/manager/templates/workout/calendar.html
@@ -42,6 +42,15 @@ $(document).ready(function() {
<a href="{{first_log.workout.get_absolute_url}}" class="btn">{% trans "Workout" %}</a>
<a href="{% url 'workout-log' first_log.workout.id %}" class="btn">{% trans "Log overview" %}</a>
</p>
+ {% with session=first_log.get_workout_session %}
+ {% if session %}
+ <p>
+ <strong>{% trans "Notes" %}:</strong> {{session.notes}}<br>
+ <strong>{% trans "General impression" %}: </strong> {% trans session.get_impression_display %}<br>
+ <strong>{% trans "Time" %}:</strong> {{session.time_start|time:"H:i"}} - {{session.time_end|time:"H:i"}}
+ </p>
+ {% endif %}
+ {% endwith %}
{% endwith %}
{% endwith %}
<ul class="grouper-list">
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 558d22f9b..a78423625 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -14,10 +14,14 @@
import logging
import datetime
+from django.contrib.auth.models import User
from django.core.urlresolvers import reverse, reverse_lazy
+from wger.exercises.models import Exercise
from wger.manager.models import WorkoutLog
+from wger.manager.models import Workout
+from wger.manager.models import WorkoutSession
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
@@ -26,7 +30,7 @@ from wger.manager.tests.testcase import ApiBaseResourceTestCase
logger = logging.getLogger('wger.custom')
-class WeightLogTestCase(WorkoutManagerTestCase):
+class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):
'''
Tests the weight log functionality
'''
@@ -105,9 +109,61 @@ class WeightLogTestCase(WorkoutManagerTestCase):
self.add_weight_log(fail=True)
+class WeightlogTestCase(WorkoutManagerTestCase):
+ '''
+ Tests other model methods
+ '''
+
+ def test_get_workout_session(self):
+ '''
+ Test the get_workout_session method
+ '''
+
+ user1 = User.objects.get(pk=1)
+ user2 = User.objects.get(pk=2)
+ workout1 = Workout.objects.get(pk=2)
+ workout2 = Workout.objects.get(pk=2)
+
+ WorkoutLog.objects.all().delete()
+ l = WorkoutLog()
+ l.user = user1
+ l.date = datetime.date(2014, 01, 05)
+ l.exercise = Exercise.objects.get(pk=1)
+ l.workout = workout1
+ l.weight = 10
+ l.reps = 10
+ l.save()
+
+ session1 = WorkoutSession()
+ session1.user = user1
+ session1.workout = workout1
+ session1.notes = 'Something here'
+ session1.impression = '3'
+ session1.date = datetime.date(2014, 01, 05)
+ session1.save()
+
+ session2 = WorkoutSession()
+ session2.user = user1
+ session2.workout = workout1
+ session2.notes = 'Something else here'
+ session2.impression = '1'
+ session2.date = datetime.date(2014, 01, 01)
+ session2.save()
+
+ session3 = WorkoutSession()
+ session3.user = user2
+ session3.workout = workout2
+ session3.notes = 'The notes here'
+ session3.impression = '2'
+ session3.date = datetime.date(2014, 01, 05)
+ session3.save()
+
+ self.assertEqual(l.get_workout_session(), session1)
+
+
class WeightLogAddTestCase(WorkoutManagerAddTestCase):
'''
- Tests editing a Workout
+ Tests adding a WorkoutLog
'''
object_class = WorkoutLog
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 03898cf60..5b302069e 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -35,6 +35,7 @@ from django.views.generic import CreateView
from django.views.generic import DetailView
from wger.manager.models import Workout
+from wger.manager.models import WorkoutSession
from wger.manager.models import Day
from wger.manager.models import WorkoutLog
from wger.manager.models import Schedule
@@ -181,12 +182,13 @@ def add(request, pk):
if dateform.is_valid() and session_form.is_valid() and formset.is_valid():
log_date = dateform.cleaned_data['date']
- # Workout Session
- instance = session_form.save(commit=False)
- instance.date = log_date
- instance.user = request.user
- instance.workout = day.training
- instance.save()
+ # Save the Workout Session only if there is not already one for this date
+ if not WorkoutSession.objects.get(user=request.user, date=log_date):
+ instance = session_form.save(commit=False)
+ instance.date = log_date
+ instance.user = request.user
+ instance.workout = day.training
+ instance.save()
# Log entries
instances = formset.save(commit=False)