Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow users to access the calendar page
Roland Geider46f166aba353
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.htmlindex 02e25b945..08f2415f4 100644--- a/wger/manager/templates/mobile/workout/calendar.html+++ b/wger/manager/templates/mobile/workout/calendar.html@@ -23,7 +23,7 @@ $(document).ready(function() {{% endblock %}{% block content %}-{% cache cache_timeout workout-log-mobile user.id current_year current_month %}+{% cache cache_timeout workout-log-mobile is_owner owner_user.id current_year current_month %}{{calendar|safe}}{% for date in logs %}@@ -32,6 +32,7 @@ $(document).ready(function() {{# #}{# Popups to edit or delete the logs #}{# #}+{% if is_owner %}{% for i in grouped_logs %}{% for log in i.list %}<div class="modal fade" id="log-popup-{{log.pk}}">@@ -66,6 +67,7 @@ $(document).ready(function() {</div>{% endfor %}{% endfor %}+{% endif %}<div id="log-{{date|date:'Y-m-d'}}" class="calendar-log-data"><h3>{{date}}</h3>@@ -82,27 +84,38 @@ $(document).ready(function() {<a href="{% url 'manager:log:log' first_log.workout.id %}"class="btn btn-default btn-block">{% trans "Log overview" %}</a>- {% if session %}- <a href="{% url 'manager:session:edit' session.pk %}"- class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>- {% else %}- <a href="{% url 'manager:session:add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}"- class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>+ {% if is_owner %}+ {% if session %}+ <a href="{% url 'manager:session:edit' session.pk %}"+ class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>+ {% else %}+ <a href="{% url 'manager:session:add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}"+ class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>+ {% endif %}{% endif %}{% if session %}- <p>- <strong>{% trans "Time" %}:</strong>- {% if session.time_start %}- {{session.time_start|time:"H:i"}} - {{session.time_end|time:"H:i"}}- {% else %}- -/-- {% endif %}<br>- <strong>{% trans "General impression" %}: </strong> {% trans session.get_impression_display %}<br>- <strong>{% trans "Notes" %}:</strong> {{session.notes|default:'-/-'}}- </p>- {% else %}+ <table class="table" style="margin-top: 2em;">+ <tr>+ <th style="width: 30%">{% trans "Time" %}</th>+ <td>+ {% if session.time_start %}+ {{session.time_start|time:"H:i"}} - {{session.time_end|time:"H:i"}}+ {% else %}+ -/-+ {% endif %}+ </td>+ </tr>+ <tr>+ <th>{% trans "General impression" %}</th>+ <td>{% trans session.get_impression_display %}</td>+ </tr>+ <tr>+ <th>{% trans "Notes" %}</th>+ <td>{{session.notes|default:'-/-'}}</td>+ </tr>+ </table>{% endif %}{% endwith %}{% endwith %}@@ -120,9 +133,13 @@ $(document).ready(function() {<ul>{% for log in i.list %}<li>- <a href="#log-popup-{{log.pk}}" data-toggle="modal">+ {% if is_owner %}+ <a href="#log-popup-{{log.pk}}" data-toggle="modal">+ {{log.reps}} × {{log.weight}}+ </a>+ {% else %}{{log.reps}} × {{log.weight}}- </a>+ {% endif %}</li>{% endfor %}</ul>diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.htmlindex c3444a2ca..7e6203c31 100644--- a/wger/manager/templates/workout/calendar.html+++ b/wger/manager/templates/workout/calendar.html@@ -20,7 +20,7 @@ $(document).ready(function() {{% endblock %}{% block content %}-{% cache cache_timeout workout-log-full user.id current_year current_month %}+{% cache cache_timeout workout-log-full is_owner owner_user.id current_year current_month %}{{calendar|safe}}{% for date in logs %}@@ -43,24 +43,36 @@ $(document).ready(function() {</div><div class="col-sm-4">- {% if session %}- <a href="{% url 'manager:session:edit' session.pk %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>- {% else %}- <a href="{% url 'manager:session:add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>+ {% if is_owner %}+ {% if session %}+ <a href="{% url 'manager:session:edit' session.pk %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Edit workout session" %}</a>+ {% else %}+ <a href="{% url 'manager:session:add' first_log.workout_id date|date:'Y' date|date:'m' date|date:'d' %}" class="btn btn-default btn-block wger-modal-dialog">{% trans "Add workout impression" %}</a>+ {% endif %}{% endif %}</div></div>{% if session %}- <p>- <strong>{% trans "Time" %}:</strong>- {% if session.time_start %}- {{session.time_start|time:"H:i"}} - {{session.time_end|time:"H:i"}}- {% else %}- -/-- {% endif %}<br>- <strong>{% trans "General impression" %}: </strong> {% trans session.get_impression_display %}<br>- <strong>{% trans "Notes" %}:</strong> {{session.notes|default:'-/-'}}- </p>+ <table class="table" style="margin-top: 2em;">+ <tr>+ <th style="width: 30%">{% trans "Time" %}</th>+ <td>+ {% if session.time_start %}+ {{session.time_start|time:"H:i"}} - {{session.time_end|time:"H:i"}}+ {% else %}+ -/-+ {% endif %}+ </td>+ </tr>+ <tr>+ <th>{% trans "General impression" %}</th>+ <td>{% trans session.get_impression_display %}</td>+ </tr>+ <tr>+ <th>{% trans "Notes" %}</th>+ <td>{{session.notes|default:'-/-'}}</td>+ </tr>+ </table>{% endif %}{% endwith %}{% endwith %}@@ -77,6 +89,7 @@ $(document).ready(function() {{% for log in i.list %}<li>{{log.reps}} × {{log.weight}}+ {% if is_owner %}<span class="editoptions"><a href="{% url 'manager:log:delete' log.pk %}"title="{% trans 'Delete' %}"@@ -93,6 +106,7 @@ $(document).ready(function() {height="16"alt="{% trans 'Edit' %}"></a></span>+ {% endif %}</li>{% endfor %}</ul>@@ -154,13 +168,15 @@ you can click on them to see the details.{% endblocktrans %}</p><h3>{% trans 'Log' %}</h3><p>- <a href="{% url 'manager:workout:calendar' %}">+ <a href="{% url 'manager:workout:calendar' owner_user.pk %}"><img src="{% static 'images/icons/calendar.svg' %}"width="32"height="32"alt="{% trans 'Go to current month' %}">{% trans "Go to current month" %}</a></p>++{% if is_owner %}<p><a href="#" id="calendar-day-select-link" data-toggle="modal" data-target="#ecalendar-day-select-popup"><img src="{% static 'images/icons/add.svg' %}"@@ -169,6 +185,8 @@ you can click on them to see the details.{% endblocktrans %}</p>alt="{% trans 'Add new log' %}">{% trans "Add new log" %}</a></p>+{% endif %}+<div class="timeline-log">{% for date in month_list %}{% ifchanged date.year %}@@ -177,7 +195,7 @@ you can click on them to see the details.{% endblocktrans %}</p>{% if current_month = date.month and current_year = date.year %}<span>{{date|date:"F"}}</span><br>{% else %}- <span><a href="{% url 'manager:workout:calendar' date.year date.month %}">{{date|date:"F"}}</a></span><br>+ <span><a href="{% url 'manager:workout:calendar' owner_user.pk date.year date.month %}">{{date|date:"F"}}</a></span><br>{% endif %}{% endfor %}</div>diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex e9f0b6e8d..bb132115d 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -33,6 +33,28 @@ from wger.utils.cache import get_template_cache_name, cache_mapperlogger = logging.getLogger('wger.custom')+class CalendarAccessTestCase(WorkoutManagerTestCase):+ '''+ Test accessing the calendar page+ '''++ def test_access_shared(self):+ '''+ Test accessing the URL of a shared calendar+ '''+ self.user_login('admin')+ response = self.client.get(reverse('manager:workout:calendar', kwargs={'user_pk': 1}))+ self.assertEqual(response.status_code, 200)++ self.user_login('test')+ response = self.client.get(reverse('manager:workout:calendar', kwargs={'user_pk': 1}))+ self.assertEqual(response.status_code, 200)++ self.user_logout()+ response = self.client.get(reverse('manager:workout:calendar', kwargs={'user_pk': 1}))+ self.assertEqual(response.status_code, 200)++class WeightLogOverviewAddTestCase(WorkoutManagerTestCase):'''Tests the weight log functionality@@ -259,13 +281,33 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):'''self.user_login('admin')self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertFalse(cache.get(get_template_cache_name('workout-log-full', 1, 2012, 10)))- self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name('workout-log-full', True, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', True, 1, 2012, 10)))self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'- self.assertTrue(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))+ self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))++ def test_calendar_anonymous(self):+ '''+ Test the exercise overview cache is correctly generated on visit+ by anonymous users+ '''+ self.user_logout()+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name('workout-log-full', True, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name('workout-log-full', False, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', True, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', False, 1, 2012, 10)))+ self.client.get(reverse('manager:workout:calendar', kwargs={'user_pk': 1,+ 'year': 2012,+ 'month': 10}))++ cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))+ self.assertTrue(cache.get(get_template_cache_name(cache_key, False, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))def test_cache_update_log(self):'''@@ -280,7 +322,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertFalse(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))def test_cache_update_log_2(self):'''@@ -295,7 +337,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertTrue(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))def test_cache_delete_log(self):'''@@ -309,7 +351,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertFalse(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))def test_cache_delete_log_2(self):'''@@ -323,7 +365,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertTrue(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex f9271295c..c76620cb2 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -150,7 +150,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertFalse(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))def test_cache_update_session_2(self):'''@@ -166,7 +166,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertTrue(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))def test_cache_delete_session(self):'''@@ -180,7 +180,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertFalse(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertFalse(cache.get(get_template_cache_name(cache_key, 'True', 1, 2012, 10)))def test_cache_delete_session_2(self):'''@@ -194,7 +194,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))- self.assertTrue(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))+ self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex e81324a00..57af4dc9c 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -65,9 +65,15 @@ patterns_workout = patterns('',url(r'^(?P<id>\d+)/view/$',workout.view,name='view'),+ url(r'^calendar/u-(?P<user_pk>\d+)$',+ log.calendar,+ name='calendar'),url(r'^calendar$',log.calendar,name='calendar'),+ url(r'^calendar/(?P<user_pk>\d+)-(?P<year>\d{4})-(?P<month>\d{1,2})$',+ log.calendar,+ name='calendar'),url(r'^calendar/(?P<year>\d{4})-(?P<month>\d{1,2})$',log.calendar,name='calendar'),diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex 3fca3c302..cd6df8d09 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -48,6 +48,7 @@ from wger.utils.cache import cache_mapperfrom wger.utils.generic_views import WgerFormMixinfrom wger.utils.generic_views import WgerDeleteMixinfrom wger.utils.generic_views import WgerPermissionMixin+from wger.utils.helpers import check_accessfrom wger.weight.helpers import process_log_entries@@ -371,24 +372,23 @@ class WorkoutCalendar(HTMLCalendar):return '<td class="{0}" style="vertical-align: middle;">{1}</td>'.format(cssclass, body)-def calendar(request, year=None, month=None):+def calendar(request, user_pk=None, year=None, month=None):'''Show a calendar with all the workout logs'''- if not year:- year = datetime.date.today().year- else:- year = int(year)- if not month:- month = datetime.date.today().month- else:- month = int(month)+ try:+ is_owner, user = check_access(request.user, user_pk)+ except ValueError:+ return HttpResponseForbidden()++ year = int(year) if year else datetime.date.today().year+ month = int(month) if month else datetime.date.today().monthcontext = {}- logs = WorkoutLog.objects.filter(user=request.user,+ logs = WorkoutLog.objects.filter(user=user,date__year=year,date__month=month).order_by('exercise')- logs_filtered = cache.get(cache_mapper.get_workout_log(request.user.pk, year, month))+ logs_filtered = cache.get(cache_mapper.get_workout_log(user.pk, year, month))if not logs_filtered:logs_filtered = {}@@ -405,14 +405,16 @@ def calendar(request, year=None, month=None):logs_filtered[log.date.day] = {'impression': impression,'log': log}- cache.set(cache_mapper.get_workout_log(request.user.pk, year, month), logs_filtered)+ cache.set(cache_mapper.get_workout_log(user.pk, year, month), logs_filtered)- (current_workout, schedule) = Schedule.objects.get_current_workout(request.user)+ (current_workout, schedule) = Schedule.objects.get_current_workout(user)context['calendar'] = WorkoutCalendar(logs_filtered).formatmonth(year, month)context['logs'] = process_log_entries(logs)[0]context['current_year'] = yearcontext['current_month'] = monthcontext['current_workout'] = current_workout+ context['owner_user'] = user+ context['is_owner'] = is_ownercontext['impressions'] = WorkoutSession.IMPRESSION- context['month_list'] = WorkoutLog.objects.filter(user=request.user).dates('date', 'month')+ context['month_list'] = WorkoutLog.objects.filter(user=user).dates('date', 'month')return render(request, 'workout/calendar.html', context)diff --git a/wger/utils/cache.py b/wger/utils/cache.pyindex dcd11b077..231dbcdd6 100644--- a/wger/utils/cache.py+++ b/wger/utils/cache.py@@ -44,8 +44,10 @@ def reset_workout_canonical_form(workout_id):def reset_workout_log(user_pk, year, month):- delete_template_fragment_cache('workout-log-full', user_pk, year, month)- delete_template_fragment_cache('workout-log-mobile', user_pk, year, month)+ delete_template_fragment_cache('workout-log-full', True, user_pk, year, month)+ delete_template_fragment_cache('workout-log-full', False, user_pk, year, month)+ delete_template_fragment_cache('workout-log-mobile', True, user_pk, year, month)+ delete_template_fragment_cache('workout-log-mobile', False, user_pk, year, month)cache.delete(cache_mapper.get_workout_log(user_pk, year, month))