Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-20 14:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix conflict + error on CommentType

Browse Source
This commit is contained in:
nobohan
2021-06-25 13:57:49 +02:00
parent 36eb247995 c23ada3533
commit aa5c7f333e
11 changed files with 520 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/Bundle/ChillPersonBundle/Form/PersonType.php
View File

@@ -34,9 +34,13 @@ use Chill\PersonBundle\Entity\PersonPhone;
use Chill\PersonBundle\Form\Type\Select2MaritalStatusType;
use Symfony\Component\Form\AbstractType;
use Chill\MainBundle\Form\Type\ChillDateType;
use Chill\MainBundle\Form\Type\CommentType;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Symfony\Component\Form\Extension\Core\Type\TelType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\Extension\Core\Type\IntegerType;
use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\DateType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -82,8 +86,19 @@ class PersonType extends AbstractType
->add('birthdate', ChillDateType::class, [
'required' => false,
])
->add('deathdate', DateType::class, [
'required' => false,
'input' => 'datetime_immutable',
'widget' => 'single_text'
])
->add('gender', GenderType::class, array(
'required' => true
))
->add('genderComment', CommentType::class, array(
'required' => false
))
->add('numberOfChildren', IntegerType::class, array(
'required' => false
));
if ($this->configAltNamesHelper->hasAltNames()) {
@@ -111,7 +126,12 @@ class PersonType extends AbstractType
}
if ($this->config['mobilenumber'] === 'visible') {
$builder->add('mobilenumber', TelType::class, array('required' => false));
$builder
->add('mobilenumber', TelType::class, array('required' => false))
->add('acceptSMS', CheckboxType::class, array(
'value' => false,
'required' => true
));
}
$builder->add('otherPhoneNumbers', ChillCollectionType::class, [
@@ -130,7 +150,9 @@ class PersonType extends AbstractType
]);
if ($this->config['email'] === 'visible') {
$builder->add('email', EmailType::class, array('required' => false));
$builder
->add('email', EmailType::class, array('required' => false))
->add('acceptEmail', CheckboxType::class, array('required' => false));
}
if ($this->config['country_of_birth'] === 'visible') {
@@ -153,9 +175,16 @@ class PersonType extends AbstractType
}
if ($this->config['marital_status'] === 'visible'){
$builder->add('maritalStatus', Select2MaritalStatusType::class, array(
'required' => false
));
$builder
->add('maritalStatus', Select2MaritalStatusType::class, array(
'required' => false
))
->add('maritalStatusDate', ChillDateType::class, array(
'required' => false
))
->add('maritalStatusComment', CommentType::class, array(
'required' => false
));
}
if($options['cFGroup']) {