diff --git a/src/Form/Activity/ActivityAddForm.php b/src/Form/Activity/ActivityAddForm.php index 8d6333f..b4977da 100644 --- a/src/Form/Activity/ActivityAddForm.php +++ b/src/Form/Activity/ActivityAddForm.php @@ -51,14 +51,21 @@ $formBuilder->add('name', TextType::class) ->add('actor', EntityType::class, [ 'class' => ActorEntity::class, + 'group_by' => function ($choice) { + if ($choice->getActive()) { + return 'Actif'; + } + + return 'Inactif'; + }, 'choice_label' => 'displayName', 'required' => false, ]) ->add('status', ChoiceType::class, [ 'choices' => ActivityEntity::VALID_STATUS, - 'choice_label' => function($choice, $key, $value) { - return StatusEnum::STATUS_NAME[$choice]; - }, + 'choice_label' => function ($choice, $key, $value) { + return StatusEnum::STATUS_NAME[$choice]; + }, ]) ->add('startDate', DateType::class, [ 'required' => false, diff --git a/src/Form/Activity/ActivityEditForm.php b/src/Form/Activity/ActivityEditForm.php index 6917746..efbd142 100644 --- a/src/Form/Activity/ActivityEditForm.php +++ b/src/Form/Activity/ActivityEditForm.php @@ -13,9 +13,10 @@ class ActivityEditForm extends AbstractFormManager { + /** * Update fields with entity - * + * * @param ActivityEntity $activity * @return self */ @@ -30,7 +31,7 @@ 'realStartDate' => $activity->getRealStartDate(), 'realEndDate' => $activity->getRealEndDate(), ]); - + return $this; } @@ -50,7 +51,7 @@ $activity->setEndDate($data['endDate']); $activity->setRealStartDate($data['realStartDate']); $activity->setRealEndDate($data['realEndDate']); - + return $this; } @@ -70,6 +71,13 @@ $formBuilder->add('name', TextType::class) ->add('actor', EntityType::class, [ 'class' => ActorEntity::class, + 'group_by' => function ($choice) { + if ($choice->getActive()) { + return 'Actif'; + } + + return 'Inactif'; + }, 'choice_label' => 'displayName', 'required' => false, ])