Self hosted FLOSS fitness/workout, nutrition and weight tracker
First round of fixing the PDF export views
Roland Geider70be92336fd2
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex ffb9e594c..209e1f8d4 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -32,6 +32,8 @@ from reportlab.platypus import ()# wger+from wger.exercises.models import Exercise+from wger.manager.dataclasses import WorkoutDayDatafrom wger.manager.models import Routinefrom wger.utils.cache import CacheKeyMapperfrom wger.utils.pdf import (@@ -41,11 +43,17 @@ from wger.utils.pdf import ()-def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_table=False):+def render_workout_day(+ day_data: WorkoutDayData,+ nr_of_weeks=7,+ images=False,+ comments=False,+ only_table=False,+):"""Render a table with reportlab with the contents of the training day- :param day: a workout day object+ :param day_data: a workout day object:param nr_of_weeks: the numbrer of weeks to render, default is 7:param images: boolean indicating whether to also draw exercise imagesin the PDF (actually only the main image)@@ -70,14 +78,19 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_taset_count = 1day_markers.append(len(data))- p = Paragraph(- '<para align="center">%(days)s: %(description)s</para>'- % {'days': day.days_txt, 'description': day.description},- styleSheet['SubHeader'],+ data.append(+ [+ Paragraph(+ f'<para align="center">{day_data.day.name if not day_data.day.is_rest else _("Rest day")}</para>',+ styleSheet['SubHeader'],+ ),+ # Paragraph(+ # f'<para align="center">{day_data.day.description}</para>',+ # styleSheet['SubHeader'],+ # )+ ])- data.append([p])-# Note: the _('Date') will be on the 3rd cell, but since we make a span# over 3 cells, the value has to be on the 1st onedata.append([_('Date') + ' ', '', ''] + [''] * nr_of_weeks)@@ -85,31 +98,24 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta# Setsexercise_start = len(data)- for set_obj in day.set_set.all():- group_exercise_marker[set_obj.id] = {'start': len(data), 'end': len(data)}+ slot_count = 0+ for slot in day_data.slots_display_mode:+ slot_count += 1++ group_exercise_marker[slot_count] = {'start': len(data), 'end': len(data)}- # Exercises- for base in set_obj.exercise_bases:- exercise = base.get_translation()- group_exercise_marker[set_obj.id]['end'] = len(data)+ for slot_set in slot.sets:+ # TODO+ exercise = Exercise.objects.get(pk=slot_set.exercise)+ group_exercise_marker[slot_count]['end'] = len(data)# Process the settings- setting_out = []- for i in set_obj.reps_smart_text(base).split('–'):- setting_out.append(Paragraph(i, styleSheet['Small'], bulletText=''))-- # Collect a list of the exercise comments- item_list = [Paragraph('', styleSheet['Small'])]- if comments:- item_list = [- ListItem(Paragraph(i.comment, style=styleSheet['ExerciseComments']))- for i in exercise.exercisecomment_set.all()- ]+ slot_entries_out = [Paragraph(slot_set.text_repr, styleSheet['Small'], bulletText='')]# Add the exercise's main imageimage = Paragraph('', styleSheet['Small'])if images:- if base.main_image:+ if exercise.main_image:# Make the images somewhat larger when printing only the workout and not# also the columns for weight logsif only_table:@@ -117,26 +123,17 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_taelse:image_size = 1.5- image = Image(base.main_image.image)+ image = Image(exercise.main_image.image)image.drawHeight = image_size * cm * image.drawHeight / image.drawWidthimage.drawWidth = image_size * cm# Put the name and images and comments togetherexercise_content = [- Paragraph(exercise.name, styleSheet['Small']),+ Paragraph(exercise.get_translation().name, styleSheet['Small']),image,- ListFlowable(- item_list,- bulletType='bullet',- leftIndent=5,- spaceBefore=7,- bulletOffsetY=-3,- bulletFontSize=3,- start='square',- ),]- data.append([f'#{set_count}', exercise_content, setting_out] + [''] * nr_of_weeks)+ data.append([f'#{set_count}', exercise_content, slot_entries_out] + [''] * nr_of_weeks)set_count += 1table_style = [@@ -174,16 +171,21 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_tatable_style.append(('BACKGROUND', (0, i - 1), (-1, i - 1), row_color))# Put everything together and manually set some of the widths- t = Table(data, style=table_style)- if len(t._argW) > 1:- if only_table:- t._argW[0] = 0.6 * cm # Numbering- t._argW[1] = 8 * cm # Exercise- t._argW[2] = 3.5 * cm # Repetitions- else:- t._argW[0] = 0.6 * cm # Numbering- t._argW[1] = 4 * cm # Exercise- t._argW[2] = 3 * cm # Repetitions+ if only_table:+ col_widths = [+ 0.6 * cm, # Numbering+ 7 * cm, # Exercise+ 7 * cm, # Repetitions+ ]+ else:+ col_widths = [+ 0.6 * cm, # Numbering+ 6 * cm, # Exercise+ 6 * cm, # Repetitions+ 1.5 * cm, # Logs+ ]++ t = Table(data, style=table_style, colWidths=col_widths)return KeepTogether(t)diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.pyindex 117f8aa1c..999ff8053 100644--- a/wger/manager/tests/test_pdf.py+++ b/wger/manager/tests/test_pdf.py@@ -21,49 +21,16 @@ from wger.core.tests.base_testcase import WgerTestCasefrom wger.utils.helpers import make_token-class WorkoutPdfLogExportTestCase(WgerTestCase):+class RoutinePdfLogExportTestCase(WgerTestCase):"""- Tests exporting a workout as a pdf+ Tests exporting a routine as a PDF - logs"""- def export_pdf_token(self):- """- Helper function to test exporting a workout as a pdf using tokens- """-- user = User.objects.get(username='test')- uid, token = make_token(user)- response = self.client.get(- reverse('manager:workout:pdf-log', kwargs={'id': 3, 'uidb64': uid, 'token': token})- )-- self.assertEqual(response.status_code, 200)- self.assertEqual(response['Content-Type'], 'application/pdf')- self.assertEqual(response['Content-Disposition'], 'attachment; filename=Workout-3-log.pdf')-- # Approximate size only- self.assertGreater(int(response['Content-Length']), 38000)- self.assertLess(int(response['Content-Length']), 42000)-- def export_pdf_token_wrong(self):- """- Helper function to test exporting a workout as a pdf using a wrong token- """-- uid = 'AB'- token = 'abc-11223344556677889900'- response = self.client.get(- reverse('manager:workout:pdf-log', kwargs={'id': 3, 'uidb64': uid, 'token': token})- )-- self.assertEqual(response.status_code, 403)-def export_pdf(self, fail=False):"""- Helper function to test exporting a workout as a pdf+ Helper function to test exporting a routine as a pdf"""-- response = self.client.get(reverse('manager:workout:pdf-log', kwargs={'id': 3}))+ response = self.client.get(reverse('manager:routine:pdf-log', kwargs={'pk': 3}))if fail:self.assertIn(response.status_code, (403, 404, 302))@@ -72,7 +39,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):self.assertEqual(response['Content-Type'], 'application/pdf')self.assertEqual(response['Content-Disposition'],- 'attachment; filename=Workout-3-log.pdf',+ 'attachment; filename=Routine-3-log.pdf',)# Approximate size only@@ -85,7 +52,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):"""response = self.client.get(- reverse('manager:workout:pdf-log', kwargs={'id': 3, 'comments': 0})+ reverse('manager:routine:pdf-log', kwargs={'id': 3, 'comments': 0}))if fail:@@ -95,7 +62,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):self.assertEqual(response['Content-Type'], 'application/pdf')self.assertEqual(response['Content-Disposition'],- 'attachment; filename=Workout-3-log.pdf',+ 'attachment; filename=Routine-3-log.pdf',)# Approximate size only@@ -108,7 +75,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):"""response = self.client.get(- reverse('manager:workout:pdf-log', kwargs={'id': 3, 'images': 1})+ reverse('manager:routine:pdf-log', kwargs={'id': 3, 'images': 1}))if fail:@@ -118,7 +85,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):self.assertEqual(response['Content-Type'], 'application/pdf')self.assertEqual(response['Content-Disposition'],- 'attachment; filename=Workout-3-log.pdf',+ 'attachment; filename=Routine-3-log.pdf',)# Approximate size only@@ -131,7 +98,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):"""response = self.client.get(- reverse('manager:workout:pdf-log', kwargs={'id': 3, 'images': 1, 'comments': 1})+ reverse('manager:routine:pdf-log', kwargs={'id': 3, 'images': 1, 'comments': 1}))if fail:@@ -140,7 +107,7 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):self.assertEqual(response.status_code, 200)self.assertEqual(response['Content-Type'], 'application/pdf')self.assertEqual(- response['Content-Disposition'], 'attachment; filename=Workout-3-log.pdf'+ response['Content-Disposition'], 'attachment; filename=Routine-3-log.pdf')# Approximate size only@@ -153,8 +120,6 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):"""self.export_pdf(fail=True)- self.export_pdf_token()- self.export_pdf_token_wrong()def test_export_pdf_owner(self):"""@@ -163,8 +128,6 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):self.user_login('test')self.export_pdf(fail=False)- self.export_pdf_token()- self.export_pdf_token_wrong()def test_export_pdf_other(self):"""@@ -173,57 +136,19 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):self.user_login('admin')self.export_pdf(fail=True)- self.export_pdf_token()- self.export_pdf_token_wrong()-class WorkoutPdfTableExportTestCase(WgerTestCase):+class RoutinePdfTableExportTestCase(WgerTestCase):"""- Tests exporting a workout as a pdf+ Tests exporting a routine as a PDF - table"""- def export_pdf_token(self):- """- Helper function to test exporting a workout as a pdf using tokens- """-- user = User.objects.get(username='test')- uid, token = make_token(user)- response = self.client.get(- reverse('manager:workout:pdf-table', kwargs={'id': 3, 'uidb64': uid, 'token': token})- )-- 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']), 38000)- self.assertLess(int(response['Content-Length']), 42000)-- def export_pdf_token_wrong(self):- """- Helper function to test exporting a workout as a pdf using a wrong token- """-- uid = 'AB'- token = 'abc-11223344556677889900'- response = self.client.get(- reverse('manager:workout:pdf-table', kwargs={'id': 3, 'uidb64': uid, 'token': token})- )-- self.assertEqual(response.status_code, 403)-def export_pdf(self, fail=False):"""- Helper function to test exporting a workout as a pdf+ Helper function to test exporting a routine as a pdf"""- # Create a workout- response = self.client.get(reverse('manager:workout:pdf-table', kwargs={'id': 3}))+ response = self.client.get(reverse('manager:routine:pdf-table', kwargs={'pk': 3}))if fail:self.assertIn(response.status_code, (403, 404, 302))@@ -232,7 +157,7 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):self.assertEqual(response['Content-Type'], 'application/pdf')self.assertEqual(response['Content-Disposition'],- 'attachment; filename=Workout-3-table.pdf',+ 'attachment; filename=Routine-3-table.pdf',)# Approximate size only@@ -245,8 +170,6 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):"""self.export_pdf(fail=True)- self.export_pdf_token()- self.export_pdf_token_wrong()def test_export_pdf_owner(self):"""@@ -255,8 +178,6 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):self.user_login('test')self.export_pdf(fail=False)- self.export_pdf_token()- self.export_pdf_token_wrong()def test_export_pdf_other(self):"""@@ -265,5 +186,3 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):self.user_login('admin')self.export_pdf(fail=True)- self.export_pdf_token()- self.export_pdf_token_wrong()diff --git a/wger/manager/urls.py b/wger/manager/urls.pyindex e72df2442..e78af3e85 100644--- a/wger/manager/urls.py+++ b/wger/manager/urls.py@@ -36,6 +36,7 @@ from wger.manager.views import (workout_session,)+# sub patterns for workout logspatterns_log = [path(@@ -101,31 +102,6 @@ patterns_workout = [ical.export,name='ical',),- re_path(- r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',- pdf.workout_log,- name='pdf-log',- ), # JS!- re_path(- r'^(?P<id>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,33})$',- pdf.workout_log,- name='pdf-log',- ),- re_path(- r'^(?P<id>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)$',- pdf.workout_log,- name='pdf-log',- ),- path(- '<int:id>/pdf/log',- pdf.workout_log,- name='pdf-log',- ),- path(- '<int:pk>/pdf/table',- pdf.workout_view,- name='pdf-table',- ),]# sub patterns for workouts@@ -150,6 +126,16 @@ patterns_routine = [routine.copy_routine,name='copy',),+ path(+ '<int:pk>/pdf/log',+ pdf.workout_log,+ name='pdf-log',+ ),+ path(+ '<int:pk>/pdf/table',+ pdf.workout_view,+ name='pdf-table',+ ),]# sub patterns for workout sessionsdiff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.pyindex 5885bccc6..4c0a3b084 100644--- a/wger/manager/views/pdf.py+++ b/wger/manager/views/pdf.py@@ -26,7 +26,10 @@ from django.shortcuts import get_object_or_404from django.utils.translation import gettext as _# Third Party-from reportlab.lib.pagesizes import A4+from reportlab.lib.pagesizes import (+ A4,+ landscape,+)from reportlab.lib.units import cmfrom reportlab.platypus import (Paragraph,@@ -36,8 +39,7 @@ from reportlab.platypus import (# wgerfrom wger.manager.helpers import render_workout_day-from wger.manager.models import Workout-from wger.utils.helpers import check_token+from wger.manager.models import Routinefrom wger.utils.pdf import (get_logo,render_footer,@@ -48,27 +50,17 @@ from wger.utils.pdf import (logger = logging.getLogger(__name__)-def workout_log(request, id, images=False, comments=False, uidb64=None, token=None):+def workout_log(request, pk: int, images=False):"""- Generates a PDF with the contents of the given workout-- See also- * http://www.blog.pythonlibrary.org/2010/09/21/reportlab- * http://www.reportlab.com/apis/reportlab/dev/platypus.html+ Generates a PDF with the contents of the given routine"""- comments = bool(int(comments))+ comments = Falseimages = bool(int(images))# Load the workout- if uidb64 is not None and token is not None:- if check_token(uidb64, token):- workout = get_object_or_404(Workout, pk=id)- else:- return HttpResponseForbidden()- else:- if request.user.is_anonymous:- return HttpResponseForbidden()- workout = get_object_or_404(Workout, pk=id, user=request.user)+ if request.user.is_anonymous:+ return HttpResponseForbidden()+ routine = get_object_or_404(Routine, pk=pk, user=request.user)# Create the HttpResponse object with the appropriate PDF headers.response = HttpResponse(content_type='application/pdf')@@ -76,7 +68,7 @@ def workout_log(request, id, images=False, comments=False, uidb64=None, token=No# Create the PDF object, using the response object as its "file."doc = SimpleDocTemplate(response,- pagesize=A4,+ pagesize=landscape(A4),# pagesize = landscape(A4),leftMargin=cm,rightMargin=cm,@@ -96,34 +88,34 @@ def workout_log(request, id, images=False, comments=False, uidb64=None, token=No# Set the titlep = Paragraph(- f'<para align="center"><strong>{workout.name}</strong></para>', styleSheet['HeaderBold']+ f'<para align="center"><strong>{routine.name}</strong></para>', styleSheet['HeaderBold'])elements.append(p)elements.append(Spacer(10 * cm, 0.5 * cm))- if workout.description:- p = Paragraph(f'<para align="center">{workout.description}</para>')+ if routine.description:+ p = Paragraph(f'<para align="center">{routine.description}</para>')elements.append(p)elements.append(Spacer(10 * cm, 1.5 * cm))# Iterate through the Workout and render the training days- for day in workout.day_set.all():- elements.append(render_workout_day(day, images=images, comments=comments))+ for day_data in routine.data_for_iteration():+ elements.append(render_workout_day(day_data, images=images, comments=comments))elements.append(Spacer(10 * cm, 0.5 * cm))# Footer, date and infoelements.append(Spacer(10 * cm, 0.5 * cm))- elements.append(render_footer(request.build_absolute_uri(workout.get_absolute_url())))+ elements.append(render_footer(request.build_absolute_uri(routine.get_absolute_url())))# write the document and send the response to the browserdoc.build(elements)# Create the HttpResponse object with the appropriate PDF headers.- response['Content-Disposition'] = f'attachment; filename=Workout-{id}-log.pdf'+ response['Content-Disposition'] = f'attachment; filename=Routine-{pk}-log.pdf'response['Content-Length'] = len(response.content)return response-def workout_view(request, id, images=False, comments=False, uidb64=None, token=None):+def workout_view(request, pk, images: bool = False):"""Generates a PDF with the contents of the workout, without table for logs"""@@ -133,19 +125,13 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N* http://www.blog.pythonlibrary.org/2010/09/21/reportlab* http://www.reportlab.com/apis/reportlab/dev/platypus.html"""- comments = bool(int(comments))+ comments = Falseimages = bool(int(images))- # Load the workout- if uidb64 is not None and token is not None:- if check_token(uidb64, token):- workout = get_object_or_404(Workout, pk=id)- else:- return HttpResponseForbidden()- else:- if request.user.is_anonymous:- return HttpResponseForbidden()- workout = get_object_or_404(Workout, pk=id, user=request.user)+ if request.user.is_anonymous:+ return HttpResponseForbidden()++ routine = get_object_or_404(Routine, pk=pk, user=request.user)# Create the HttpResponse object with the appropriate PDF headers.response = HttpResponse(content_type='application/pdf')@@ -172,25 +158,27 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N# Set the titlep = Paragraph(- '<para align="center"><strong>%(description)s</strong></para>' % {'description': workout},+ '<para align="center"><strong>%(description)s</strong></para>' % {'description': routine},styleSheet['HeaderBold'],)elements.append(p)elements.append(Spacer(10 * cm, 1.5 * cm))# Iterate through the Workout and render the training days- for day in workout.day_set.all():- elements.append(render_workout_day(day, images=images, comments=comments, only_table=True))+ for day_data in routine.data_for_iteration():+ elements.append(+ render_workout_day(day_data, images=images, comments=comments, only_table=True),+ )elements.append(Spacer(10 * cm, 0.5 * cm))# Footer, date and infoelements.append(Spacer(10 * cm, 0.5 * cm))- elements.append(render_footer(request.build_absolute_uri(workout.get_absolute_url())))+ elements.append(render_footer(request.build_absolute_uri(routine.get_absolute_url())))# write the document and send the response to the browserdoc.build(elements)# Create the HttpResponse object with the appropriate PDF headers.- response['Content-Disposition'] = f'attachment; filename=Workout-{id}-table.pdf'+ response['Content-Disposition'] = f'attachment; filename=Routine-{pk}-table.pdf'response['Content-Length'] = len(response.content)return responsediff --git a/wger/manager/views/routine.py b/wger/manager/views/routine.pyindex c25f33562..83d1f3fce 100644--- a/wger/manager/views/routine.py+++ b/wger/manager/views/routine.py@@ -34,6 +34,7 @@ from wger.manager.models import (SlotEntry,)+logger = logging.getLogger(__name__)diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.pyindex 372ae41cd..f17a9f9a4 100644--- a/wger/manager/views/workout_session.py+++ b/wger/manager/views/workout_session.py@@ -50,6 +50,7 @@ from wger.utils.generic_views import (WgerFormMixin,)+logger = logging.getLogger(__name__)"""Workout sessiondiff --git a/wger/utils/pdf.py b/wger/utils/pdf.pyindex f915a8657..d32ce9e0e 100644--- a/wger/utils/pdf.py+++ b/wger/utils/pdf.py@@ -24,6 +24,7 @@ from django.utils import translation# Third Partyfrom reportlab.lib import colorsfrom reportlab.lib.colors import HexColor+from reportlab.lib.enums import TA_CENTERfrom reportlab.lib.styles import (ParagraphStyle,StyleSheet1,@@ -73,11 +74,17 @@ def render_footer(url, date=None):if not date:date = datetime.date.today().strftime('%d.%m.%Y')+ style = ParagraphStyle(+ 'FooterStyle',+ parent=styleSheet['Normal'],+ alignment=TA_CENTER,+ )+p = Paragraph(f"""<para>- {date} - <a href="{url}">{url}</a> - wger Workout Manager {get_version()}+ {date} - <a href="{url}">{url}</a> - wger {get_version()}</para>""",- styleSheet['Normal'],+ style,)return p@@ -151,6 +158,15 @@ styleSheet.add(textColor=colors.white,))+styleSheet.add(+ ParagraphStyle(+ parent=styleSheet['Normal'],+ fontSize=7,+ name='SubHeaderSmall',+ fontName='OpenSans-Bold',+ textColor=colors.white,+ )+)styleSheet.add(ParagraphStyle(parent=styleSheet['Normal'],