From 73d6578a3a0fba16a48d2848578d995b7d493cef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 29 Apr 2024 15:28:24 +0200 Subject: [PATCH 1/3] Fix workflow configuration --- src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php index 6996eacea..be2676e35 100644 --- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php +++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php @@ -85,7 +85,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface */ #[Assert\Valid(traverse: true)] #[ORM\OneToMany(targetEntity: EntityWorkflowStep::class, mappedBy: 'entityWorkflow', orphanRemoval: true, cascade: ['persist'])] - #[ORM\OrderBy(['transitionAt' => Order::Ascending, 'id' => 'ASC'])] + #[ORM\OrderBy(['transitionAt' => 'ASC', 'id' => 'ASC'])] private Collection $steps; /** From 9a010f76cc8d382988fe2e9f79f271edca154251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 29 Apr 2024 15:28:44 +0200 Subject: [PATCH 2/3] Fix some translations (already existing in v2) --- .../Resources/views/PersonResource/create.html.twig | 1 - src/Bundle/ChillPersonBundle/translations/messages.fr.yml | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig index 2c36ae141..3071fe6e2 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig @@ -19,7 +19,6 @@

{{ 'Add a person resource'|trans }}

-

{{ 'Add a person resource'|trans }}

{% include "@ChillPerson/PersonResource/form.html.twig" %}
{% endblock %} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 013298ba5..7724eadae 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -250,9 +250,9 @@ Concerned scopes: Services concernés # person resource person_resources_menu: "Personnes ressources" Person resources: "Personnes ressources de l'usager" -Add a person resource: "Ajouter une person ressource" -edit resource: "Modifier la ressource" -Remove resource: "Supprimer la ressource" +Add a person resource: "Ajouter une personne ressource" +edit resource: "Modifier la personne ressource" +Remove resource: "Supprimer la personne ressource" Are you sure you want to remove the resource for "%name%" ?: Étes-vous sûr de vouloir supprimer cette ressource de %name%? The resource has been successfully removed.: "La ressource a été supprimée." List of resources: "Liste des personnes ressources" @@ -293,7 +293,7 @@ residential_address_new_address_explanation: Créer une nouvelle adresse. L'adre New residential address: Nouvelle adresse de résidence Host person: Choisir l'adresse d'un usager The new residential address was created successfully: La nouvelle adresse de résidence a été créée -Edit a residential address: Modifier l'addresse de résidence +Edit a residential address: Modifier l'adresse de résidence The residential address was updated successfully: L'adresse de résidence a été mise à jour Residential addresses: Adresses de résidence Address of: Adresse de From 0c75514ec48975a74a04c0f655bf56de210506ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Mon, 29 Apr 2024 15:53:08 +0200 Subject: [PATCH 3/3] Fix validation of household address history --- .../Entity/Household/Household.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php index fdea18901..543726eb2 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Household/Household.php +++ b/src/Bundle/ChillPersonBundle/Entity/Household/Household.php @@ -40,7 +40,7 @@ class Household implements HasCentersInterface #[Serializer\Groups(['write'])] #[ORM\ManyToMany(targetEntity: Address::class, cascade: ['persist', 'remove', 'merge', 'detach'])] #[ORM\JoinTable(name: 'chill_person_household_to_addresses')] - #[ORM\OrderBy(['validFrom' => Criteria::DESC, 'id' => 'DESC'])] + #[ORM\OrderBy(['validFrom' => 'DESC', 'id' => 'DESC'])] private Collection $addresses; #[ORM\Embedded(class: CommentEmbeddable::class, columnPrefix: 'comment_members_')] @@ -592,14 +592,15 @@ class Household implements HasCentersInterface } #[Assert\Callback] - public function validate(ExecutionContextInterface $context, $payload) + public function validate(ExecutionContextInterface $context, $payload): void { - $addresses = $this->getAddresses(); - $cond = true; + $addresses = $this->getAddressesOrdered(); for ($i = 0; \count($addresses) - 1 > $i; ++$i) { - if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) { - $cond = false; + if ($i === 0) { + continue; + } + if ($addresses[$i - 1]->getValidTo() !== $addresses[$i]->getValidFrom()) { $context->buildViolation('The address are not sequentials. The validFrom date of one address should be equal to the validTo date of the previous address.') ->atPath('addresses') ->addViolation();