diff --git a/ultron/tools/pdf_generator.py b/ultron/tools/pdf_generator.py index e254df4b60..7f8591fc20 100644 --- a/ultron/tools/pdf_generator.py +++ b/ultron/tools/pdf_generator.py @@ -7,7 +7,7 @@ from statistics import mean import pendulum import yaml from django.conf import settings -from django.db.models import Max, Q +from django.db.models import F, Max, Q from PIL import Image from reportlab.lib import colors @@ -16,8 +16,14 @@ from reportlab.lib.styles import getSampleStyleSheet from reportlab.lib.units import cm from reportlab.pdfgen.canvas import Canvas from reportlab.platypus import Paragraph, Table, TableStyle -from ultron.followup.models import (Accident, Chrono, HeightWeight, MindState, - Plan, Point) +from ultron.followup.models import ( + Accident, + Chrono, + HeightWeight, + MindState, + Plan, + Point +) from ultron.objective.models import Skill from ultron.people.models import Gymnast from ultron.planning.models import Event @@ -539,25 +545,14 @@ class GymnastReportDocument(PDFDocument): Q(plan__is_done=False) | Q(plan__date__gte=date.today()) ) + .annotate(plan_date=F("plan__date")) .order_by("-plan__date").distinct()[:6] ) - print(planified_skills) - - # Ne permet pas de récupérer que les skill, or je voudrais bien. - # planified_skills = ( - # Plan.objects.filter(gymnast=gymnast.id) - # .filter( - # Q(is_done=False) - # | Q(date__gte=date.today()) - # ) - # .order_by("-date")[:6] - # ) - if planified_skills: for planified_skill in planified_skills: self.add_new_line( - X, planified_skill.skill.short_label + " (" + planified_skill.skill.notation + ") for (todo: compute deadline)" + X, planified_skill.short_label + " (" + planified_skill.notation + ") for " + planified_skill.plan_date.strftime("%d-%m-%Y") ) else: self.add_new_line(