Self hosted FLOSS fitness/workout, nutrition and weight tracker
Allow anonymous access to (body) weight graph
Roland Geidere5ad72dc014d
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.htmlindex d78996e9c..6710ecebc 100644--- a/wger/core/templates/navigation.html+++ b/wger/core/templates/navigation.html@@ -81,7 +81,7 @@data-toggle="dropdown"rel="nofollow">{% trans "Weight" %} <b class="caret"></b></a><ul class="dropdown-menu">- <li><a href="{% url 'weight:overview' %}" rel="nofollow">{% trans "Weight overview" %}</a></li>+ <li><a href="{% url 'weight:overview' user.username %}" rel="nofollow">{% trans "Weight overview" %}</a></li><li><a href="{% url 'weight:add' %}" rel="nofollow">{% trans "Add weight entry" %}</a></li></ul></li>diff --git a/wger/weight/templates/weight_overview.html b/wger/weight/templates/weight_overview.htmlindex 90cd38da6..d5ad6e0fc 100644--- a/wger/weight/templates/weight_overview.html+++ b/wger/weight/templates/weight_overview.html@@ -16,7 +16,7 @@<script type="text/javascript">$(document).ready(function () {- $.getJSON("/weight/api/get_weight_data/", function(json) {+ $.getJSON("/weight/api/get_weight_data/{{ owner_user.username }}", function(json) {weight_chart(json, $('#content').width());});});@@ -37,6 +37,7 @@ $(document).ready(function () {<div id="weight_diagram"></div>+{% if is_owner %}<p><a href="{% url 'weight:add' %}"{% auto_link_css flavour "wger-modal-dialog" %}@@ -46,6 +47,7 @@ $(document).ready(function () {<p><em>{% trans "You can click on a value on the chart to edit it. "%}</em></p>+{% endif %}{% endblock %}@@ -61,6 +63,7 @@ on the background resets it.{% endblocktrans %}</p>+{% if is_owner %}<h3>{% trans "Options" %}</h3><p><a href="{% url 'weight:export-csv' %}"@@ -85,6 +88,6 @@ on the background resets it.{% trans "Import from spreadsheet" %}</a></p>-+{% endif %}{% endblock %}diff --git a/wger/weight/tests/test_entry.py b/wger/weight/tests/test_entry.pyindex 77478d5b9..f75db0a67 100644--- a/wger/weight/tests/test_entry.py+++ b/wger/weight/tests/test_entry.py@@ -14,16 +14,59 @@import datetimeimport decimal+from django.core.urlresolvers import reversefrom wger.core.tests import api_base_testfrom wger.utils.constants import TWOPLACESfrom wger.weight.models import WeightEntry-from wger.manager.tests.testcase import WorkoutManagerEditTestCase+from wger.manager.tests.testcase import WorkoutManagerEditTestCase, WorkoutManagerTestCasefrom wger.manager.tests.testcase import WorkoutManagerAddTestCase+class WeightEntryAccessTestCase(WorkoutManagerTestCase):+ '''+ Test accessing the weight overview page+ '''++ def test_access_shared(self):+ '''+ Test accessing the URL of a shared weight overview+ '''+ url = reverse('weight:overview', kwargs={'username': 'admin'})++ self.user_login('admin')+ response = self.client.get(url)+ self.assertEqual(response.status_code, 200)++ self.user_login('test')+ response = self.client.get(url)+ self.assertEqual(response.status_code, 200)++ self.user_logout()+ response = self.client.get(url)+ self.assertEqual(response.status_code, 200)++ def test_access_not_shared(self):+ '''+ Test accessing the URL of an unshared weight overview+ '''+ url = reverse('weight:overview', kwargs={'username': 'test'})++ self.user_login('admin')+ response = self.client.get(url)+ self.assertEqual(response.status_code, 403)++ self.user_login('test')+ response = self.client.get(url)+ self.assertEqual(response.status_code, 200)++ self.user_logout()+ response = self.client.get(url)+ self.assertEqual(response.status_code, 403)++class AddWeightEntryTestCase(WorkoutManagerAddTestCase):'''Tests adding a weight entrydiff --git a/wger/weight/urls.py b/wger/weight/urls.pyindex 3449f80f6..8aa8f62ad 100644--- a/wger/weight/urls.py+++ b/wger/weight/urls.py@@ -37,10 +37,16 @@ urlpatterns = patterns('',url(r'^import-csv/$',login_required(views.WeightCsvImportFormPreview(WeightCsvImportForm)),name='import-csv'),-++ url(r'^overview/(?P<username>[\w.@+-]+)$',+ views.overview,+ name='overview'),url(r'^overview/$',views.overview,name='overview'),+ url(r'^api/get_weight_data/(?P<username>[\w.@+-]+)$', # JS+ views.get_weight_data,+ name='weight-data'),url(r'^api/get_weight_data/$', # JSviews.get_weight_data,name='weight-data'),diff --git a/wger/weight/views.py b/wger/weight/views.pyindex 2b96dc4ce..357568158 100644--- a/wger/weight/views.py+++ b/wger/weight/views.py@@ -19,7 +19,7 @@ import csvimport datetimefrom django.shortcuts import render-from django.http import HttpResponse+from django.http import HttpResponse, HttpResponseForbiddenfrom django.http import HttpResponseRedirectfrom django.core.urlresolvers import reversefrom django.core.urlresolvers import reverse_lazy@@ -34,6 +34,7 @@ from django.views.generic import CreateViewfrom django.views.generic import UpdateViewfrom rest_framework.response import Responsefrom rest_framework.decorators import api_view+from wger.utils.helpers import check_accessfrom wger.weight.forms import WeightFormfrom wger.weight.models import WeightEntry@@ -112,8 +113,7 @@ def export_csv(request):return response-@login_required-def overview(request):+def overview(request, username=None):'''Shows a plot with the weight data@@ -121,11 +121,17 @@ def overview(request):* https://github.com/mbostock/d3* http://d3js.org/'''+ try:+ is_owner, user = check_access(request.user, username)+ except TypeError as e:+ # logger.debug("Type error while checking for access: {0}".format(e))+ return HttpResponseForbidden()+template_data = {}- min_date = WeightEntry.objects.filter(user=request.user).\+ min_date = WeightEntry.objects.filter(user=user).\aggregate(Min('creation_date'))['creation_date__min']- max_date = WeightEntry.objects.filter(user=request.user).\+ max_date = WeightEntry.objects.filter(user=user).\aggregate(Max('creation_date'))['creation_date__max']if min_date:template_data['min_date'] = 'new Date(%(year)s, %(month)s, %(day)s)' % \@@ -137,24 +143,32 @@ def overview(request):{'year': max_date.year,'month': max_date.month,'day': max_date.day}++ template_data['is_owner'] = is_owner+ template_data['owner_user'] = userreturn render(request, 'weight_overview.html', template_data)-@login_required@api_view(['GET'])-def get_weight_data(request):+def get_weight_data(request, username=None):'''Process the data to pass it to the JS libraries to generate an SVG image'''+ try:+ is_owner, user = check_access(request.user, username)+ except TypeError as e:+ # logger.info("Type error while checking for access: {0}".format(e))+ return HttpResponseForbidden()+date_min = request.GET.get('date_min', False)date_max = request.GET.get('date_max', True)if date_min and date_max:- weights = WeightEntry.objects.filter(user=request.user,+ weights = WeightEntry.objects.filter(user=user,creation_date__range=(date_min, date_max))else:- weights = WeightEntry.objects.filter(user=request.user)+ weights = WeightEntry.objects.filter(user=user)chart_data = []