Commit 34384a03 authored by thomas.hamel's avatar thomas.hamel Committed by Thomas Hamel
Browse files

WIP: premières modifs suite au GT

parent 4d46b7e6
Loading
Loading
Loading
Loading
+15 −2
Changes for module/Admission/config/module.config.php: 15 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ use Admission\Service\Individu\IndividuService;
use Admission\Service\Individu\IndividuServiceFactory;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Inscription\InscriptionServiceFactory;
use Admission\Service\Validation\ValidationService;
use Admission\Service\Validation\ValidationServiceFactory;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Laminas\Router\Http\Segment;
@@ -73,7 +75,8 @@ return array(
                        'confirmer',
                        'annuler',
                        'etudiantEnregistrer',
                        'enregistrer'
                        'enregistrer',
                        'rechercher-individu'
                    ]
                ]
            ]
@@ -109,6 +112,15 @@ return array(
                            ],
                        ],
                    ],
                    'rechercher-individu' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/rechercher-individu',
                            'defaults'    => [
                                'action' => 'rechercher-individu',
                            ],
                        ],
                    ],
                ],
            ],

@@ -146,7 +158,8 @@ return array(
            AdmissionService::class => AdmissionServiceFactory::class,
            FinancementService::class => FinancementServiceFactory::class,
            IndividuService::class => IndividuServiceFactory::class,
            InscriptionService::class => InscriptionServiceFactory::class
            InscriptionService::class => InscriptionServiceFactory::class,
            ValidationService::class => ValidationServiceFactory::class
        ],
    ],

+1 −1
Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class AdmissionAbstractController extends AbstractActionController
    protected function processMultipageForm(AdmissionForm $form): ViewModel|Response
    {
        $response = $this->multipageForm($form)
            ->setUsePostRedirectGet()
            ->setUsePostRedirectGet(false)
            ->process();

        if ($response instanceof Response) {
+89 −13
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 89 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Admission\Controller;

use Admission\Entity\Db\Admission;
use Admission\Entity\Db\Financement;
use Admission\Entity\Db\Individu;
use Admission\Entity\Db\Inscription;
use Admission\Form\Admission\AdmissionForm;
@@ -10,12 +11,15 @@ use Admission\Form\Admission\AdmissionFormAwareTrait;
use Admission\Hydrator\IndividuHydrator;
use Admission\Provider\Template\MailTemplates;
use Admission\Service\Admission\AdmissionServiceAwareTrait;
use Admission\Service\Financement\FinancementServiceAwareTrait;
use Admission\Service\Individu\IndividuServiceAwareTrait;
use Admission\Service\Inscription\InscriptionServiceAwareTrait;
use Admission\Service\Notification\NotificationFactoryAwareTrait;
use Admission\Service\Validation\ValidationServiceAwareTrait;
use Application\Service\Discipline\DisciplineServiceAwareTrait;
use Doctrine\ORM\Exception\NotSupported;
use Laminas\Http\Response;
use Laminas\View\Model\JsonModel;
use Laminas\View\Model\ViewModel;
use Notification\Exception\RuntimeException;
use Notification\Service\NotifierServiceAwareTrait;
@@ -35,6 +39,8 @@ class AdmissionController extends AdmissionAbstractController {
    use \Individu\Service\IndividuServiceAwareTrait;
    use AdmissionServiceAwareTrait;
    use InscriptionServiceAwareTrait;
    use FinancementServiceAwareTrait;
    use ValidationServiceAwareTrait;

    public function ajouterAction(): Response
    {
@@ -54,13 +60,16 @@ class AdmissionController extends AdmissionAbstractController {
        $response = $this->processMultipageForm($this->getEtudiantForm());
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();

        //si l'utilisateur possède déjà un dossier d'admission
//        if($this->admissionService->findIfCurrentUserAlreadyHasAdmission()){
            //Récupération de l'objet -> A FAIRE

            //rempli le formulaire des données de l'objet
//            $this->getEtudiantForm()->bind();
//        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
//        $admission = $this->admissionService->getRepository()->findOneByIndividu($individu);
//        $individuFieldset = $this->individuAdmissionService->getRepository()->findOneByAdmission($admission->getId());
//
//        if($individuFieldset instanceof Individu){
//            $this->getEtudiantForm()->get('etudiant')->setObject($individuFieldset);
//        }else{
//            var_dump("le fieldset Individu   n'est pas initialisé");
//        }

        if ($response instanceof Response) {
            return $response;
        }
@@ -78,22 +87,23 @@ class AdmissionController extends AdmissionAbstractController {
//        var_dump($this->params()->fromPost());
//        var_dump($this->params()->fromRoute('individu'));
        //Partie Informations sur l'inscription
        $this->getEtudiantForm()->get('inscription')->setUrlDirecteurThese($this->url()->fromRoute('utilisateur/rechercher-individu', [], ["query" => []], true));
        $this->getEtudiantForm()->get('inscription')->setUrlCoDirecteurThese($this->url()->fromRoute('utilisateur/rechercher-individu', [], ["query" => []], true));
        $this->getEtudiantForm()->get('inscription')->setUrlDirecteurThese($this->url()->fromRoute('admission/rechercher-individu', [], ["query" => []], true));
        $this->getEtudiantForm()->get('inscription')->setUrlCoDirecteurThese($this->url()->fromRoute('admission/rechercher-individu', [], ["query" => []], true));
        $this->getEtudiantForm()->get('inscription')->setUrlEtablissement($this->url()->fromRoute('etablissement/rechercher', [], ["query" => []], true));
        $disciplines = $this->getDisciplineService()->getDisciplinesAsOptions('code','ASC','code');
        $this->getEtudiantForm()->get('inscription')->setDisciplines($disciplines);
        $this->getEtudiantForm()->get('inscription')->setSpecialites($disciplines);
        $ecoles = $this->getStructureService()->findAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle', false);
        $this->getEtudiantForm()->get('inscription')->setEcolesDoctorales($ecoles);
        $unites = $this->getStructureService()->findAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, 'libelle', false);
        $this->getEtudiantForm()->get('inscription')->setUnitesRecherche($unites);

//        var_dump($this->params()->fromPost());
//        die();
        //Partie Spécifités envisagées
        $this->getEtudiantForm()->get('inscription')->setUrlPaysCoTutelle($this->url()->fromRoute('pays/rechercher-pays', [], ["query" => []], true));

        $response = $this->processMultipageForm($this->getEtudiantForm());
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
//        var_dump($data);
//        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
////        var_dump($data);
//        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
//        $admission = $this->admissionService->getRepository()->findOneByIndividu($individu);
//
@@ -121,7 +131,7 @@ class AdmissionController extends AdmissionAbstractController {
//            $inscriptionFieldset = $this->inscriptionService->getRepository()->findOneByAdmission($admission->getId());
//            var_dump($inscriptionFieldset);
//            if($inscriptionFieldset instanceof Inscription){
//                $this->getEtudiantForm()->get('inscription')->bind($inscriptionFieldset);
//                $this->getEtudiantForm()->get('inscription')->setObject($inscriptionFieldset);
//            }else{
//                var_dump("le fieldset Inscription n'est pas initialisé");
//            }
@@ -136,9 +146,29 @@ class AdmissionController extends AdmissionAbstractController {
        return $response;
    }

    /**
     * @throws NotSupported
     */
    public function financementAction() : Response|ViewModel
    {
//        var_dump($this->getRequest()->getPost());
//        die();
        $response = $this->processMultipageForm($this->getEtudiantForm());
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();

//        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
//        $admission = $this->admissionService->getRepository()->findOneByIndividu($individu);
//        $inscriptionFieldset = $this->inscriptionService->getRepository()->findOneByAdmission($admission->getId());
//
//        //Si le fieldest Financement n'était pas encore en BDD
//        if(!$inscriptionFieldset instanceof Inscription){
//            $this->getEtudiantForm()->get('inscription')->bindValues($data['inscription']);
//            $entity = $this->getEtudiantForm()->get('inscription')->getObject();
//            $entity->setAdmission($admission);
//
//            $this->inscriptionService->create($entity, $admission);
//        }

        if ($response instanceof Response) {
            return $response;
        }
@@ -151,6 +181,23 @@ class AdmissionController extends AdmissionAbstractController {
    public function validationAction(): Response|ViewModel
    {
        $response = $this->processMultipageForm($this->getEtudiantForm());
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
        var_dump($this->params()->fromPost());
//        die();
    //        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
    //        $admission = $this->admissionService->getRepository()->findOneByIndividu($individu);
    //
    //        $financementFieldset = $this->financementService->getRepository()->findOneByAdmission($admission->getId());
    //
    //        //Si le fieldest Inscription n'était pas encore en BDD
    //        if(!$financementFieldset instanceof Financement){
    //            $this->getEtudiantForm()->get('financement')->bindValues($data['financement']);
    //            $entity = $this->getEtudiantForm()->get('financement')->getObject();
    //            $entity->setAdmission($admission);
    //
    //            $this->financementService->create($entity, $admission);
    //        }

        if ($response instanceof Response) {
            return $response;
        }
@@ -226,4 +273,33 @@ class AdmissionController extends AdmissionAbstractController {

        }
    }

    public function rechercherIndividuAction(?string $type = null) : JsonModel
    {
        $type = $this->params()->fromQuery('type');
        if (($term = $this->params()->fromQuery('term'))) {
            $rows = $this->individuService->getRepository()->findByText($term, $type);
            $result = [];
            foreach ($rows as $row) {
                $prenoms = implode(' ', array_filter([$row['prenom1'], $row['prenom2'], $row['prenom3']]));
                // mise en forme attendue par l'aide de vue FormSearchAndSelect
                $label = $row['nom_usuel'] . ' ' . $prenoms;
                $extra = array(
                    'prenoms'=>$row['email'],
                    'nom' => $row['nom_usuel']
                );
                $result[] = array(
                    'id' => $row['id'], // identifiant unique de l'item
                    'label' => $label,     // libellé de l'item
                    'extra' => $extra,     // infos complémentaires (facultatives) sur l'item
                );
            }
            usort($result, function ($a, $b) {
                return strcmp($a['label'], $b['label']);
            });

            return new JsonModel($result);
        }
        exit;
    }
}
 No newline at end of file
+6 −0
Changes for module/Admission/src/Admission/Controller/AdmissionControllerFactory.php: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,9 +3,11 @@ namespace Admission\Controller;

use Admission\Form\Admission\AdmissionForm;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Financement\FinancementService;
use Admission\Service\Individu\IndividuService;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Notification\NotificationFactory;
use Admission\Service\Validation\ValidationService;
use Application\Service\Discipline\DisciplineService;
use Interop\Container\ContainerInterface;
use Laminas\ServiceManager\Factory\FactoryInterface;
@@ -34,6 +36,8 @@ class AdmissionControllerFactory implements FactoryInterface
        $individuAdmissionService = $container->get(IndividuService::class);
        $individuService = $container->get(\Individu\Service\IndividuService::class);
        $inscriptionService = $container->get(InscriptionService::class);
        $financementService = $container->get(FinancementService::class);
        $validationService = $container->get(ValidationService::class);
        $admissionService = $container->get(AdmissionService::class);
        $disciplineService = $container->get(DisciplineService::class);
        $notificationFactory = $container->get(NotificationFactory::class);
@@ -50,6 +54,8 @@ class AdmissionControllerFactory implements FactoryInterface
        $controller->setIndividuAdmissionService($individuAdmissionService);
        $controller->setInscriptionService($inscriptionService);
        $controller->setIndividuService($individuService);
        $controller->setFinancementService($financementService);
        $controller->setValidationService($validationService);
        $controller->setAdmissionService($admissionService);
        $controller->setDisciplineService($disciplineService);
        $controller->setNotificationFactory($notificationFactory);
+245 −0
Changes for module/Admission/src/Admission/Entity/Db/Admission.php~: 245 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php
namespace Admission\Entity\Db;

use Doctrine\Common\Collections\ArrayCollection;
use Doctrine\Common\Collections\Collection;
use UnicaenApp\Entity\HistoriqueAwareInterface;
use UnicaenApp\Entity\HistoriqueAwareTrait;

class Admission implements HistoriqueAwareInterface{

    use HistoriqueAwareTrait;

    /**
     * @var int|null
     */
    private $etatId;

    /**
     * @var int
     */
    private ?int $id = null;


    /**
     * @var Collection
     */
    private $financement;

    /**
     * @var Collection
     */
    private $individu;

    /**
     * @var Collection
     */
    private $inscription;

    /**
     * @var Collection
     */
    private $validation;

    /**
     * Constructor
     */
    public function __construct()
    {
        $this->financement = new ArrayCollection();
        $this->individu = new ArrayCollection();
        $this->inscription = new ArrayCollection();
        $this->validation = new ArrayCollection();
    }

    /**
     * Set etatId.
     *
     * @param int|null $etatId
     *
     * @return Admission
     */
    public function setEtatId($etatId = null)
    {
        $this->etatId = $etatId;

        return $this;
    }

    /**
     * Get etatId.
     *
     * @return int|null
     */
    public function getEtatId()
    {
        return $this->etatId;
    }

    /**
     * Get id.
     *
     * @return int
     */
    public function getId()
    {
        return $this->id;
    }

    /**
     * Add financement.
     */
    public function addFinancement(Collection $financements): Admission
    {
        foreach ($financements as $f) {
            $this->financement->add($f);
        }

        return $this;
    }

    /**
     * Remove financements.
     */
    public function removeFinancement(Collection $financements): void
    {
        foreach ($financements as $f) {
            $this->financement->removeElement($f);
        }
    }

    /**
     * Add individu.
     */
    public function addIndividu(Collection $individus): Admission
    {
        foreach ($individus as $i) {
            $this->individu->add($i);
        }

        return $this;
    }

    /**
     * Remove individus.
     */
    public function removeIndividu(Collection $individus): void
    {
        foreach ($individus as $i) {
            $this->individu->removeElement($i);
        }
    }

    /**
     * Add inscriptions.
     */
    public function addInscription(Collection $inscriptions): Admission
    {
        foreach ($inscriptions as $i) {
            $this->inscription->add($i);
        }

        return $this;
    }

    /**
     * Remove inscriptions.
     */
    public function removeInscription(Collection $inscriptions): void
    {
        foreach ($inscriptions as $i) {
            $this->inscription->removeElement($i);
        }
    }

    /**
     * Add validation.
     */
    public function addValidation(Collection $validations): self
    {
        foreach ($validations as $v) {
            $this->validation->add($v);
        }

        return $this;
    }

    /**
     * Remove validation.
     */
    public function removeValidation(Collection $validations): void
    {
        foreach ($validations as $v) {
            $this->validation->removeElement($v);
        }
    }

    /**
     * Get financement.
     *
     * @return Collection
     */
    public function getFinancement()
    {
        return $this->financement;
    }

    /**
     * Get individu.
     *
     * @return Collection
     */
    public function getIndividu()
    {
        return $this->individu;
    }

    /**
     * Get inscription.
     *
     * @return Collection
     */
    public function getInscription()
    {
        return $this->inscription;
    }

    /**
     * Get validation.
     *
     * @return Collection
     */
    public function getValidation()
    {
        return $this->validation;
    }
    /**
     * @var \Individu\Entity\Db\Individu
     */
    private $individuId;


    /**
     * Set individuId.
     *
     * @param \Individu\Entity\Db\Individu|null $individuId
     *
     * @return Admission
     */
    public function setIndividuId(\Individu\Entity\Db\Individu $individuId = null)
    {
        $this->individuId = $individuId;

        return $this;
    }

    /**
     * Get individuId.
     *
     * @return \Individu\Entity\Db\Individu|null
     */
    public function getIndividuId()
    {
        return $this->individuId;
    }
}
Loading