diff --git a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php index e1ff84db2..09b6d4431 100644 --- a/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php +++ b/src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkDuplicateController.php @@ -11,7 +11,6 @@ declare(strict_types=1); namespace Chill\PersonBundle\Controller; -use Chill\MainBundle\Templating\TranslatableStringHelperInterface; use Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork; use Chill\PersonBundle\Form\FindAccompanyingPeriodWorkType; use Chill\PersonBundle\Form\PersonConfimDuplicateType; @@ -22,9 +21,10 @@ use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\Annotation\Route; use Symfony\Contracts\Translation\TranslatorInterface; use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; + class AccompanyingPeriodWorkDuplicateController extends AbstractController { - public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly TranslatorInterface $translator, private readonly TranslatableStringHelperInterface $stringHelper, private readonly AccompanyingPeriodWorkMergeService $accompanyingPeriodWorkMergeService) {} + public function __construct(private readonly AccompanyingPeriodWorkRepository $accompanyingPeriodWorkRepository, private readonly TranslatorInterface $translator, private readonly AccompanyingPeriodWorkMergeService $accompanyingPeriodWorkMergeService) {} /** * @ParamConverter("accompanyingPeriodWork", options={"id": "acpw_id"}) @@ -66,7 +66,7 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController return $this->render('@ChillPerson/AccompanyingPeriodWorkDuplicate/assign_acpw_duplicate.html.twig', [ 'accompanyingCourse' => $accompanyingPeriod, -// 'acpwArray' => $acpwArray, + // 'acpwArray' => $acpwArray, 'acpw' => $acpw, 'form' => $form->createView(), ]); @@ -121,6 +121,4 @@ class AccompanyingPeriodWorkDuplicateController extends AbstractController } } } - - } diff --git a/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php b/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php index 49da088b9..1f862353e 100644 --- a/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php +++ b/src/Bundle/ChillPersonBundle/Form/FindAccompanyingPeriodWorkType.php @@ -12,9 +12,7 @@ declare(strict_types=1); namespace Chill\PersonBundle\Form; use Chill\PersonBundle\Entity\AccompanyingPeriod; -use Chill\PersonBundle\Form\Type\PickAccompanyingPeriodWorkDynamicType; use Chill\PersonBundle\Form\Type\PickLinkedAccompanyingPeriodWorkType; -use Chill\PersonBundle\Repository\AccompanyingPeriod\AccompanyingPeriodWorkRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; @@ -22,18 +20,11 @@ use Symfony\Component\OptionsResolver\OptionsResolver; class FindAccompanyingPeriodWorkType extends AbstractType { - public function __construct(private readonly AccompanyingPeriodWorkRepository $repository) - { - } public function buildForm(FormBuilderInterface $builder, array $options) { -// $accompanyingPeriod = $options['accompanyingPeriod']; -// $suggestedAcpw = $this->repository->findByAccompanyingPeriod($accompanyingPeriod); - $builder ->add('acpw', PickLinkedAccompanyingPeriodWorkType::class, [ 'label' => 'Accompanying period work', -// 'suggested' => $suggestedAcpw, 'multiple' => false, ]) ->add('direction', HiddenType::class, [ diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php b/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php index 5b0e9a7dc..ad199f882 100644 --- a/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php +++ b/src/Bundle/ChillPersonBundle/Form/Type/PickLinkedAccompanyingPeriodWorkType.php @@ -1,16 +1,21 @@ "UPDATE chill_main_workflow_entity w SET relatedentityid = :toKeepId WHERE w.relatedentityid = :toDeleteId - AND w.relatedentityclass = 'Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork'", + AND w.relatedentityclass = 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork'", 'params' => ['toKeepId' => $toKeep->getId(), 'toDeleteId' => $toDelete->getId()], ];