refix merge

Reviewed-on: #3

cntmanage/flightslot/actions/exportweek.py

@@ -57,7 +57,7 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) ->
     center = Alignment(horizontal="center", vertical="center", wrapText=True)
 
     # Cell styles 
-    border_thick: Side = Side(style='thick', color='000000')
+    border_thick: Side = Side(style='medium', color='000000')
     border_thin: Side = Side(style='thin', color='000000', border_style='dashed')
     border_bottom: Border = Border(bottom=border_thick)
     border_bottom_thin: Border = Border(bottom=border_thin)
@@ -78,9 +78,9 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) ->
     # Each of this iterations fills the table for a student
     row: int = 2
     row_offset: int = 0
-    for i, q in enumerate(queryset.order_by("week", "student__surname", "student__name", "student__course"), start=1):
+    for i, q in enumerate(queryset.order_by("-week", "student__surname", "student__name", "student__course"), start=1):
         student_data: List[str]
-        student_phone: str = q.student.phone if q.student.phone else ""
+        student_phone: str = str(q.student.phone) if q.student.phone else ""
         student_email: str = q.student.email
         student_course_type: str
         student_course_number: str
@@ -114,7 +114,7 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) ->
                 mission_name if t.saturday else "",
                 mission_name if t.sunday else ""
             ]
-            mission_notes = t.notes if t.notes else "--"
+            mission_notes = t.notes.strip() if t.notes else "--"
             mission_data.append([str(q.week), *student_data, *mission_days, mission_notes, student_phone, student_email, ])
 
         # Fill HourBuilding rows
@@ -132,7 +132,7 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) ->
                 hb_name if h.saturday else "",
                 hb_name if h.sunday else ""
             ]
-            hb_notes: List[str] = [f"{h.notes}", "---"] if h.notes else []
+            hb_notes: List[str] = [f"{h.notes.strip()}", "---"] if h.notes else []
             hb_legs_all = HourBuildingLegBase.objects.filter(hb_id = h.id)
             for hh in hb_legs_all:
                 time_str: str = ':'.join(str(hh.time).split(':')[:2]) # keep only hours and minutes
@@ -191,8 +191,7 @@ def export_selected(request: HttpRequest, queryset: QuerySet[WeekPreference]) ->
             ws.cell(row=student_end, column=c).border = Border(bottom=border_thick, right=border_thin)
             # And for last column also a vertical border all student high
             if c == mail_index:
-                for row_content in range(student_start, student_end + 1):
-                    ws.cell(row=row_content, column=c).border += border_right
+                ws.cell(row=student_end, column=c).border = Border(bottom=border_thick, right=border_thick)
 
         # Merge Week, thick border
         ws.cell(row=student_start, column=week_index).border = border_all