Commit 88ca4668 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

initialisation des fieldsets améliorée, remove unused imports

parent 95d5b32f

module/Admission/src/Admission/Assertion/Avis/AdmissionAvisAssertion.php

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ namespace Admission\Assertion\Avis; 


use Admission\Entity\Db\Admission;

use Application\Assertion\Exception\FailedAssertionException;

use Application\RouteMatch;

use Doctrine\ORM\NoResultException;

use InvalidArgumentException;

use Laminas\Permissions\Acl\Resource\ResourceInterface;

module/Admission/src/Admission/Assertion/Avis/AdmissionAvisAssertionFactory.php

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ class AdmissionAvisAssertionFactory 
        $admissionOperationRule = $container->get(AdmissionOperationRule::class);

        $assertion->setAdmissionOperationRule($admissionOperationRule);



        /** @var \UnicaenAvis\Service\AvisService $admissionAvisRule */

        /** @var AvisService $admissionAvisRule */

        $avisService = $container->get(AvisService::class);

        $assertion->setAvisService($avisService);

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

+1 −66
Original line number Diff line number Diff line
@@ -29,11 +29,7 @@ use Admission\Service\Inscription\InscriptionServiceAwareTrait; 
use Admission\Service\Notification\NotificationFactoryAwareTrait;

use Admission\Service\Operation\AdmissionOperationServiceAwareTrait;

use Admission\Service\Verification\VerificationServiceAwareTrait;

use Application\Controller\PaysController;

use Application\Entity\Db\Role;

use Application\Service\Discipline\DisciplineServiceAwareTrait;

use Application\Service\Financement\FinancementServiceAwareTrait as ApplicationFinancementServiceAwareTrait;

use Application\Service\Pays\PaysServiceAwareTrait;

use Application\Service\Role\RoleServiceAwareTrait;

use Application\Service\UserContextServiceAwareTrait;

use DateTime;
@@ -50,19 +46,14 @@ use Laminas\View\Model\ViewModel; 
use Mpdf\MpdfException;

use Notification\Exception\RuntimeException;

use Notification\Service\NotifierServiceAwareTrait;

use Soutenance\Service\Qualite\QualiteServiceAwareTrait;

use Structure\Entity\Db\TypeStructure;

use Structure\Service\Etablissement\EtablissementServiceAwareTrait;

use Structure\Service\Structure\StructureServiceAwareTrait;

use UnicaenApp\Form\Fieldset\MultipageFormNavFieldset;

use UnicaenApp\Service\EntityManagerAwareTrait;

use UnicaenApp\View\Model\CsvModel;



class AdmissionController extends AdmissionAbstractController {



    use StructureServiceAwareTrait;

    use EntityManagerAwareTrait;

    use DisciplineServiceAwareTrait;

    use NotificationFactoryAwareTrait;

    use NotifierServiceAwareTrait;

    use AdmissionFormAwareTrait;
@@ -70,12 +61,7 @@ class AdmissionController extends AdmissionAbstractController { 
    use IndividuServiceAwareTrait;

    use AdmissionServiceAwareTrait;

    use InscriptionServiceAwareTrait;

    use FinancementServiceAwareTrait, ApplicationFinancementServiceAwareTrait  {

        FinancementServiceAwareTrait::getFinancementService insteadof ApplicationFinancementServiceAwareTrait;

        FinancementServiceAwareTrait::setFinancementService insteadof ApplicationFinancementServiceAwareTrait;

        ApplicationFinancementServiceAwareTrait::getFinancementService as getApplicationFinancementService;

        ApplicationFinancementServiceAwareTrait::setFinancementService as setApplicationFinancementService;

    }

    use FinancementServiceAwareTrait;

    use DocumentServiceAwareTrait;

    use VerificationServiceAwareTrait;

    use AdmissionOperationRuleAwareTrait;
@@ -86,9 +72,7 @@ class AdmissionController extends AdmissionAbstractController { 
    use AdmissionOperationServiceAwareTrait;

    use ConventionFormationDoctoraleServiceAwareTrait;

    use RoleServiceAwareTrait;

    use QualiteServiceAwareTrait;

    use AdmissionRechercheServiceAwareTrait;

    use PaysServiceAwareTrait;



    public function indexAction(): ViewModel|Response

    {
@@ -106,13 +90,6 @@ class AdmissionController extends AdmissionAbstractController { 
        }



        $etudiant = $this->admissionForm->get('etudiant');

        if($etudiant instanceof EtudiantFieldset){

            $pays = $this->paysService->getPaysAsOptions();

            $etudiant->setPays($pays);



            $nationalites = $this->paysService->getNationalitesAsOptions();

            $etudiant->setNationalites($nationalites);

        }



        //Récupération de l'objet Admission en BDD

        $admission = $this->getAdmission();
@@ -149,9 +126,6 @@ class AdmissionController extends AdmissionAbstractController { 
        }

        $data = $this->multipageForm($this->admissionForm)->getFormSessionData();



        //Initialise les valeurs de certains champs du fieldset (Etablissement, Directeur de thèse...)

        $this->initializeInscriptionFieldset();



        //Récupération de l'objet Admission en BDD

        /** @var Admission $admission */

        $admission = $this->getAdmission();
@@ -211,11 +185,6 @@ class AdmissionController extends AdmissionAbstractController { 
            }

        }



        $origines = $this->getApplicationFinancementService()->findOriginesFinancements("libelleLong");

        /** @var FinancementFieldset $financement */

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

        $financement->setFinancements($origines);



        $response->setVariable('admission', $admission);

        $response->setTemplate('admission/ajouter-financement');

        return $response;
@@ -637,39 +606,6 @@ class AdmissionController extends AdmissionAbstractController { 
        return false;

    }



    private function initializeInscriptionFieldset(): void

    {

        $inscription = $this->admissionForm->get('inscription');

        if($inscription instanceof InscriptionFieldset){

            //Partie Informations sur l'inscription

            /** @see AdmissionController::rechercherIndividuAction() */

            $inscription->setUrlIndividuThese($this->url()->fromRoute('admission/rechercher-individu', [], ["query" => []], true));



            $disciplines = $this->disciplineService->getDisciplinesAsOptions('code','ASC','code');

            $inscription->setSpecialites($disciplines);



            $composantes = $this->structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_COMPOSANTE_ENSEIGNEMENT, 'structure.libelle', false);

            $inscription->setComposantesEnseignement($composantes);



            $ecoles = $this->structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'structure.libelle', false);

            $inscription->setEcolesDoctorales($ecoles);



            $unites = $this->structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'structure.libelle', false);

            $inscription->setUnitesRecherche($unites);



            $etablissementsInscription = $this->etablissementService->getRepository()->findAllEtablissementsInscriptions();

            $inscription->setEtablissementsInscription($etablissementsInscription);



            $qualites = $this->qualiteService->getQualitesForAdmission();

            $inscription->setQualites($qualites);



            //Partie Spécifités envisagées

            /** @see PaysController::rechercherPaysAction() */

            $inscription->setUrlPaysCoTutelle($this->url()->fromRoute('pays/rechercher-pays', [], ["query" => []], true));

        }



    }



    public function genererStatutDossierAction(): ViewModel|Response

    {

        $admission = $this->admissionService->getRepository()->findRequestedAdmission($this);
@@ -731,7 +667,6 @@ class AdmissionController extends AdmissionAbstractController { 


        $canModifierAdmission = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_MODIFIER_SON_DOSSIER_ADMISSION) ||

                                $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION);

        $canVerifierAdmission = $this->isAllowed($admission, AdmissionPrivileges::ADMISSION_VERIFIER);

        //si le dossier est validé, rejeté, en cours de validation ou abandonné et que l'utilisateur connecté n'a pas le droit de modifier le dossier

        if(!$canModifierAdmission){

            $submitButton->setValue("Revenir à l'accueil");

module/Admission/src/Admission/Controller/AdmissionControllerFactory.php

+1 −16
Original line number Diff line number Diff line
@@ -2,21 +2,18 @@ 
namespace Admission\Controller;



use Admission\Form\Admission\AdmissionForm;

use Admission\Form\ConventionFormationDoctorale\ConventionFormationDoctoraleForm;

use Admission\Rule\Operation\AdmissionOperationRule;

use Admission\Service\Admission\AdmissionRechercheService;

use Admission\Service\Admission\AdmissionService;

use Admission\Service\ConventionFormationDoctorale\ConventionFormationDoctoraleService;

use Admission\Service\Document\DocumentService;

use Admission\Service\Etudiant\EtudiantService;

use Admission\Service\Exporter\Recapitulatif\RecapitulatifExporter;

use Admission\Service\Financement\FinancementService;

use Admission\Service\Etudiant\EtudiantService;

use Admission\Service\Inscription\InscriptionService;

use Admission\Service\Notification\NotificationFactory;

use Admission\Service\Operation\AdmissionOperationService;

use Admission\Service\Verification\VerificationService;

use Application\Service\Discipline\DisciplineService;

use Application\Service\Pays\PaysService;

use Application\Service\Role\RoleService;

use Fichier\Service\Fichier\FichierStorageService;

use Individu\Service\IndividuService;
@@ -25,9 +22,7 @@ use Laminas\ServiceManager\Factory\FactoryInterface; 
use Notification\Service\NotifierService;

use Psr\Container\ContainerExceptionInterface;

use Psr\Container\NotFoundExceptionInterface;

use Soutenance\Service\Qualite\QualiteService;

use Structure\Service\Etablissement\EtablissementService;

use Structure\Service\Structure\StructureService;



class AdmissionControllerFactory implements FactoryInterface

{
@@ -47,15 +42,12 @@ class AdmissionControllerFactory implements FactoryInterface 
         */

        $entityManager = $container->get('doctrine.entitymanager.orm_default');

        $userContextService = $container->get('UserContextService');

        $structureService = $container->get(StructureService::class);

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

        $individuService = $container->get(IndividuService::class);

        $inscriptionService = $container->get(InscriptionService::class);

        $financementService = $container->get(FinancementService::class);

        $applicationFinancementService = $container->get(\Application\Service\Financement\FinancementService::class);

        $verificationService = $container->get(VerificationService::class);

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

        $disciplineService = $container->get(DisciplineService::class);

        $notificationFactory = $container->get(NotificationFactory::class);

        $notifierService = $container->get(NotifierService::class);

        $documentService = $container->get(DocumentService::class);
@@ -65,9 +57,7 @@ class AdmissionControllerFactory implements FactoryInterface 
        $admissionOperationService = $container->get(AdmissionOperationService::class);

        $conventionFormationDoctoraleService = $container->get(ConventionFormationDoctoraleService::class);

        $roleService = $container->get(RoleService::class);

        $qualiteService = $container->get(QualiteService::class);

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

        $paysService = $container->get(PaysService::class);



        /** @var AdmissionOperationRule $admissionOperationRule */

        $admissionOperationRule = $container->get(AdmissionOperationRule::class);
@@ -80,15 +70,12 @@ class AdmissionControllerFactory implements FactoryInterface 
        $controller = new AdmissionController();

        $controller->setEntityManager($entityManager);

        $controller->setUserContextService($userContextService);

        $controller->setStructureService($structureService);

        $controller->setEtudiantService($etudiantService);

        $controller->setInscriptionService($inscriptionService);

        $controller->setIndividuService($individuService);

        $controller->setFinancementService($financementService);

        $controller->setApplicationFinancementService($applicationFinancementService);

        $controller->setVerificationService($verificationService);

        $controller->setAdmissionService($admissionService);

        $controller->setDisciplineService($disciplineService);

        $controller->setNotificationFactory($notificationFactory);

        $controller->setNotifierService($notifierService);

        $controller->setDocumentService($documentService);
@@ -100,9 +87,7 @@ class AdmissionControllerFactory implements FactoryInterface 
        $controller->setAdmissionOperationService($admissionOperationService);

        $controller->setConventionFormationDoctoraleService($conventionFormationDoctoraleService);

        $controller->setRoleService($roleService);

        $controller->setQualiteService($qualiteService);

        $controller->setAdmissionRechercheService($admissionRechercheService);

        $controller->setPaysService($paysService);



        return $controller;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class AdmissionAvisControllerFactory 


        $controller->setForm($avisForm);



        /** @var \UnicaenAvis\Service\AvisService $rapportActiviteAvisRule */

        /** @var AvisService $rapportActiviteAvisRule */

        $avisService = $container->get(AvisService::class);

        $controller->setAvisService($avisService);