Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-09-02 21:13:57 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix deprecations: use choices_as_values=true and flip content of the choice options

Browse Source
This commit is contained in:
nobohan
2018-04-04 17:54:17 +02:00
parent 95f32a8fcb
commit 4143e773b6
2 changed files with 72 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Form/ActivityType.php
View File

@@ -21,42 +21,42 @@ use Chill\ActivityBundle\Form\Type\TranslatableActivityReason;
class ActivityType extends AbstractType
{
use AppendScopeChoiceTypeTrait;
/**
* the user running this form
*
* @var User
*/
protected $user;
/**
*
* @var AuthorizationHelper
*/
protected $authorizationHelper;
/**
*
* @var ObjectManager
*/
protected $om;
/**
*
* @var TranslatableStringHelper
*/
protected $translatableStringHelper;
protected $timeChoices;
public function __construct(
TokenStorageInterface $tokenStorage,
AuthorizationHelper $authorizationHelper, ObjectManager $om,
TokenStorageInterface $tokenStorage,
AuthorizationHelper $authorizationHelper, ObjectManager $om,
TranslatableStringHelper $translatableStringHelper,
array $timeChoices
)
)
{
if (!$tokenStorage->getToken()->getUser() instanceof User) {
throw new \RuntimeException("you should have a valid user");
@@ -67,7 +67,7 @@ class ActivityType extends AbstractType
$this->translatableStringHelper = $translatableStringHelper;
$this->timeChoices = $timeChoices;
}
/**
* @param FormBuilderInterface $builder
* @param array $options
@@ -76,35 +76,36 @@ class ActivityType extends AbstractType
{
// handle times choices
$timeChoices = array();
foreach ($this->timeChoices as $e) {
$timeChoices[$e['label']] = $e['seconds'];
};
$durationTimeTransformer = new DateTimeToTimestampTransformer('GMT', 'GMT');
$durationTimeOptions = array(
'choices' => $timeChoices,
'choices_as_values' => true,
'placeholder' => 'Choose the duration',
);
$builder
->add('date', 'date', array(
'required' => true,
'widget' => 'single_text',
'required' => true,
'widget' => 'single_text',
'format' => 'dd-MM-yyyy')
)
->add('durationTime', ChoiceType::class, $durationTimeOptions)
->add('remark', 'textarea', array(
'required' => false,
'empty_data' => ''
))
))
->add('attendee', ChoiceType::class, array(
'expanded' => true,
'required' => false,
'choices_as_values' => true,
'choices' => array(
true => 'present',
false => 'not present'
'present' => true,
'not present' => false
)
))
->add('user')
@@ -118,44 +119,44 @@ class ActivityType extends AbstractType
'active_only' => true
))
;
$this->appendScopeChoices($builder, $options['role'],
$options['center'], $this->user, $this->authorizationHelper,
$this->appendScopeChoices($builder, $options['role'],
$options['center'], $this->user, $this->authorizationHelper,
$this->translatableStringHelper, $this->om);
$builder->get('durationTime')
->addModelTransformer($durationTimeTransformer);
$builder->get('durationTime')
->addEventListener(
FormEvents::PRE_SET_DATA,
FormEvents::PRE_SET_DATA,
function(FormEvent $formEvent) use (
$timeChoices,
$timeChoices,
$builder,
$durationTimeTransformer,
$durationTimeOptions
)
)
{
// set the timezone to GMT, and fix the difference between current and GMT
// the datetimetransformer will then handle timezone as GMT
$timezoneUTC = new \DateTimeZone('GMT');
/* @var $data \DateTime */
$data = $formEvent->getData() === NULL ?
$data = $formEvent->getData() === NULL ?
\DateTime::createFromFormat('U', 300) :
$formEvent->getData();
$seconds = $data->getTimezone()->getOffset($data);
$data->setTimeZone($timezoneUTC);
$data->add(new \DateInterval('PT'.$seconds.'S'));
// test if the timestamp is in the choices.
// test if the timestamp is in the choices.
// If not, recreate the field with the new timestamp
if (!in_array($data->getTimestamp(), $timeChoices)) {
// the data are not in the possible values. add them
$timeChoices[$data->format('H:i')] = $data->getTimestamp();
$form = $builder->create(
'durationTime',
ChoiceType::class,
'durationTime',
ChoiceType::class,
array_merge(
$durationTimeOptions,
array(
@@ -168,7 +169,7 @@ class ActivityType extends AbstractType
}
});
}
/**
* @param OptionsResolverInterface $resolver
*/
@@ -177,7 +178,7 @@ class ActivityType extends AbstractType
$resolver->setDefaults(array(
'data_class' => 'Chill\ActivityBundle\Entity\Activity'
));
$this->appendScopeChoicesOptions($resolver);
}