diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php index c29ac27be..c2ab59442 100644 --- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php +++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php @@ -26,146 +26,168 @@ use Psr\Cache\CacheItemPoolInterface; /** * Helper to some task linked to phonenumber. - * - * Currently, only Twilio is supported (https://www.twilio.com/lookup). A method + * + * Currently, only Twilio is supported (https://www.twilio.com/lookup). A method * allow to check if the helper is configured for validation. This should be used * before doing some validation. - * + * * */ class PhonenumberHelper { /** - * - * @var Client + * Twilio client */ - protected $twilioClient; + protected Client $twilioClient; /** - * - * @var LoggerInterface + * TRUE if the client is properly configured */ - protected $logger; - - /** - * - * @var CacheItemPoolInterface - */ - protected $cachePool; - + protected bool $isConfigured = false; + + protected LoggerInterface $logger; + + protected CacheItemPoolInterface $cachePool; + const LOOKUP_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s'; const FORMAT_URI = 'https://lookups.twilio.com/v1/PhoneNumbers/%s'; - - + public function __construct( CacheItemPoolInterface $cachePool, - $config, + $config, LoggerInterface $logger ) { $this->logger = $logger; $this->cachePool = $cachePool; - - if (\array_key_exists('twilio_sid', $config) + + if (\array_key_exists('twilio_sid', $config) && !empty($config['twilio_sid']) - && \array_key_exists('twilio_secret', $config) - && !empty($config['twilio_secret'])) { - + && strlen($config['twilio_sid']) > 2 + && \array_key_exists('twilio_secret', $config) + && !empty($config['twilio_secret']) + && strlen($config['twilio_secret']) > 2 + ) { + $this->twilioClient = new Client([ 'auth' => [ $config['twilio_sid'], $config['twilio_secret'] ] ]); - } + $this->isConfigured = TRUE; + } } - + /** * Return true if the validation is configured and available. - * + * * @return bool */ public function isPhonenumberValidationConfigured() : bool { - return NULL !== $this->twilioClient; + return $this->isConfigured; } - + /** - * REturn true if the phoennumber is a mobile phone. Return always false + * REturn true if the phoennumber is a mobile phone. Return always true * if the validation is not configured. - * + * * @param string $phonenumber * @return bool */ public function isValidPhonenumberMobile($phonenumber) : bool { - $validation = $this->performTwilioLookup($phonenumber); - - if (NULL === $validation) { - return false; + if (FALSE === $this->isPhonenumberValidationConfigured()) { + return true; } + $validation = $this->performTwilioLookup($phonenumber); + + if (NULL === $validation) { + return true; + } + return $validation === 'mobile'; } - + /** - * Return true if the phonenumber is a landline or voip phone. Return always false + * Return true if the phonenumber is a landline or voip phone. Return always true * if the validation is not configured. - * + * * @param string $phonenumber * @return bool */ public function isValidPhonenumberLandOrVoip($phonenumber) : bool { - $validation = $this->performTwilioLookup($phonenumber); - - if (NULL === $validation) { - return false; + if (FALSE === $this->isPhonenumberValidationConfigured()) { + return true; } + $validation = $this->performTwilioLookup($phonenumber); + + if (NULL === $validation) { + return true; + } + return \in_array($validation, [ 'landline', 'voip' ]); } - + /** - * Return true if the phonenumber is a landline or voip phone. Return always false + * Return true if the phonenumber is a landline or voip phone. Return always true * if the validation is not configured. - * + * * @param string $phonenumber * @return bool */ public function isValidPhonenumberAny($phonenumber) : bool { + if (FALSE === $this->isPhonenumberValidationConfigured()) { + return true; + } $validation = $this->performTwilioLookup($phonenumber); - +; if (NULL === $validation) { return false; } - + return \in_array($validation, [ 'landline', 'voip', 'mobile' ]); } - + + /** + * Get type (mobile, landline, ...) for phone number + * + * @param string $phonenumber + * + * @return string + */ + public function getType(string $phonenumber): string + { + return $this->performTwilioLookup($phonenumber) ?? 'unknown'; + } + public function format($phonenumber) { return $this->performTwilioFormat($phonenumber); } - + protected function performTwilioFormat($phonenumber) { if (FALSE === $this->isPhonenumberValidationConfigured()) { return $phonenumber; } - + // filter only number $filtered = \preg_replace("/[^0-9]/", "", $phonenumber); - + $item = $this->cachePool->getItem('pnum_format_nat_'.$filtered); - + if ($item->isHit()) { return $item->get(); } - + try { $response = $this->twilioClient->get(sprintf(self::FORMAT_URI, '+'.$filtered), [ 'http_errors' => true, ]); - + } catch (ClientException $e) { $response = $e->getResponse(); $this->logger->error("[phonenumber helper] Could not format number " @@ -174,7 +196,7 @@ class PhonenumberHelper "status_code" => $response->getStatusCode(), "phonenumber" => $phonenumber ]); - + return $phonenumber; } catch (ServerException $e) { $response = $e->getResponse(); @@ -184,7 +206,7 @@ class PhonenumberHelper "status_code" => $response->getStatusCode(), "phonenumber" => $phonenumber ]); - + return null; } catch (ConnectException $e) { $this->logger->error("[phonenumber helper] Could not format number " @@ -192,38 +214,38 @@ class PhonenumberHelper "message" => $e->getMessage(), "phonenumber" => $phonenumber ]); - + return null; } - + $format = \json_decode($response->getBody())->national_format; - + $item ->set($format) // expires after 3d ->expiresAfter(3600 * 24 * 3) ; - + $this->cachePool->save($item); - + return $format; } - + protected function performTwilioLookup($phonenumber) { if (FALSE === $this->isPhonenumberValidationConfigured()) { return null; } - + // filter only number $filtered = \preg_replace("/[^0-9]/", "", $phonenumber); - + $item = $this->cachePool->getItem('pnum_'.$filtered); - + if ($item->isHit()) { - return $item->get(); + //return $item->get(); } - + try { $response = $this->twilioClient->get(sprintf(self::LOOKUP_URI, '+'.$filtered), [ 'http_errors' => true, @@ -241,7 +263,7 @@ class PhonenumberHelper "status_code" => $response->getStatusCode(), "phonenumber" => $phonenumber ]); - + return null; } catch (ConnectException $e) { $this->logger->error("[phonenumber helper] Could not format number " @@ -249,20 +271,20 @@ class PhonenumberHelper "message" => $e->getMessage(), "phonenumber" => $phonenumber ]); - + return null; } - + $validation = \json_decode($response->getBody())->carrier->type; - + $item ->set($validation) // expires after 12h ->expiresAfter(3600 * 12) ; - + $this->cachePool->save($item); - + return $validation; } } diff --git a/src/Bundle/ChillMainBundle/Resources/public/sass/modules/_forms.scss b/src/Bundle/ChillMainBundle/Resources/public/sass/modules/_forms.scss index b01c802b6..dcffddec9 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/sass/modules/_forms.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/sass/modules/_forms.scss @@ -148,7 +148,6 @@ form { li { label { display: inline-block; - font-weight: normal; } } } diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php index f9fb98849..db2b8b9d1 100644 --- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php +++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php @@ -52,25 +52,24 @@ class PersonController extends AbstractController * @var SimilarPersonMatcher */ protected $similarPersonMatcher; - + /** * * @var TranslatorInterface */ protected $translator; - - + /** * @var EventDispatcherInterface */ protected $eventDispatcher; - + /** * * @var PersonRepository; */ protected $personRepository; - + /** * * @var ConfigPersonAltNamesHelper @@ -128,13 +127,13 @@ class PersonController extends AbstractController throw $this->createNotFoundException("Person with id $person_id not" . " found on this server"); } - + $this->denyAccessUnlessGranted('CHILL_PERSON_SEE', $person, "You are not allowed to see this person."); - + $event = new PrivacyEvent($person); $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event); - + return $this->render('ChillPersonBundle:Person:view.html.twig', array( "person" => $person, @@ -301,7 +300,7 @@ class PersonController extends AbstractController $r->setStatusCode(400); return $r; } - + $form = $this->createForm( //CreationPersonType::NAME, CreationPersonType::class, @@ -314,7 +313,7 @@ class PersonController extends AbstractController $form->handleRequest($request); $person = $this->_bindCreationForm($form); - + $errors = $this->_validatePersonAndAccompanyingPeriod($person); $this->logger->info(sprintf('Person created with %d errors ', count($errors))); diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php index 36993ce3b..c3a2edff6 100644 --- a/src/Bundle/ChillPersonBundle/Entity/Person.php +++ b/src/Bundle/ChillPersonBundle/Entity/Person.php @@ -72,7 +72,7 @@ class Person implements HasCenterInterface * @ORM\Column(type="string", length=255) */ private $lastName; - + /** * @var Collection * @@ -177,6 +177,18 @@ class Person implements HasCenterInterface */ private $mobilenumber = ''; + /** + * @var Collection + * + * @ORM\OneToMany( + * targetEntity="Chill\PersonBundle\Entity\PersonPhone", + * mappedBy="person", + * cascade={"persist", "remove", "merge", "detach"}, + * orphanRemoval=true + * ) + */ + private $otherPhoneNumbers; + //TO-ADD caseOpeningDate //TO-ADD nativeLanguag @@ -248,15 +260,14 @@ class Person implements HasCenterInterface * @ORM\OrderBy({"validFrom" = "DESC"}) */ private $addresses; - + /** * @var string * * @ORM\Column(type="text", nullable=true) */ private $fullnameCanonical; - - + /** * Person constructor. * @@ -268,6 +279,7 @@ class Person implements HasCenterInterface $this->spokenLanguages = new ArrayCollection(); $this->addresses = new ArrayCollection(); $this->altNames = new ArrayCollection(); + $this->otherPhoneNumbers = new ArrayCollection(); if ($opening === null) { $opening = new \DateTime(); @@ -285,7 +297,7 @@ class Person implements HasCenterInterface $accompanyingPeriod->setPerson($this); $this->accompanyingPeriods->add($accompanyingPeriod); } - + /** * @param AccompanyingPeriod $accompanyingPeriod */ @@ -476,7 +488,7 @@ class Person implements HasCenterInterface { return $this->lastName; } - + /** * @return Collection */ @@ -484,7 +496,7 @@ class Person implements HasCenterInterface { return $this->altNames; } - + /** * @param Collection $altNames * @return $this @@ -492,10 +504,10 @@ class Person implements HasCenterInterface public function setAltNames(Collection $altNames) { $this->altNames = $altNames; - + return $this; } - + /** * @param PersonAltName $altName * @return $this @@ -506,24 +518,24 @@ class Person implements HasCenterInterface $this->altNames->add($altName); $altName->setPerson($this); } - + return $this; } - + /** * @param PersonAltName $altName * @return $this */ - public function removeAltName(PersonAltName $altName) + public function removeAltName(PersonAltName $altName) { if ($this->altNames->contains($altName)) { $altName->setPerson(null); $this->altNames->removeElement($altName); } - + return $this; } - + /** * Set birthdate * @@ -760,7 +772,7 @@ class Person implements HasCenterInterface { return $this->nationality; } - + /** * @return string */ @@ -863,7 +875,53 @@ class Person implements HasCenterInterface { return $this->mobilenumber; } - + + /** + * @return Collection + */ + public function getOtherPhoneNumbers(): Collection + { + return $this->otherPhoneNumbers; + } + + /** + * @param Collection $otherPhoneNumbers + * @return $this + */ + public function setOtherPhoneNumbers(Collection $otherPhoneNumbers) + { + $this->otherPhoneNumbers = $otherPhoneNumbers; + + return $this; + } + + /** + * @param PersonPhone $otherPhoneNumber + * @return $this + */ + public function addOtherPhoneNumber(PersonPhone $otherPhoneNumber) + { + if (false === $this->otherPhoneNumbers->contains($otherPhoneNumber)) { + $otherPhoneNumber->setPerson($this); + $this->otherPhoneNumbers->add($otherPhoneNumber); + } + + return $this; + } + + /** + * @param PersonPhone $otherPhoneNumber + * @return $this + */ + public function removeOtherPhoneNumber(PersonPhone $otherPhoneNumber) + { + if ($this->otherPhoneNumbers->contains($otherPhoneNumber)) { + $this->otherPhoneNumbers->removeElement($otherPhoneNumber); + } + + return $this; + } + /** * @return string */ @@ -894,7 +952,7 @@ class Person implements HasCenterInterface { return $this->spokenLanguages; } - + /** * @param Address $address * @return $this @@ -905,7 +963,7 @@ class Person implements HasCenterInterface return $this; } - + /** * @param Address $address */ @@ -924,7 +982,7 @@ class Person implements HasCenterInterface { return $this->addresses; } - + /** * @param \DateTime|null $date * @return null diff --git a/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php new file mode 100644 index 000000000..4a2ffaf28 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Entity/PersonPhone.php @@ -0,0 +1,115 @@ +date = new \DateTime(); + } + + public function getId(): int + { + return $this->id; + } + + public function getPerson(): Person + { + return $this->person; + } + + public function setPerson(Person $person): void + { + $this->person = $person; + } + + public function getType(): string + { + return $this->type; + } + + public function setType(string $type): void + { + $this->type = $type; + } + + public function getPhonenumber(): string + { + return $this->phonenumber; + } + + public function setPhonenumber(string $phonenumber): void + { + $this->phonenumber = $phonenumber; + } + + public function getDescription(): ?string + { + return $this->description; + } + + public function setDescription(?string $description): void + { + $this->description = $description; + } + + public function getDate(): \DateTime + { + return $this->date; + } + + public function setDate(\DateTime $date): void + { + $this->date = $date; + } + + public function isEmpty(): bool + { + return empty($this->getDescription()) && empty($this->getPhonenumber()); + } +} diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php index be1be8124..d87fe0196 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php @@ -21,21 +21,24 @@ namespace Chill\PersonBundle\Form; +use Chill\CustomFieldsBundle\Form\Type\CustomFieldType; +use Chill\MainBundle\Form\Type\ChillCollectionType; +use Chill\MainBundle\Form\Type\ChillTextareaType; +use Chill\MainBundle\Form\Type\Select2CountryType; +use Chill\MainBundle\Form\Type\Select2LanguageType; +use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper; +use Chill\PersonBundle\Form\Type\GenderType; +use Chill\PersonBundle\Form\Type\PersonAltNameType; +use Chill\PersonBundle\Form\Type\PersonPhoneType; +use Chill\PersonBundle\Entity\PersonPhone; +use Chill\PersonBundle\Form\Type\Select2MaritalStatusType; use Symfony\Component\Form\AbstractType; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Form\Extension\Core\Type\TextType; use Symfony\Component\Form\Extension\Core\Type\DateType; use Symfony\Component\Form\Extension\Core\Type\EmailType; use Symfony\Component\Form\Extension\Core\Type\TelType; -use Chill\PersonBundle\Form\Type\GenderType; -use Chill\MainBundle\Form\Type\Select2CountryType; -use Chill\MainBundle\Form\Type\Select2LanguageType; -use Chill\CustomFieldsBundle\Form\Type\CustomFieldType; -use Chill\PersonBundle\Form\Type\Select2MaritalStatusType; -use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper; -use Chill\PersonBundle\Form\Type\PersonAltNameType; -use Chill\MainBundle\Form\Type\ChillTextareaType; +use Symfony\Component\Form\Extension\Core\Type\TextType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolver; class PersonType extends AbstractType { @@ -48,7 +51,7 @@ class PersonType extends AbstractType * @var string[] */ protected $config = array(); - + /** * * @var ConfigPersonAltNamesHelper @@ -80,13 +83,13 @@ class PersonType extends AbstractType ->add('gender', GenderType::class, array( 'required' => true )); - + if ($this->configAltNamesHelper->hasAltNames()) { $builder->add('altNames', PersonAltNameType::class, [ 'by_reference' => false ]); } - + if ($this->config['memo'] === 'visible') { $builder ->add('memo', ChillTextareaType::class, array('required' => false)) @@ -104,11 +107,25 @@ class PersonType extends AbstractType if ($this->config['phonenumber'] === 'visible') { $builder->add('phonenumber', TelType::class, array('required' => false)); } - + if ($this->config['mobilenumber'] === 'visible') { $builder->add('mobilenumber', TelType::class, array('required' => false)); } + $builder->add('otherPhoneNumbers', ChillCollectionType::class, [ + 'entry_type' => PersonPhoneType::class, + 'button_add_label' => 'Add new phone', + 'button_remove_label' => 'Remove phone', + 'required' => false, + 'allow_add' => true, + 'allow_delete' => true, + 'by_reference' => false, + 'label' => false, + 'delete_empty' => function(PersonPhone $pp = null) { + return NULL === $pp || $pp->isEmpty(); + } + ]); + if ($this->config['email'] === 'visible') { $builder->add('email', EmailType::class, array('required' => false)); } @@ -153,7 +170,7 @@ class PersonType extends AbstractType { $resolver->setDefaults(array( 'data_class' => 'Chill\PersonBundle\Entity\Person', - 'validation_groups' => array('general', 'creation') + 'validation_groups' => array('general', 'creation'), )); $resolver->setRequired(array( diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php new file mode 100644 index 000000000..f06d5cd72 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php @@ -0,0 +1,65 @@ +phonenumberHelper = $phonenumberHelper; + $this->em = $em; + } + + public function buildForm(FormBuilderInterface $builder, array $options) + { + $builder->add('phonenumber', TelType::class, [ + 'label' => 'Other phonenumber', + 'required' => true, + ]); + + $builder->add('description', TextType::class, [ + 'required' => false, + ]); + + $builder->addEventListener(FormEvents::POST_SUBMIT, function(FormEvent $event) { + if (NULL === $event->getData()) { + return; + } + + $oldPersonPhone = $this->em->getUnitOfWork() + ->getOriginalEntityData($event->getData()); + + if ($oldPersonPhone['phonenumber'] ?? null !== $event->getForm()->getData()->getPhonenumber()) { + $type = $this->phonenumberHelper->getType($event->getData()->getPhonenumber()); + $event->getData()->setType($type); + } + }); + } + + public function configureOptions(OptionsResolver $resolver) + { + $resolver + ->setDefaults([ + 'data_class' => PersonPhone::class, + 'validation_groups' => ['general', 'creation'], + ]) + ; + } +} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig index 62cc0c259..4546cc56d 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig @@ -83,6 +83,9 @@ {%- if form.mobilenumber is defined -%} {{ form_row(form.mobilenumber, {'label': 'Mobilenumber'}) }} {%- endif -%} + {%- if form.otherPhoneNumbers is defined -%} + {{ form_widget(form.otherPhoneNumbers) }} + {%- endif -%} {%- if form.contactInfo is defined -%} {{ form_row(form.contactInfo, {'label': 'Notes on contact information'}) }} {%- endif -%} diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig index 45c8cd1ed..796a7f82e 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig @@ -227,6 +227,17 @@ This view should receive those arguments:
{% if person.mobilenumber is not empty %}
{{ person.mobilenumber|chill_format_phonenumber }}
{% else %}{{ 'No data given'|trans }}{% endif %}
{% endif %} + {% for pp in person.otherPhoneNumbers %} +
{{ 'Other phonenumber'|trans }} :
+
+ 
{{ pp.phoneNumber|chill_format_phonenumber }}
 + {% if pp.description is not empty %} +
+ {{ pp.description|nl2br }} + {% endif %} +
+
+ {% endfor %} {%- if chill_person.fields.contact_info == 'visible' -%}
{{ 'Notes on contact information'|trans }} :
diff --git a/src/Bundle/ChillPersonBundle/config/services/form.yaml b/src/Bundle/ChillPersonBundle/config/services/form.yaml index 659421c8a..3b2a1095d 100644 --- a/src/Bundle/ChillPersonBundle/config/services/form.yaml +++ b/src/Bundle/ChillPersonBundle/config/services/form.yaml @@ -22,7 +22,7 @@ services: $closingMotiveRepository: '@Chill\PersonBundle\Repository\ClosingMotiveRepository' tags: - { name: form.type, alias: closing_motive } - + Chill\PersonBundle\Form\AccompanyingPeriodType: arguments: $config: "%chill_person.accompanying_period_fields%" @@ -39,10 +39,17 @@ services: - '@Symfony\Component\Translation\TranslatorInterface' tags: - { name: form.type } - + Chill\PersonBundle\Form\Type\PersonAltNameType: arguments: $configHelper: '@Chill\PersonBundle\Config\ConfigPersonAltNamesHelper' $translatableStringHelper: '@chill.main.helper.translatable_string' tags: - { name: form.type } + + Chill\PersonBundle\Form\Type\PersonPhoneType: + arguments: + $phonenumberHelper: '@Chill\MainBundle\Phonenumber\PhonenumberHelper' + $em: '@Doctrine\ORM\EntityManagerInterface' + tags: + - { name: form.type } diff --git a/src/Bundle/ChillPersonBundle/config/validation.yaml b/src/Bundle/ChillPersonBundle/config/validation.yaml index 814db0ee4..5bc37d710 100644 --- a/src/Bundle/ChillPersonBundle/config/validation.yaml +++ b/src/Bundle/ChillPersonBundle/config/validation.yaml @@ -51,8 +51,9 @@ Chill\PersonBundle\Entity\Person: - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint: type: mobile groups: [ general, creation ] - - + otherPhoneNumbers: + - Valid: + traverse: true constraints: - Callback: callback: isAccompanyingPeriodValid @@ -77,3 +78,14 @@ Chill\PersonBundle\Entity\AccompanyingPeriod: constraints: - Callback: callback: isDateConsistent + +Chill\PersonBundle\Entity\PersonPhone: + properties: + phonenumber: + - Regex: + pattern: '/^([\+{1}])([0-9\s*]{4,20})$/' + groups: [ general, creation ] + message: 'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33123456789' + - Chill\MainBundle\Validation\Constraint\PhonenumberConstraint: + type: any + groups: [ general, creation ] diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php b/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php new file mode 100644 index 000000000..3258bd351 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210318095831.php @@ -0,0 +1,36 @@ +addSql('CREATE SEQUENCE chill_person_phone_id_seq INCREMENT BY 1 MINVALUE 1 START 1'); + $this->addSql('CREATE TABLE chill_person_phone (id INT NOT NULL, person_id INT DEFAULT NULL, phonenumber TEXT NOT NULL, description TEXT DEFAULT NULL, date TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, PRIMARY KEY(id))'); + $this->addSql('CREATE INDEX IDX_72C1F87217BBB47 ON chill_person_phone (person_id)'); + $this->addSql('ALTER TABLE chill_person_phone ADD CONSTRAINT FK_72C1F87217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE'); + } + + public function down(Schema $schema) : void + { + // this down() migration is auto-generated, please modify it to your needs + $this->addSql('DROP SEQUENCE chill_person_phone_id_seq CASCADE'); + $this->addSql('DROP TABLE chill_person_phone'); + } +} diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php b/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php new file mode 100644 index 000000000..6e2f105df --- /dev/null +++ b/src/Bundle/ChillPersonBundle/migrations/Version20210325141540.php @@ -0,0 +1,31 @@ +addSql('ALTER TABLE chill_person_phone ADD type TEXT DEFAULT NULL'); + } + + public function down(Schema $schema) : void + { + // this down() migration is auto-generated, please modify it to your need + $this->addSql('ALTER TABLE chill_person_phone DROP type'); + } +} diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index f5d1bb0f5..aa940f7ee 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -40,6 +40,10 @@ Phonenumber: 'Numéro de téléphone' phonenumber: numéro de téléphone Mobilenumber: 'Numéro de téléphone portable' mobilenumber: numéro de téléphone portable +Other phonenumber: Autre numéro de téléphone +Description: description +Add new phone: Ajouter un numéro de téléphone +Remove phone: Supprimer 'Notes on contact information': 'Remarques sur les informations de contact' 'Remarks': 'Remarques' '{0} Born the %date% | {1} Born the %date%': '{0} Né le %date% | {1} Née le %date%'