2.58.7 New donation now uses dropdown for donor

classaxe · Sep 18, 2023 · 344e610 · 344e610
1 parent f6ad9cc
commit 344e610
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/Form/Base.php b/src/Form/Base.php
@@ -2,6 +2,7 @@
 namespace App\Form;
 
 use App\Repository\CountryRepository;
+use App\Repository\DonorRepository;
 use App\Repository\IcaoRepository;
 use App\Repository\ListenerRepository;
 use App\Repository\PaperRepository;
@@ -27,6 +28,7 @@ class Base extends AbstractType
     protected $translator;
 
     protected $countryRepository;
+    protected $donorRepository;
     protected $icaoRepository;
     protected $listenerRepository;
     protected $paperRepository;
@@ -41,6 +43,7 @@ class Base extends AbstractType
      *
      * Auto-wire these repositories:
      * @param CountryRepository $countryRepository
+     * @param DonorRepository $donorRepository
      * @param IcaoRepository $icaoRepository
      * @param ListenerRepository $listenerRepository
      * @param PaperRepository $paperRepository
@@ -53,6 +56,7 @@ public function __construct(
         TranslatorInterface $translator,
 
         CountryRepository $countryRepository,
+        DonorRepository $donorRepository,
         IcaoRepository $icaoRepository,
         ListenerRepository $listenerRepository,
         PaperRepository $paperRepository,
@@ -64,6 +68,7 @@ public function __construct(
         $this->translator =         $translator;
 
         $this->countryRepository =  $countryRepository;
+        $this->donorRepository =    $donorRepository;
         $this->icaoRepository =     $icaoRepository;
         $this->listenerRepository = $listenerRepository;
         $this->paperRepository =    $paperRepository;

diff --git a/src/Form/Donations/Donation.php b/src/Form/Donations/Donation.php
@@ -4,6 +4,7 @@
 
 use App\Form\Base;
 use Symfony\Component\Form\Extension\Core\Type\ButtonType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
@@ -48,17 +49,16 @@ public function buildForm(FormBuilderInterface $formBuilder, array $options)
             )
             ->add(
                 'name',
-                TextType::class,
+                ChoiceType::class,
                 [
-                    'attr' => [
-                        'onchange' =>   "try{setCustomValidity('')}catch(e){}",
-                        'oninvalid' =>  "setCustomValidity('Please enter this donor's name')"
-                    ],
+                    'choices' =>        $this->donorRepository->getOptions(),
                     'data' =>           $options['name'],
-                    'empty_data' =>     '',
-                    'label' =>          'Name',
+                    'empty_data' =>     null,
+                    'label' =>          'Donor',
+                    'required' =>       false
                 ]
             )
+
             ->add(
                 'amount',
                 TextType::class,