Feuilles de poste : ajouter le référent en en-tête
Nom + téléphone du référent du poste (Position.lead_account_id), juste sous le sous-titre (jour/lieu) — « Référent : à désigner » si aucun. Même source que le référent affiché à l'écran bénévole (volunteers.py:get_volunteer_planning). Vérifié : pytest (287 passés, dont les nouveaux tests avec/sans référent), ruff, alembic check — tous verts (pas de changement frontend, la feuille reste un simple téléchargement de PDF). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
2a2a0c23ca
commit
f1d88302a4
@@ -10,6 +10,7 @@ import uuid
|
||||
from collections import defaultdict
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Response
|
||||
from sqlalchemy.orm import aliased
|
||||
from sqlmodel import Session, select
|
||||
|
||||
from app.api.deps import get_edition
|
||||
@@ -77,12 +78,27 @@ def generate_position_sheets(
|
||||
continue
|
||||
shifts_by_position_day[(shift.position_id, shift.starts_at.date())].append(shift)
|
||||
|
||||
Referent = aliased(Volunteer)
|
||||
referent_rows = session.exec(
|
||||
select(Position.id, Referent)
|
||||
.join(Account, Account.id == Position.lead_account_id, isouter=True)
|
||||
.join(Referent, Referent.id == Account.volunteer_id, isouter=True)
|
||||
.where(Position.id.in_(position_ids))
|
||||
).all()
|
||||
referent_by_position: dict[uuid.UUID, Volunteer] = {
|
||||
pid: referent for pid, referent in referent_rows if referent is not None
|
||||
}
|
||||
|
||||
positions_by_id = {p.id: p for p in positions}
|
||||
sheets = [
|
||||
PositionDaySheet(
|
||||
|
||||
def _sheet(position_id: uuid.UUID, date: dt.date, day_shifts: list[Shift]) -> PositionDaySheet:
|
||||
referent = referent_by_position.get(position_id)
|
||||
return PositionDaySheet(
|
||||
position_name=positions_by_id[position_id].name,
|
||||
position_location=positions_by_id[position_id].location,
|
||||
date=date,
|
||||
referent_name=f"{referent.first_name} {referent.last_name}" if referent else None,
|
||||
referent_phone=referent.phone if referent else None,
|
||||
shifts=tuple(
|
||||
SheetShift(
|
||||
starts_at=s.starts_at,
|
||||
@@ -97,6 +113,9 @@ def generate_position_sheets(
|
||||
for s in sorted(day_shifts, key=lambda s: s.starts_at)
|
||||
),
|
||||
)
|
||||
|
||||
sheets = [
|
||||
_sheet(position_id, date, day_shifts)
|
||||
for (position_id, date), day_shifts in sorted(
|
||||
shifts_by_position_day.items(),
|
||||
key=lambda item: (positions_by_id[item[0][0]].name, item[0][1]),
|
||||
|
||||
Reference in New Issue
Block a user