Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow to print the workout PDF as table, without cells for logging

Roland Geider36b83b59bb3d
diff --git a/wger/manager/pdf.py b/wger/manager/pdf.py
index af5f54692..2ba7b57e8 100644
--- a/wger/manager/pdf.py
+++ b/wger/manager/pdf.py
@@ -274,6 +274,208 @@ def workout_log(request, id):
doc.build(elements)
# Create the HttpResponse object with the appropriate PDF headers.
- response['Content-Disposition'] = 'attachment; filename=Workout-{0}.pdf'.format(id)
+ response['Content-Disposition'] = 'attachment; filename=Workout-{0}-log.pdf'.format(id)
+ response['Content-Length'] = len(response.content)
+ return response
+
+
+@login_required
+def workout_view(request, id):
+ '''
+ Generates a PDF with the contents of the workout, without table for logs
+ '''
+
+ # Create the HttpResponse object with the appropriate PDF headers.
+ response = HttpResponse(content_type='application/pdf')
+
+ #Load the workout
+ workout = get_object_or_404(Workout, pk=id, user=request.user)
+
+ # Create the PDF object, using the response object as its "file."
+ doc = SimpleDocTemplate(response,
+ pagesize=A4,
+ #pagesize = landscape(A4),
+ leftMargin=cm,
+ rightMargin=cm,
+ topMargin=0.5 * cm,
+ bottomMargin=0.5 * cm,
+ title=_('Workout'),
+ author='wger Workout Manager',
+ subject=_('Workout for %s') % request.user.username)
+
+ # container for the 'Flowable' objects
+ elements = []
+
+ # table data, here we will put the workout info
+ data = []
+
+ # Init several counters and markers, this will be used after the iteration to
+ # set different borders and colours
+ day_markers = []
+ exercise_markers = {}
+ group_exercise_marker = {}
+ group_day_marker = {}
+
+ # Background colour for days
+ # Reportlab doesn't use the HTML hexadecimal format, but has a range of
+ # 0 till 1, so we have to convert here.
+ header_colour = colors.Color(int('73', 16) / 255.0,
+ int('8a', 16) / 255.0,
+ int('5f', 16) / 255.0)
+
+ #
+ # Iterate through the Workout
+ #
+
+ # Days
+ for day in workout.canonical_representation['day_list']:
+ set_count = 1
+ day_markers.append(len(data))
+ group_day_marker[day['obj'].id] = {'start': len(data), 'end': len(data)}
+
+ if not exercise_markers.get(day['obj'].id):
+ exercise_markers[day['obj'].id] = []
+
+ p = Paragraph('<para align="center">%(days)s: %(description)s</para>' %
+ {'days': day['days_of_week']['text'],
+ 'description': day['obj'].description},
+ styleSheet["Bold"])
+
+ data.append([p])
+
+ # Sets
+ #for set_obj in day.set_set.select_related():
+ for set in day['set_list']:
+ group_exercise_marker[set['obj'].id] = {'start': len(data), 'end': len(data)}
+
+ # Exercises
+ for exercise in set['exercise_list']:
+ group_exercise_marker[set['obj'].id]['end'] = len(data)
+
+ # Note: '+1' here because there's an emtpy cell between days
+ exercise_markers[day['obj'].id].append(len(data) + 1)
+ data.append([set_count,
+ Paragraph(exercise['obj'].name, styleSheet["Small"]),
+ exercise['setting_text']])
+ set_count += 1
+
+ data.append([''])
+ group_day_marker[day['obj'].id]['end'] = len(data)
+
+ # Set the widths and heights of rows and columns
+ # Note: 'None' is treated as 'automatic'. Either there is only one value for the whole list
+ # or exactly one for every row/column
+ colwidths = None
+ rowheights = [None] * len(data)
+
+ table_style = [('FONT', (0, 0), (-1, -1), 'OpenSans'),
+ ('FONTSIZE', (0, 0), (-1, -1), 8),
+ ('VALIGN', (0, 0), (-1, -1), 'MIDDLE'),
+
+ # Note: a padding of 3 seems to be the default
+ ('LEFTPADDING', (0, 0), (-1, -1), 2),
+ ('RIGHTPADDING', (0, 0), (-1, -1), 0),
+ ('TOPPADDING', (0, 0), (-1, -1), 3),
+ ('BOTTOMPADDING', (0, 0), (-1, -1), 2), ]
+
+ # Set specific styles, e.g. background for title cells
+ for marker in day_markers:
+ # Set background colour for headings
+ table_style.append(('BACKGROUND', (0, marker), (-1, marker), header_colour))
+ table_style.append(('BOX', (0, marker), (-1, marker), 1.25, colors.black))
+
+ # Make the headings span the whole width
+ table_style.append(('SPAN', (0, marker), (-1, marker)))
+
+ # Manually set
+ rowheights[marker - 1] = 5
+
+ # Combine the cells for exercises on the same set
+ counter = 1
+ for marker in group_exercise_marker:
+ counter += 1
+ start_marker = group_exercise_marker[marker]['start']
+ end_marker = group_exercise_marker[marker]['end']
+
+ table_style.append(('SPAN', (0, start_marker), (0, end_marker)))
+ table_style.append(('BOX',
+ (0, start_marker),
+ (-1, end_marker),
+ 0.25,
+ colors.black))
+
+ if counter % 2:
+ table_style.append(('BACKGROUND',
+ (0, start_marker),
+ (-1, end_marker),
+ colors.lavender))
+
+ for marker in group_day_marker:
+ start_marker = group_day_marker[marker]['start']
+ end_marker = group_day_marker[marker]['end']
+
+ table_style.append(('BOX',
+ (0, start_marker),
+ (-1, end_marker - 2),
+ 1.25,
+ colors.black))
+
+ # Set the table data
+ if data:
+ t = Table(data, colwidths, rowheights, style=table_style)
+
+ # Manually set the width of the columns
+ t._argW[0] = 0.6 * cm # Numbering
+ t._argW[1] = 9 * cm # Exercise
+ t._argW[2] = 4 * cm # Repetitions
+
+ # There is nothing to output
+ else:
+ t = Paragraph(_('<i>This is an empty workout, what did you expect on the PDF?</i>'),
+ styleSheet["Normal"])
+
+ #
+ # Add all elements to the document
+ #
+
+ # Set the title (if available)
+ if workout.comment:
+ p = Paragraph('<para align="center"><strong>%(description)s</strong></para>' %
+ {'description': workout.comment},
+ styleSheet["Bold"])
+ elements.append(p)
+
+ # Filler
+ p = Paragraph('<para> </para>', styleSheet["Normal"])
+ elements.append(p)
+
+ # Append the table
+ elements.append(t)
+
+ # Footer, add filler paragraph
+ p = Paragraph('<para> </para>', styleSheet["Normal"])
+ elements.append(p)
+
+ # Print date and info
+ created = datetime.date.today().strftime("%d.%m.%Y")
+ url = reverse('workout-view', kwargs={'id': workout.id})
+ p = Paragraph('''<para align="left">
+ %(date)s -
+ <a href="%(url)s">%(url)s</a> -
+ %(created)s
+ %(version)s
+ </para>''' %
+ {'date': _("Created on the <b>%s</b>") % created,
+ 'created': "wger Workout Manager",
+ 'version': get_version(),
+ 'url': request.build_absolute_uri(url), },
+ styleSheet["Normal"])
+ elements.append(p)
+
+ # write the document and send the response to the browser
+ doc.build(elements)
+
+ # Create the HttpResponse object with the appropriate PDF headers.
+ response['Content-Disposition'] = 'attachment; filename=Workout-{0}-table.pdf'.format(id)
response['Content-Length'] = len(response.content)
return response
diff --git a/wger/manager/templates/mobile/workout/view.html b/wger/manager/templates/mobile/workout/view.html
index 2351dfec3..dd52d30a7 100644
--- a/wger/manager/templates/mobile/workout/view.html
+++ b/wger/manager/templates/mobile/workout/view.html
@@ -124,10 +124,9 @@ $( document ).off("pageinit").on("pageinit", function() {
<h3>{% trans "Options" %}</h3>
-<a href="{% url 'wger.manager.pdf.workout_log' workout.id %}"
+<a href="#export-pdf-link"
data-role="button"
- data-ajax="false"
- class="pdf-button">
+ data-rel="popup">
<img src="{% static 'images/icons/save.svg' %}"
width="32"
height="32"
@@ -213,4 +212,27 @@ an appointment for each training day with the appropriate exercises.{% endblockt
</p>
</div>
</div>
+
+<div data-role="popup"
+ id="export-pdf-link"
+ data-overlay-theme="a">
+ <div data-role="header" data-theme="b">
+ <h3>{% trans "Download as PDF" %}</h3>
+ </div>
+ <div role="main" class="ui-content">
+ <a href="{% url 'workout-pdf-log' workout.id %}"
+ data-role="button"
+ data-ajax="false"
+ class="pdf-button">
+ {% trans "Log" %}
+ </a>
+
+ <a href="{% url 'workout-pdf-table' workout.id %}"
+ data-role="button"
+ data-ajax="false"
+ class="pdf-button">
+ {% trans "Table" %}
+ </a>
+ </div>
+</div>
{% endblock %}
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index ea4d6ec3f..92d03fc82 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -116,14 +116,15 @@ $(document).ready(function() {
<h3>{% trans "Options" %}</h3>
<p>
-<a href="{% url 'wger.manager.pdf.workout_log' workout.id %}">
<img src="{% static 'images/icons/save.svg' %}"
width="32"
height="32"
alt="{% trans 'Download as PDF' %}"
title="{% trans 'Download as PDF' %}">
- {% trans "Download as PDF" %}
-</a>
+ {% trans "Download as PDF" %}:
+ <a href="{% url 'workout-pdf-log' workout.id %}">{% trans "Log" %}</a>
+ |
+ <a href="{% url 'workout-pdf-table' workout.id %}">{% trans "Table" %}</a>
</p>
<p>
diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.py
index 71ded713f..106e92ee5 100644
--- a/wger/manager/tests/test_pdf.py
+++ b/wger/manager/tests/test_pdf.py
@@ -17,7 +17,7 @@ from django.core.urlresolvers import reverse
from wger.manager.tests.testcase import WorkoutManagerTestCase
-class WorkoutPdfExportTestCase(WorkoutManagerTestCase):
+class WorkoutPdfLogExportTestCase(WorkoutManagerTestCase):
'''
Tests exporting a workout as a pdf
'''
@@ -28,17 +28,68 @@ class WorkoutPdfExportTestCase(WorkoutManagerTestCase):
'''
# Create a workout
- response = self.client.get(reverse('wger.manager.pdf.workout_log', kwargs={'id': 3}))
+ response = self.client.get(reverse('workout-pdf-log', kwargs={'id': 3}))
if fail:
self.assertIn(response.status_code, (404, 302))
else:
self.assertEqual(response.status_code, 200)
self.assertEqual(response['Content-Type'], 'application/pdf')
- self.assertEqual(response['Content-Disposition'], 'attachment; filename=Workout-3.pdf')
+ self.assertEqual(response['Content-Disposition'],
+ 'attachment; filename=Workout-3-log.pdf')
- # Approximate size, there's a timestamp in the document
- self.assertGreater(len(response.content), 3200)
+ # Approximate size only
+ self.assertGreater(int(response['Content-Length']), 31000)
+ self.assertLess(int(response['Content-Length']), 35000)
+
+ def test_export_pdf_anonymous(self):
+ '''
+ Tests exporting a workout as a pdf as an anonymous user
+ '''
+
+ self.export_pdf(fail=True)
+
+ def test_export_pdf_owner(self):
+ '''
+ Tests exporting a workout as a pdf as the owner user
+ '''
+
+ self.user_login('test')
+ self.export_pdf(fail=False)
+
+ def test_export_pdf_other(self):
+ '''
+ Tests exporting a workout as a pdf as a logged user not owning the data
+ '''
+
+ self.user_login('admin')
+ self.export_pdf(fail=True)
+
+
+class WorkoutPdfTableExportTestCase(WorkoutManagerTestCase):
+ '''
+ Tests exporting a workout as a pdf
+ '''
+
+ def export_pdf(self, fail=False):
+ '''
+ Helper function to test exporting a workout as a pdf
+ '''
+
+ # Create a workout
+ response = self.client.get(reverse('workout-pdf-table', kwargs={'id': 3}))
+
+ if fail:
+ self.assertIn(response.status_code, (404, 302))
+ else:
+ self.assertEqual(response.status_code, 200)
+ self.assertEqual(response['Content-Type'], 'application/pdf')
+ self.assertEqual(response['Content-Disposition'],
+ 'attachment; filename=Workout-3-table.pdf')
+
+ # Approximate size only
+ self.assertGreater(int(response['Content-Length']), 31000)
+ self.assertLess(int(response['Content-Length']), 35000)
def test_export_pdf_anonymous(self):
'''
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index f3bbacdd8..691e5f27f 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -26,9 +26,10 @@ from wger.manager.views import log
from wger.manager.views import set
from wger.manager.views import day
from wger.manager.views import workout_session
+from wger.manager import pdf
-urlpatterns = patterns('wger.manager.views',
+urlpatterns = patterns('',
# Workout
url(r'^workout/overview$',
@@ -47,7 +48,7 @@ urlpatterns = patterns('wger.manager.views',
workout.WorkoutDeleteView.as_view(),
name='workout-delete'),
url(r'^workout/(?P<id>\d+)/view/$',
- 'workout.view',
+ workout.view,
name='workout-view'),
url(r'^workout/(?P<pk>\d+)/log/$',
log.WorkoutLogDetailView.as_view(),
@@ -70,6 +71,13 @@ urlpatterns = patterns('wger.manager.views',
url(r'^workout/(?P<pk>\d+)/ical$',
ical.export,
name='workout-ical'),
+ # PDF
+ url(r'^workout/(?P<id>\d+)/pdf/log$',
+ pdf.workout_log,
+ name='workout-pdf-log'),
+ url(r'^workout/(?P<id>\d+)/pdf/table$',
+ pdf.workout_view,
+ name='workout-pdf-table'),
# Workout session
url(r'^workout/session/(?P<workout_pk>\d+)/add/(?P<year>\d{4})-(?P<month>\d{1,2})-(?P<day>\d{1,2})$',
@@ -128,7 +136,8 @@ urlpatterns = patterns('wger.manager.views',
url(r'^workout/day/(?P<pk>\d+)/delete/$',
day.delete,
name='day-delete'),
- url(r'^workout/day/(?P<id>\d+)/view/$', 'day.view'),
+ url(r'^workout/day/(?P<id>\d+)/view/$',
+ day.view),
url(r'^workout/day/(?P<pk>\d+)/log/add/$',
log.add,
name='day-log'),
@@ -140,16 +149,12 @@ urlpatterns = patterns('wger.manager.views',
url(r'^workout/get-formset/(?P<exercise_pk>\d+)/(?P<reps>\d+)/',
set.get_formset,
name='set-get-formset'), # Used by JS
- url(r'^workout/set/(?P<pk>\d+)/delete$', 'set.delete'),
+ url(r'^workout/set/(?P<pk>\d+)/delete$',
+ set.delete),
url(r'^workout/set/(?P<pk>\d+)/edit/$',
set.edit,
name='set-edit'),
# AJAX
url(r'^workout/api/edit-set$', set.api_edit_set),
-)
-
-# PDF stuff is in a different file
-urlpatterns = urlpatterns + patterns('wger.manager.pdf',
- url(r'^workout/(?P<id>\d+)/pdf/$', 'workout_log'))
-
+)
\ No newline at end of file
diff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.html
index 141151d23..24c6654f0 100644
--- a/wger/software/templates/changelog.html
+++ b/wger/software/templates/changelog.html
@@ -18,6 +18,8 @@
<li>New exercise overview, grouped by equipment</li>
<li>Add possibility to write comments and rate the workout</li>
<li>Simplify form for new exercises</li>
+ <li>Alternative PDF export of workout without table for entering logs</li>
+ <li>Unified way of specifying license of submitted content (exercises, etc.)</li>
</ul>