From 5291956a317932e988afc28144b664c707d5ba41 Mon Sep 17 00:00:00 2001 From: Emanuele Date: Fri, 28 Nov 2025 12:06:28 +0100 Subject: [PATCH] Add assigned aircraft tp output excel --- cntmanage/flightslot/actions/exportweek.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/cntmanage/flightslot/actions/exportweek.py b/cntmanage/flightslot/actions/exportweek.py index c2e82ab..d0bb756 100644 --- a/cntmanage/flightslot/actions/exportweek.py +++ b/cntmanage/flightslot/actions/exportweek.py @@ -5,13 +5,12 @@ from openpyxl import Workbook from openpyxl.styles import Font, PatternFill, Alignment, Border, Side from openpyxl.utils import get_column_letter -from datetime import date, datetime -from typing import List - -from ..models.weekpref import WeekPreference from ..models.missions import Training +from ..models.weekpref import WeekPreference from ..models.hourbuildings import HourBuilding, HourBuildingLegFlight, HourBuildingLegStop, HourBuildingLegBase +from datetime import date, datetime +from typing import List def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) -> HttpResponse: @@ -83,8 +82,17 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) -> student_data: List[str] student_phone: str = q.student.phone if q.student.phone else "" student_email: str = q.student.email + student_course_type: str + student_course_number: str + student_course_ac: str if q.student.course: - student_data = [f"{q.student.surname} {q.student.name}", f"{q.student.course.ctype}-{q.student.course.cnumber}"] + student_course_type = q.student.course.ctype + student_course_number = str(q.student.course.cnumber) + student_course_ac = " / ".join(t.type for t in q.student.aircrafts.distinct("type").all()) + student_data = [ + f"{q.student.surname} {q.student.name}\n{student_course_ac}", + f"{student_course_type}-{student_course_number}" + ] else: student_data = [f"{q.student.surname} {q.student.name}", f"No Course Assigned"]