diff --git a/CHANGELOG.md b/CHANGELOG.md index 209bf858e..a7ad5b114 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to ## Unreleased +* [main] add order field to civility + * [main] change address format in case the country is France, in Address render box and address normalizer * [person] add validator for accompanying period with a test on social issues (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/76) * [activity] fix visibility for location diff --git a/src/Bundle/ChillMainBundle/Entity/Civility.php b/src/Bundle/ChillMainBundle/Entity/Civility.php index 48b2a7569..c91016a63 100644 --- a/src/Bundle/ChillMainBundle/Entity/Civility.php +++ b/src/Bundle/ChillMainBundle/Entity/Civility.php @@ -47,6 +47,11 @@ class Civility */ private array $name = []; + /** + * @ORM\Column(type="float", name="ordering", nullable=true, options={"default": 0.0}) + */ + private float $order = 0; + public function getAbbreviation(): array { return $this->abbreviation; @@ -67,6 +72,11 @@ class Civility return $this->name; } + public function getOrder(): ?float + { + return $this->order; + } + /** * @return Civility */ @@ -90,4 +100,11 @@ class Civility return $this; } + + public function setOrder(float $order): self + { + $this->order = $order; + + return $this; + } } diff --git a/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php b/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php new file mode 100644 index 000000000..012ab27d9 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20211213112628.php @@ -0,0 +1,36 @@ +addSql('ALTER TABLE chill_main_civility DROP "ordering"'); + } + + public function getDescription(): string + { + return 'Add order to civility'; + } + + public function up(Schema $schema): void + { + $this->addSql('ALTER TABLE chill_main_civility ADD "ordering" FLOAT DEFAULT 0.0'); + } +} diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php index 47baafe2b..99382dec2 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php @@ -197,7 +197,8 @@ class PersonType extends AbstractType }, 'query_builder' => static function (EntityRepository $er): QueryBuilder { return $er->createQueryBuilder('c') - ->where('c.active = true'); + ->where('c.active = true') + ->orderBy('c.order'); }, 'placeholder' => 'choose civility', 'required' => false,