Commit 2a16fc92 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

retrait traits non utilisés dans classes, fix bug lors de l'enregistrement du fieldset financement

parent 0f8b1464

module/Admission/src/Admission/Controller/AdmissionController.php

+1 −1
Original line number Diff line number Diff line
@@ -541,7 +541,7 @@ class AdmissionController extends AdmissionAbstractController { 
                /** @var FinancementFieldset $financementFieldset */

                $financementFieldset = $this->admissionForm->get('financement');

                if(isset($data['financement']['verificationFinancement'])){

                    $financementFieldset->bindValues($data['financement']);

                    $financementFieldset->get('verificationFinancement')->bindValues($data['financement']['verificationFinancement']);

                }



                /** @var Verification $verification */

module/Admission/src/Admission/Controller/AdmissionRechercheController.php

+0 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ use Application\Search\Controller\SearchControllerInterface; 
use Application\Search\Controller\SearchControllerTrait;

use Application\Search\SearchResultPaginator;

use Application\Search\SearchServiceAwareTrait;

use Application\Service\Role\RoleServiceAwareTrait;

use Laminas\Http\Response;

use Laminas\View\Model\ViewModel;

use UnicaenApp\Form\Element\SearchAndSelect;
@@ -31,7 +30,6 @@ class AdmissionRechercheController extends AbstractController implements SearchC 
    use SearchServiceAwareTrait;

    use SearchControllerTrait;



    use RoleServiceAwareTrait;

    use AdmissionServiceAwareTrait;

    use AdmissionOperationRuleAwareTrait;

    use AdmissionOperationServiceAwareTrait;

module/Admission/src/Admission/Controller/AdmissionRechercheControllerFactory.php

+0 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ class AdmissionRechercheControllerFactory 
         */

        $admissionService = $container->get(AdmissionService::class);

        $admissionRechercheService = $container->get(AdmissionRechercheService::class);

        $roleService = $container->get('RoleService');

        $admissionOperationService = $container->get(AdmissionOperationService::class);

        $admissionOperationRule = $container->get(AdmissionOperationRule::class);
@@ -36,7 +35,6 @@ class AdmissionRechercheControllerFactory 
        $controller->setAdmissionOperationService($admissionOperationService);

        $controller->setAdmissionOperationService($admissionOperationService);

        $controller->setAdmissionOperationRule($admissionOperationRule);

        $controller->setRoleService($roleService);



        return $controller;

    }

module/Admission/src/Admission/Controller/Avis/AdmissionAvisController.php

+4 −13
Original line number Diff line number Diff line
@@ -2,22 +2,18 @@ 


namespace Admission\Controller\Avis;



use Admission\Entity\Db\AdmissionAvis;

use Admission\Entity\Db\Etat;

use Admission\Entity\Db\Etudiant;

use Admission\Event\Avis\AdmissionAvisEvent;

use Admission\Service\Admission\AdmissionServiceAwareTrait;

use Admission\Service\Avis\AdmissionAvisServiceAwareTrait;

use Admission\Service\Etudiant\EtudiantServiceAwareTrait;

use Application\Controller\AbstractController;

use Application\EventRouterReplacerAwareTrait;

use Application\Filter\IdifyFilterAwareTrait;

use Application\Service\Validation\ValidationServiceAwareTrait;

use Doctrine\ORM\NoResultException;

use Individu\Service\IndividuServiceAwareTrait;

use Laminas\EventManager\EventInterface;

use Laminas\Http\Response;

use Admission\Entity\Db\AdmissionAvis;

use Admission\Event\Avis\AdmissionAvisEvent;

use Admission\Service\Avis\AdmissionAvisServiceAwareTrait;

use Admission\Service\Admission\AdmissionServiceAwareTrait;

use Admission\Service\Validation\AdmissionValidationServiceAwareTrait;

use UnicaenApp\Exception\RuntimeException;

use UnicaenAvis\Entity\Db\Avis;

use UnicaenAvis\Form\AvisForm;
@@ -27,15 +23,10 @@ class AdmissionAvisController extends AbstractController 
{

    use AdmissionServiceAwareTrait;

    use AdmissionAvisServiceAwareTrait;

    use AdmissionValidationServiceAwareTrait;

    use ValidationServiceAwareTrait;

    use IndividuServiceAwareTrait;

    use AvisServiceAwareTrait;

    use EtudiantServiceAwareTrait;



    use IdifyFilterAwareTrait;

    use EventRouterReplacerAwareTrait;



    private AvisForm $form;



    /**

module/Admission/src/Admission/Controller/Avis/AdmissionAvisControllerFactory.php

+0 −4
Original line number Diff line number Diff line
@@ -22,15 +22,11 @@ class AdmissionAvisControllerFactory 
        $admissionService = $container->get(AdmissionService::class);

        $admissionAvisService = $container->get(AdmissionAvisService::class);

        $avisForm = $container->get('FormElementManager')->get(AvisForm::class);

        $admissionValidationService = $container->get(AdmissionValidationService::class);

        $validationService = $container->get(ValidationService::class);

        $etudiantService = $container->get(EtudiantService::class);



        $controller = new AdmissionAvisController();

        $controller->setAdmissionService($admissionService);

        $controller->setAdmissionAvisService($admissionAvisService);

        $controller->setAdmissionValidationService($admissionValidationService);

        $controller->setValidationService($validationService);

        $controller->setEtudiantService($etudiantService);



        $controller->setForm($avisForm);