Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'upgrade-sf5' of gitlab.com:Chill-Projet/chill-bundles into upgrade-sf5

Browse Source
This commit is contained in:
Julie Lenaerts 2024-04-30 16:21:06 +02:00
commit 43c846d02e
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
View File

@ -85,7 +85,7 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
*/ */
#[Assert\Valid(traverse: true)] #[Assert\Valid(traverse: true)]
#[ORM\OneToMany(targetEntity: EntityWorkflowStep::class, mappedBy: 'entityWorkflow', orphanRemoval: true, cascade: ['persist'])] #[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; private Collection $steps;
/** /**

13
src/Bundle/ChillPersonBundle/Entity/Household/Household.php
View File

@ -40,7 +40,7 @@ class Household implements HasCentersInterface
#[Serializer\Groups(['write'])] #[Serializer\Groups(['write'])]
#[ORM\ManyToMany(targetEntity: Address::class, cascade: ['persist', 'remove', 'merge', 'detach'])] #[ORM\ManyToMany(targetEntity: Address::class, cascade: ['persist', 'remove', 'merge', 'detach'])]
#[ORM\JoinTable(name: 'chill_person_household_to_addresses')] #[ORM\JoinTable(name: 'chill_person_household_to_addresses')]
#[ORM\OrderBy(['validFrom' => Criteria::DESC, 'id' => 'DESC'])] #[ORM\OrderBy(['validFrom' => 'DESC', 'id' => 'DESC'])]
private Collection $addresses; private Collection $addresses;
#[ORM\Embedded(class: CommentEmbeddable::class, columnPrefix: 'comment_members_')] #[ORM\Embedded(class: CommentEmbeddable::class, columnPrefix: 'comment_members_')]
@ -592,14 +592,15 @@ class Household implements HasCentersInterface
} }
#[Assert\Callback] #[Assert\Callback]
public function validate(ExecutionContextInterface $context, $payload) public function validate(ExecutionContextInterface $context, $payload): void
{ {
$addresses = $this->getAddresses(); $addresses = $this->getAddressesOrdered();
$cond = true;
for ($i = 0; \count($addresses) - 1 > $i; ++$i) { for ($i = 0; \count($addresses) - 1 > $i; ++$i) {
if ($addresses[$i]->getValidFrom() !== $addresses[$i + 1]->getValidTo()) { if ($i === 0) {
$cond = false; 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.') $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') ->atPath('addresses')
->addViolation(); ->addViolation();

1
src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig
View File

@ -19,7 +19,6 @@
<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1> <h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
<div class="col-md col-xxl"> <div class="col-md col-xxl">
<h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
{% include "@ChillPerson/PersonResource/form.html.twig" %} {% include "@ChillPerson/PersonResource/form.html.twig" %}
</div> </div>
{% endblock %} {% endblock %}

8
src/Bundle/ChillPersonBundle/translations/messages.fr.yml
View File

@ -250,9 +250,9 @@ Concerned scopes: Services concernés
# person resource # person resource
person_resources_menu: "Personnes ressources" person_resources_menu: "Personnes ressources"
Person resources: "Personnes ressources de l'usager" Person resources: "Personnes ressources de l'usager"
Add a person resource: "Ajouter une person ressource" Add a person resource: "Ajouter une personne ressource"
edit resource: "Modifier la ressource" edit resource: "Modifier la personne ressource"
Remove resource: "Supprimer la 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%? 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." The resource has been successfully removed.: "La ressource a été supprimée."
List of resources: "Liste des personnes ressources" 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 New residential address: Nouvelle adresse de résidence
Host person: Choisir l'adresse d'un usager 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 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 The residential address was updated successfully: L'adresse de résidence a été mise à jour
Residential addresses: Adresses de résidence Residential addresses: Adresses de résidence
Address of: Adresse de Address of: Adresse de