diff --git a/CHANGELOG.md b/CHANGELOG.md index 7637230db..3bd743078 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ and this project adheres to * [Person/Household list] when listing other simultaneous members of an household, exclude the members on person, not on members (avoid to show two membersship with the same person) * [draft periods] add a delete button (if acl granted) on each draft period listed on draft period page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/463) * [Person] Display suffixText in RenderPerson, PersonText.vue, RenderPersonBox.vue (was made for displaying "enfant confie") (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/441) +* [person] residential address: show residential address or info in PersonRenderBox, refactor Residential Address (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/439) +* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345) * [documents] Improve flex-table item-col placement when long buttons and long metadata * [thirdparty] Fix display of multiple contact badges so they wrap onto next line (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/482) * [confidential] Fix position of toggle button so it does not cover text nor fall outside of box (no issue) @@ -39,7 +41,6 @@ and this project adheres to * [person]: AddPersons: add suggestion of name when creating new person or thirdparty (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/422) * [main] Address: fix small bug: when modifying an address without street (isNoAddress), also check errors if street is an empty string as back-end change null value to empty string for street (and streetNumber) * [main] Address: stronger client-side validation of addresses (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/449) -* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345) * [person] accompanying course: filter suggested entities by open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/415) [activity] can click through the cross icon for removing person in concerned group (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476) [activity] correct associated persons by considering only open participations (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/476) diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js index 00ae02dc8..6ae44be41 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js +++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.js @@ -70,7 +70,8 @@ const messages = { }, holder: "Titulaire", years_old: "an | {n} an | {n} ans", - + residential_address: "Adresse de résidence", + located_at: "réside chez" } } }; diff --git a/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php b/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php new file mode 100644 index 000000000..b6c6106f1 --- /dev/null +++ b/src/Bundle/ChillMainBundle/migrations/Version20220217133607.php @@ -0,0 +1,38 @@ +addSql('ALTER TABLE IF EXISTS chill_person_residential_address RENAME TO chill_main_residential_address;'); + $this->addSql('ALTER SEQUENCE IF EXISTS chill_person_residential_address_id_seq RENAME TO chill_main_residential_address_id_seq;'); + } + + public function getDescription(): string + { + return 'Rename residential_address table'; + } + + public function up(Schema $schema): void + { + $this->addSql('ALTER TABLE IF EXISTS chill_main_residential_address RENAME TO chill_person_residential_address;'); + $this->addSql('ALTER SEQUENCE IF EXISTS chill_main_residential_address_id_seq RENAME TO chill_person_residential_address_id_seq;'); + } +} diff --git a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php index 8b266208a..f77a4150c 100644 --- a/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php +++ b/src/Bundle/ChillPersonBundle/Controller/ResidentialAddressController.php @@ -11,10 +11,10 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; -use Chill\MainBundle\Entity\ResidentialAddress; -use Chill\MainBundle\Form\Type\ResidentialAddressType; -use Chill\MainBundle\Repository\ResidentialAddressRepository; use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Entity\Person\ResidentialAddress; +use Chill\PersonBundle\Form\Type\ResidentialAddressType; +use Chill\PersonBundle\Repository\ResidentialAddressRepository; use Chill\PersonBundle\Security\Authorization\PersonVoter; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\Form\Extension\Core\Type\FormType; diff --git a/src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php similarity index 87% rename from src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php rename to src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php index 7763ea9d5..cb82f766a 100644 --- a/src/Bundle/ChillMainBundle/Entity/ResidentialAddress.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php @@ -9,24 +9,28 @@ declare(strict_types=1); -namespace Chill\MainBundle\Entity; +namespace Chill\PersonBundle\Entity\Person; +use Chill\MainBundle\Entity\Address; use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable; -use Chill\MainBundle\Repository\ResidentialAddressRepository; use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Repository\ResidentialAddressRepository; use Chill\ThirdPartyBundle\Entity\ThirdParty; use DateTimeImmutable; use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Serializer\Annotation\Groups; +use Symfony\Component\Serializer\Annotation\Context; /** * @ORM\Entity(repositoryClass=ResidentialAddressRepository::class) - * @ORM\Table(name="chill_main_residential_address") + * @ORM\Table(name="chill_person_residential_address") */ class ResidentialAddress { /** * @ORM\ManyToOne(targetEntity=Address::class) * @ORM\JoinColumn(nullable=true) + * @Groups({"read"}) */ private ?Address $address = null; @@ -37,18 +41,22 @@ class ResidentialAddress /** * @ORM\Column(type="datetime_immutable", nullable=true) + * @Groups({"read"}) */ private ?DateTimeImmutable $endDate = null; /** * @ORM\ManyToOne(targetEntity=Person::class) * @ORM\JoinColumn(nullable=true) + * @Groups({"read"}) + * @Context(normalizationContext={"groups"={"minimal"}}) */ private ?Person $hostPerson = null; /** * @ORM\ManyToOne(targetEntity=ThirdParty::class) * @ORM\JoinColumn(nullable=true) + * @Groups({"read"}) */ private ?ThirdParty $hostThirdParty = null; @@ -67,6 +75,7 @@ class ResidentialAddress /** * @ORM\Column(type="datetime_immutable") + * @Groups({"read"}) */ private ?DateTimeImmutable $startDate = null; diff --git a/src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php b/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php similarity index 91% rename from src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php rename to src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php index 0ebe47fef..b34395daf 100644 --- a/src/Bundle/ChillMainBundle/Form/Type/ResidentialAddressType.php +++ b/src/Bundle/ChillPersonBundle/Form/ResidentialAddressType.php @@ -9,10 +9,11 @@ declare(strict_types=1); -namespace Chill\MainBundle\Form\Type; +namespace Chill\PersonBundle\Form\Type; -use Chill\MainBundle\Entity\ResidentialAddress; -use Chill\PersonBundle\Form\Type\PickPersonDynamicType; +use Chill\MainBundle\Form\Type\CommentType; +use Chill\MainBundle\Form\Type\PickAddressType; +use Chill\PersonBundle\Entity\Person\ResidentialAddress; use Chill\ThirdPartyBundle\Form\Type\PickThirdpartyDynamicType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\DateType; diff --git a/src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php similarity index 54% rename from src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php rename to src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php index 05cdfdf6c..b5d64a31a 100644 --- a/src/Bundle/ChillMainBundle/Repository/ResidentialAddressRepository.php +++ b/src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php @@ -9,10 +9,14 @@ declare(strict_types=1); -namespace Chill\MainBundle\Repository; +namespace Chill\PersonBundle\Repository; -use Chill\MainBundle\Entity\ResidentialAddress; +use Chill\PersonBundle\Entity\Person; +use Chill\PersonBundle\Entity\Person\ResidentialAddress; +use DateTimeImmutable; use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository; +use Doctrine\DBAL\Types\Types; +use Doctrine\ORM\QueryBuilder; use Doctrine\Persistence\ManagerRegistry; /** @@ -28,6 +32,43 @@ class ResidentialAddressRepository extends ServiceEntityRepository parent::__construct($registry, ResidentialAddress::class); } + /** + * @param Person $person + * @param DateTimeImmutable|null $at + * @return array|ResidentialAddress[]|null + */ + public function findCurrentResidentialAddressByPerson(Person $person, ?DateTimeImmutable $at = null): array + { + return $this->buildQueryFindCurrentResidentialAddresses($person, $at) + ->select('ra') + ->getQuery() + ->getResult(); + } + + public function buildQueryFindCurrentResidentialAddresses(Person $person, ?DateTimeImmutable $at = null): QueryBuilder + { + $date = null === $at ? new DateTimeImmutable('today') : $at; + $qb = $this->createQueryBuilder('ra'); + + + + $dateFilter = $qb->expr()->andX( + $qb->expr()->lte('ra.startDate', ':dateIn'), + $qb->expr()->orX( + $qb->expr()->isNull('ra.endDate'), + $qb->expr()->gte('ra.endDate', ':dateIn') + ) + ); + + $qb + ->where($dateFilter) + ->setParameter('dateIn', $date, Types::DATE_IMMUTABLE) + ->andWhere('ra.person = :person') + ->setParameter('person', $person); + + return $qb; + } + // /** // * @return ResidentialAddress[] Returns an array of ResidentialAddress objects // */ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue index f77f006db..f2cf1f7bd 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue @@ -126,7 +126,53 @@ + + +
+
+
+
    +
  • + +
    + + +

    ({{ $t('renderbox.residential_address') }})

    +
    +
    +

    {{ $t('renderbox.located_at') }}:

    + + + + + +
    +
    +

    {{ $t('renderbox.located_at') }}:

    + + + + + +
    + +
    • +
+
+
@@ -159,6 +205,7 @@ import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRe import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue'; import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue'; import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue'; +import ThirdPartyText from 'ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyText.vue'; export default { name: "PersonRenderBox", @@ -166,9 +213,28 @@ export default { AddressRenderBox, Confidential, BadgeEntity, - PersonText + PersonText, + ThirdPartyText + }, + props: { + person: { + required: true, + }, + options: { + type: Object, + required: false, + }, + render: { + type: String, + }, + returnPath: { + type: String, + }, + showResidentialAddresses: { + type: Boolean, + default: false, + } }, - props: ['person', 'options', 'render', 'returnPath'], computed: { isMultiline: function() { if(this.options.isMultiline){ diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue index e007ee94d..366ecd6b7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue @@ -15,6 +15,7 @@ addNoData: true, isMultiline: true }" + :show-residential-addresses="true" > diff --git a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig index 69e12f36d..4cba32e47 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/ResidentialAddress/list.html.twig @@ -62,7 +62,7 @@
  • {{ "Address of"|trans}} - {{ a.hostThirdParty|chill_entity_render_box }} + {{ a.hostThirdParty|chill_entity_render_box }}
  • {% if a.hostThirdParty.address is not null %} diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php index b95cc60a8..b42e30ff6 100644 --- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php +++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php @@ -18,11 +18,13 @@ use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension; use Chill\PersonBundle\Entity\Person; use Chill\PersonBundle\Entity\PersonAltName; use Chill\PersonBundle\Repository\PersonRepository; +use Chill\PersonBundle\Repository\ResidentialAddressRepository; use DateTime; use DateTimeImmutable; use Doctrine\Common\Collections\Collection; use libphonenumber\PhoneNumber; use Symfony\Component\Serializer\Exception\UnexpectedValueException; +use Symfony\Component\Serializer\Normalizer\AbstractNormalizer; use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface; use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait; use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface; @@ -49,15 +51,19 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar private PersonRepository $repository; + private ResidentialAddressRepository $residentialAddressRepository; + public function __construct( ChillEntityRenderExtension $render, PersonRepository $repository, CenterResolverManagerInterface $centerResolverManager, + ResidentialAddressRepository $residentialAddressRepository, PhoneNumberHelperInterface $phoneNumberHelper ) { $this->render = $render; $this->repository = $repository; $this->centerResolverManager = $centerResolverManager; + $this->residentialAddressRepository = $residentialAddressRepository; $this->phoneNumberHelper = $phoneNumberHelper; } @@ -180,27 +186,39 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar */ public function normalize($person, $format = null, array $context = []) { + $groups = $context[AbstractNormalizer::GROUPS] ?? []; $household = $person->getCurrentHousehold(); + $currentResidentialAddresses = $this->residentialAddressRepository->findCurrentResidentialAddressByPerson($person); - return [ + $data = [ 'type' => 'person', 'id' => $person->getId(), 'text' => $this->render->renderString($person, ['addAge' => false]), 'textAge' => $this->render->renderString($person, ['addAge' => true]), 'firstName' => $person->getFirstName(), 'lastName' => $person->getLastName(), + 'current_household_address' => $this->normalizer->normalize($person->getCurrentHouseholdAddress(), $format, $context), 'birthdate' => $this->normalizer->normalize($person->getBirthdate(), $format, $context), 'deathdate' => $this->normalizer->normalize($person->getDeathdate(), $format, $context), 'age' => $this->normalizer->normalize($person->getAge(), $format, $context), - 'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context), 'phonenumber' => $this->normalizer->normalize($person->getPhonenumber()), 'mobilenumber' => $this->normalizer->normalize($person->getMobilenumber()), 'email' => $person->getEmail(), - 'altNames' => $this->normalizeAltNames($person->getAltNames()), 'gender' => $person->getGender(), - 'current_household_address' => $this->normalizer->normalize($person->getCurrentHouseholdAddress(), $format, $context), - 'current_household_id' => $household ? $this->normalizer->normalize($household->getId(), $format, $context) : null, ]; + + if (in_array("minimal", $groups) && 1 === count($groups)) { + return $data; + } + + return array_merge($data, [ + 'centers' => $this->normalizer->normalize($this->centerResolverManager->resolveCenters($person), $format, $context), + 'altNames' => $this->normalizeAltNames($person->getAltNames()), + 'current_household_id' => $household ? $this->normalizer->normalize($household->getId(), $format, $context) : null, + 'current_residential_addresses' => $currentResidentialAddresses ? + $this->normalizer->normalize($currentResidentialAddresses, $format, $context) : + null, + ]); } public function supportsDenormalization($data, $type, $format = null) diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue new file mode 100644 index 000000000..621a9f8b8 --- /dev/null +++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue @@ -0,0 +1,29 @@ + + +