Merge branch 'develop' into feat/322-page-horaire

This commit is contained in:
2026-02-17 09:17:31 +01:00
12 changed files with 204 additions and 36 deletions

View File

@@ -31,6 +31,10 @@ class Site
#[Groups(['site:read', 'employee:read'])]
private string $color = '';
#[ORM\Column(type: 'integer', options: ['default' => 0])]
#[Groups(['site:read'])]
private int $displayOrder = 0;
public function getId(): ?int
{
return $this->id;
@@ -59,4 +63,16 @@ class Site
return $this;
}
public function getDisplayOrder(): int
{
return $this->displayOrder;
}
public function setDisplayOrder(int $displayOrder): self
{
$this->displayOrder = $displayOrder;
return $this;
}
}

View File

@@ -114,7 +114,8 @@ class AbsencePrintProvider implements ProviderInterface
->createQueryBuilder('e')
->leftJoin('e.site', 's')
->addSelect('s')
->orderBy('s.name', 'ASC')
->orderBy('s.displayOrder', 'ASC')
->addOrderBy('s.name', 'ASC')
->addOrderBy('e.displayOrder', 'ASC')
->addOrderBy('e.lastName', 'ASC')
->addOrderBy('e.firstName', 'ASC')