Self hosted FLOSS fitness/workout, nutrition and weight tracker
Give the PDFs a visual upgrade
Roland Geider2eed1e019c24
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.pyindex 7ddf1d393..33ff2d415 100644--- a/wger/manager/helpers.py+++ b/wger/manager/helpers.py@@ -37,7 +37,11 @@ from reportlab.platypus import (# wgerfrom wger.utils.helpers import normalize_decimal-from wger.utils.pdf import styleSheet+from wger.utils.pdf import (+ header_colour,+ row_color,+ styleSheet+)def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_table=False):@@ -66,20 +70,13 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_taday_markers = []group_exercise_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)-set_count = 1day_markers.append(len(data))p = Paragraph(u'<para align="center">%(days)s: %(description)s</para>' %{'days': day['days_of_week']['text'],'description': day['obj'].description},- styleSheet["Bold"])+ styleSheet["SubHeader"])data.append([p])@@ -138,7 +135,7 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_tabulletFontSize=3,start='square')]- data.append([set_count,+ data.append([f"#{set_count}",exercise_content,setting_out]+ [''] * nr_of_weeks)@@ -176,7 +173,7 @@ def render_workout_day(day, nr_of_weeks=7, images=False, comments=False, only_ta# listfor i in range(exercise_start, len(data) + 1):if not i % 2:- table_style.append(('BACKGROUND', (1, i - 1), (-1, i - 1), colors.lavender))+ table_style.append(('BACKGROUND', (0, i - 1), (-1, i - 1), row_color))# Put everything together and manually set some of the widthst = Table(data, style=table_style)diff --git a/wger/manager/tests/test_pdf.py b/wger/manager/tests/test_pdf.pyindex 1ec8b32b3..1ff0d1760 100644--- a/wger/manager/tests/test_pdf.py+++ b/wger/manager/tests/test_pdf.py@@ -43,8 +43,8 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):'attachment; filename=Workout-3-log.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def export_pdf_token_wrong(self):"""@@ -75,8 +75,8 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):'attachment; filename=Workout-3-log.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def export_pdf_with_comments(self, fail=False):"""@@ -95,8 +95,8 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):'attachment; filename=Workout-3-log.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def export_pdf_with_images(self, fail=False):"""@@ -115,8 +115,8 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):'attachment; filename=Workout-3-log.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def export_pdf_with_images_and_comments(self, fail=False):"""@@ -136,8 +136,8 @@ class WorkoutPdfLogExportTestCase(WgerTestCase):'attachment; filename=Workout-3-log.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def test_export_pdf_anonymous(self):"""@@ -191,8 +191,8 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):'attachment; filename=Workout-3-table.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def export_pdf_token_wrong(self):"""@@ -224,8 +224,8 @@ class WorkoutPdfTableExportTestCase(WgerTestCase):'attachment; filename=Workout-3-table.pdf')# Approximate size only- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 35000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def test_export_pdf_anonymous(self):"""diff --git a/wger/manager/views/pdf.py b/wger/manager/views/pdf.pyindex 47b750f7b..f51ea284d 100644--- a/wger/manager/views/pdf.py+++ b/wger/manager/views/pdf.py@@ -39,6 +39,7 @@ from wger.manager.helpers import render_workout_dayfrom wger.manager.models import Workoutfrom wger.utils.helpers import check_tokenfrom wger.utils.pdf import (+ get_logo,render_footer,styleSheet)@@ -87,12 +88,16 @@ def workout_log(request, id, images=False, comments=False, uidb64=None, token=No# container for the 'Flowable' objectselements = []+ # Add site logo+ elements.append(get_logo())+ elements.append(Spacer(10 * cm, 0.5 * cm))+# Set the titlep = Paragraph('<para align="center"><strong>%(description)s</strong></para>' %{'description': workout},styleSheet["HeaderBold"])elements.append(p)- elements.append(Spacer(10 * cm, 0.5 * cm))+ elements.append(Spacer(10 * cm, 1.5 * cm))# Iterate through the Workout and render the training daysfor day in workout.canonical_representation['day_list']:@@ -154,12 +159,16 @@ def workout_view(request, id, images=False, comments=False, uidb64=None, token=N# container for the 'Flowable' objectselements = []+ # Add site logo+ elements.append(get_logo())+ elements.append(Spacer(10 * cm, 0.5 * cm))+# Set the titlep = Paragraph('<para align="center"><strong>%(description)s</strong></para>' %{'description': workout},styleSheet["HeaderBold"])elements.append(p)- elements.append(Spacer(10 * cm, 0.5 * cm))+ elements.append(Spacer(10 * cm, 1.5 * cm))# Iterate through the Workout and render the training daysfor day in workout.canonical_representation['day_list']:diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.pyindex aca200638..26098a6f5 100644--- a/wger/nutrition/tests/test_pdf.py+++ b/wger/nutrition/tests/test_pdf.py@@ -47,8 +47,8 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):'attachment; filename=nutritional-plan.pdf')# Approximate size- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 34000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def export_pdf(self, fail=False):"""@@ -68,8 +68,8 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):'attachment; filename=nutritional-plan.pdf')# Approximate size- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 34000)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)# Create an empty planuser = User.objects.get(pk=2)@@ -90,8 +90,8 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):'attachment; filename=nutritional-plan.pdf')# Approximate size- self.assertGreater(int(response['Content-Length']), 29000)- self.assertLess(int(response['Content-Length']), 33420)+ self.assertGreater(int(response['Content-Length']), 38000)+ self.assertLess(int(response['Content-Length']), 42000)def test_export_pdf_anonymous(self):"""diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.pyindex fb676b6d6..70fdc5a4a 100644--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@ -15,7 +15,6 @@# You should have received a copy of the GNU Affero General Public License# Standard Library-import datetimeimport logging# Django@@ -55,7 +54,6 @@ from reportlab.platypus import ()# wger-from wger import get_versionfrom wger.nutrition.models import (MEALITEM_WEIGHT_GRAM,MEALITEM_WEIGHT_UNIT,@@ -70,7 +68,13 @@ from wger.utils.helpers import (make_token)from wger.utils.language import load_language-from wger.utils.pdf import styleSheet+from wger.utils.pdf import (+ get_logo,+ header_colour,+ render_footer,+ row_color,+ styleSheet+)logger = logging.getLogger(__name__)@@ -254,16 +258,10 @@ def export_pdf(request, id, uidb64=None, token=None):# Create the PDF object, using the response object as its "file."doc = SimpleDocTemplate(response,pagesize=A4,- title=_('Nutrition plan'),+ title=_('Nutritional plan'),author='wger Workout Manager',- subject=_('Nutritional plan %s') % request.user.username)-- # Background colour for header- # 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)+ subject=_('Nutritional plan for %s') % request.user.username,+ topMargin=1 * cm,)# container for the 'Flowable' objectselements = []@@ -283,13 +281,13 @@ def export_pdf(request, id, uidb64=None, token=None):if not meal.time:p = Paragraph(u'<para align="center"><strong>{nr} {meal_nr}</strong></para>'.format(nr=_('Nr.'), meal_nr=i),- styleSheet["Normal"])+ styleSheet["SubHeader"])else:p = Paragraph(u'<para align="center"><strong>'u'{nr} {meal_nr} - {meal_time}'u'</strong></para>'.format(nr=_('Nr.'), meal_nr=i, meal_time=meal.time.strftime("%H:%M")),- styleSheet["Normal"])+ styleSheet["SubHeader"])data.append([p])# Ingredients@@ -300,10 +298,13 @@ def export_pdf(request, id, uidb64=None, token=None):if item.get_unit_type() == MEALITEM_WEIGHT_GRAM:unit_name = 'g'else:- unit_name = ' ' + item.weight_unit.unit.name+ unit_name = ' × ' + item.weight_unit.unit.name++ data.append([Paragraph(u"{0:.0f}{1}".format(item.amount, unit_name),+ styleSheet["Normal"]), p])- data.append([Paragraph(u"{0}{1}".format(item.amount, unit_name), styleSheet["Normal"]),- p])+ # Add filler+ data.append([Spacer(1 * cm, 0.6 * cm)])# Set general table stylestable_style = []@@ -322,22 +323,27 @@ def export_pdf(request, id, uidb64=None, token=None):t = Table(data, style=table_style)# Manually set the width of the columns- t._argW[0] = 2.5 * cm+ t._argW[0] = 3.5 * cm# There is nothing to outputelse:t = Paragraph(_('<i>This is an empty plan, what did you expect on the PDF?</i>'),styleSheet["Normal"])+ # Add site logo+ elements.append(get_logo())+ elements.append(Spacer(10 * cm, 0.5 * cm))+# Set the title (if available)if plan.description:+p = Paragraph('<para align="center"><strong>%(description)s</strong></para>' %{'description': plan.description},- styleSheet["Bold"])+ styleSheet["HeaderBold"])elements.append(p)# Filler- elements.append(Spacer(10 * cm, 0.5 * cm))+ elements.append(Spacer(10 * cm, 1.5 * cm))# append the table to the documentelements.append(t)@@ -346,7 +352,7 @@ def export_pdf(request, id, uidb64=None, token=None):# Create table with nutritional calculationsdata = []data.append([Paragraph(u'<para align="center">{0}</para>'.format(_('Nutritional data')),- styleSheet["Bold"])])+ styleSheet["SubHeaderBlack"])])data.append([Paragraph(_('Macronutrients'), styleSheet["Normal"]),Paragraph(_('Total'), styleSheet["Normal"]),Paragraph(_('Percent of energy'), styleSheet["Normal"]),@@ -364,7 +370,7 @@ def export_pdf(request, id, uidb64=None, token=None):styleSheet["Normal"]),Paragraph(str(plan_data['per_kg']['carbohydrates']),styleSheet["Normal"])])- data.append([Paragraph(_('Sugar content in carbohydrates'), styleSheet["Normal"]),+ data.append([Paragraph(" " + _('Sugar content in carbohydrates'), styleSheet["Normal"]),Paragraph(str(plan_data['total']['carbohydrates_sugar']),styleSheet["Normal"])])data.append([Paragraph(_('Fat'), styleSheet["Normal"]),@@ -384,30 +390,22 @@ def export_pdf(request, id, uidb64=None, token=None):table_style.append(('GRID', (0, 0), (-1, -1), 0.40, colors.black))table_style.append(('SPAN', (0, 0), (-1, 0))) # Titletable_style.append(('SPAN', (1, 2), (-1, 2))) # Energy+ table_style.append(('BACKGROUND', (0, 3), (-1, 3), row_color)) # Protein+ table_style.append(('BACKGROUND', (0, 4), (-1, 4), row_color)) # Carbohydratestable_style.append(('SPAN', (1, 5), (-1, 5))) # Sugar+ table_style.append(('LEFTPADDING', (0, 5), (0, 5), 15))+ table_style.append(('BACKGROUND', (0, 6), (-1, 6), row_color)) # Fatstable_style.append(('SPAN', (1, 7), (-1, 7))) # Saturated fats+ table_style.append(('LEFTPADDING', (0, 7), (0, 7), 15))table_style.append(('SPAN', (1, 8), (-1, 8))) # Fibrestable_style.append(('SPAN', (1, 9), (-1, 9))) # Sodiumt = Table(data, style=table_style)- t._argW[0] = 5 * cm+ t._argW[0] = 6 * cmelements.append(t)# Footer, date and infoelements.append(Spacer(10 * cm, 0.5 * cm))- created = datetime.date.today().strftime("%d.%m.%Y")- url = reverse('nutrition:plan:view', kwargs={'id': plan.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)+ elements.append(render_footer(request.build_absolute_uri(plan.get_absolute_url())))doc.build(elements)response['Content-Disposition'] = 'attachment; filename=nutritional-plan.pdf'diff --git a/wger/software/static/pdf/nutrition-plan-pdf-1.4-en.pdf b/wger/software/static/pdf/nutrition-plan-pdf-1.4-en.pdfdeleted file mode 100644index 950b4ac28..000000000Binary files a/wger/software/static/pdf/nutrition-plan-pdf-1.4-en.pdf and /dev/null differdiff --git a/wger/software/static/pdf/workout-pdf-1.4-en.pdf b/wger/software/static/pdf/workout-pdf-1.4-en.pdfdeleted file mode 100644index 0258e1543..000000000Binary files a/wger/software/static/pdf/workout-pdf-1.4-en.pdf and /dev/null differdiff --git a/wger/utils/pdf.py b/wger/utils/pdf.pyindex 79a450234..f0f5388b6 100644--- a/wger/utils/pdf.py+++ b/wger/utils/pdf.py@@ -22,13 +22,19 @@ from django.core.exceptions import ObjectDoesNotExistfrom django.utils import translation# Third Party+from reportlab.lib import colors+from reportlab.lib.colors import HexColorfrom reportlab.lib.styles import (ParagraphStyle,StyleSheet1)+from reportlab.lib.units import cmfrom reportlab.pdfbase import pdfmetricsfrom reportlab.pdfbase.ttfonts import TTFont-from reportlab.platypus import Paragraph+from reportlab.platypus import (+ Image,+ Paragraph+)# wgerfrom wger import get_version@@ -93,18 +99,29 @@ def render_footer(url, date=None):"""if not date:date = datetime.date.today().strftime("%d.%m.%Y")- p = Paragraph("""<para>- {date} -- <a href="{url}">{url}</a> -- wger Workout Manager- {version}- </para>""".format(date=date,- url=url,- version=get_version()),- styleSheet["Normal"])++ p = Paragraph("""<para>+ {date} -+ <a href="{url}">{url}</a> -+ wger Workout Manager+ {version}+ </para>""".format(date=date,+ url=url,+ version=get_version()),+ styleSheet["Normal"])return p+def get_logo(width=1.5):+ """+ Returns the wger logo+ """+ image = Image(path_join(settings.SITE_ROOT, 'core/static/images/logos/logo.png'))+ image.drawHeight = width * cm * image.drawHeight / image.drawWidth+ image.drawWidth = width * cm+ return image++# register new truetype fonts for reportlabpdfmetrics.registerFont(TTFont('OpenSans', path_join(settings.SITE_ROOT, 'core/static/fonts/OpenSans-Light.ttf')))@@ -136,17 +153,21 @@ styleSheet.add(ParagraphStyle(styleSheet.add(ParagraphStyle(parent=styleSheet['Normal'],name='HeaderBold',- fontSize=14,+ fontSize=16,fontName='OpenSans-Bold',))styleSheet.add(ParagraphStyle(parent=styleSheet['Normal'],name='SubHeader',- fontSize=12,- fontName='OpenSans',+ fontName='OpenSans-Bold',+ textColor=colors.white))styleSheet.add(ParagraphStyle(parent=styleSheet['Normal'],- name='Bold',+ name='SubHeaderBlack',fontName='OpenSans-Bold',+ textColor=colors.black))++header_colour = HexColor(0x24416b)+row_color = HexColor(0xd1def0)