Commit 0ee1d26d authored by thomas.hamel's avatar thomas.hamel Committed by Thomas Hamel
Browse files

WIP: pb SQL

parent 15b713b8
Loading
Loading
Loading
Loading
+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@
        "webmozart/assert": "^1.3",

        "unicaen/alerte": "^2.0",
        "unicaen/app": "6.0.*",
        "unicaen/app": "dev-feature_SearchAndSelectFilter as 6.0.7",
        "unicaen/auth": "^6.0",
        "unicaen/auth-token": "^6.0",
        "unicaen/console": "^6.0",
+25 −5
Changes for module/Admission/config/module.config.php: 25 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ namespace Admission;

use Admission\Controller\AdmissionController;
use Admission\Controller\AdmissionControllerFactory;
use Admission\Entity\Db\Repository\IndividuRepository;
use Admission\Entity\Db\Repository\IndividuRepositoryFactory;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
@@ -15,7 +17,16 @@ use Admission\Form\Fieldset\Inscription\InscriptionFieldset;
use Admission\Form\Fieldset\Inscription\InscriptionFieldsetFactory;
use Admission\Form\Fieldset\Validation\ValidationFieldset;
use Admission\Form\Fieldset\Validation\ValidationFieldsetFactory;
use Admission\Hydrator\AdmissionHydrator;
use Admission\Hydrator\AdmissionHydratorFactory;
use Admission\Hydrator\FinancementHydrator;
use Admission\Hydrator\FinancementHydratorFactory;
use Admission\Hydrator\IndividuHydrator;
use Admission\Hydrator\IndividuHydratorFactory;
use Admission\Hydrator\InscriptionHydrator;
use Admission\Hydrator\InscriptionHydratorFactory;
use Admission\Hydrator\ValidationHydrator;
use Admission\Hydrator\ValidationHydratorFactory;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Admission\AdmissionServiceFactory;
use Admission\Service\Financement\FinancementService;
@@ -84,13 +95,17 @@ return array(
                    'ajouter' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/:action',
                            'route' => '/:action/:individu',
                            'constraints' => [
                                /**
                                 * @see AdmissionController::ajouterAction()
                                 * @see AdmissionController::ajouterEtudiantAction()
                                 * @see AdmissionController::etudiantAction()
                                 * @see AdmissionController::inscriptionAction()
                                 * @see AdmissionController::financementAction()
                                 * @see AdmissionController::validationAction()Action()
                                 *
                                 */
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*'
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
                                'individu' => '[0-9]*'
                            ],
                        ],
                    ],
@@ -106,7 +121,7 @@ return array(
        ],
    ],

    'form_manager' => [
    'form_elements' => [
        'factories' => [
            AdmissionForm::class => AdmissionFormFactory::class,
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
@@ -118,6 +133,11 @@ return array(

    'hydrators' => [
        'factories' => [
            AdmissionHydrator::class => AdmissionHydratorFactory::class,
            IndividuHydrator::class => IndividuHydratorFactory::class,
            InscriptionHydrator::class => InscriptionHydratorFactory::class,
            FinancementHydrator::class => FinancementHydratorFactory::class,
            ValidationHydrator::class => ValidationHydratorFactory::class
        ],
    ],

+81 −22
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 81 added lines, 22 removed lines.
Original line number Diff line number Diff line
@@ -2,14 +2,19 @@

namespace Admission\Controller;

use Admission\Entity\Db\Admission;
use Admission\Entity\Db\Individu;
use Admission\Entity\Db\Inscription;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormAwareTrait;
use Admission\Hydrator\IndividuHydrator;
use Admission\Provider\Template\MailTemplates;
use Admission\Service\Admission\AdmissionServiceAwareTrait;
use Admission\Service\Individu\IndividuServiceAwareTrait;
use Admission\Service\Inscription\InscriptionServiceAwareTrait;
use Admission\Service\Notification\NotificationFactoryAwareTrait;
use Application\Service\Discipline\DisciplineServiceAwareTrait;
use Doctrine\ORM\Exception\NotSupported;
use Laminas\Http\Response;
use Laminas\View\Model\ViewModel;
use Notification\Exception\RuntimeException;
@@ -27,6 +32,9 @@ class AdmissionController extends AdmissionAbstractController {
    use NotifierServiceAwareTrait;
    use AdmissionFormAwareTrait;
    use IndividuServiceAwareTrait;
    use \Individu\Service\IndividuServiceAwareTrait;
    use AdmissionServiceAwareTrait;
    use InscriptionServiceAwareTrait;

    public function ajouterAction(): Response
    {
@@ -36,34 +44,23 @@ class AdmissionController extends AdmissionAbstractController {
            ->start(); // réinit du plugin et redirection vers la 1ère étape
    }

    public function etudiantEnregistrerAction(){
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
        $this->getEtudiantForm()->bindValues($data);
//        var_dump($data);

        $request = $this->getRequest();
//        var_dump($request->isPost());
        if ($request->isPost()) {
            $postData = $request->getPost();
            var_dump($postData); // Affichez les données pour déboguer
        }
    }

    public function etudiantAction(): Response|ViewModel
    {
        $this->getEtudiantForm()->get('etudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
        $this->getEtudiantForm()->get('etudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true));

//        var_dump($this->params()->fromPost()[MultipageFormNavFieldset::NAME] == MultipageFormNavFieldset::NAME_NEXT);
        var_dump($this->params()->fromPost());
//        var_dump($this->params()->fromPost());
        $response = $this->processMultipageForm($this->getEtudiantForm());
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();

//
        $individu = $this->getEtudiantForm()->getObject();
        var_dump($individu);
//        $this->individuService->create($individu);
//        var_dump($this->getEtudiantForm()->get('etudiant'));
        //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();
//        }
        if ($response instanceof Response) {
            return $response;
        }
@@ -73,15 +70,18 @@ class AdmissionController extends AdmissionAbstractController {
        return $response;
    }

    /**
     * @throws NotSupported
     */
    public function inscriptionAction(): Response|ViewModel
    {
        var_dump($this->params()->fromPost());

//        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')->setUrlEtablissement($this->url()->fromRoute('etablissement/rechercher', [], ["query" => []], true));
        $disciplines = $this->getDisciplineService()->getDisciplinesAsOptions();
        $disciplines = $this->getDisciplineService()->getDisciplinesAsOptions('code','ASC','code');
        $this->getEtudiantForm()->get('inscription')->setDisciplines($disciplines);
        $ecoles = $this->getStructureService()->findAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'libelle', false);
        $this->getEtudiantForm()->get('inscription')->setEcolesDoctorales($ecoles);
@@ -92,6 +92,41 @@ class AdmissionController extends AdmissionAbstractController {
        $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);
//        $individu=$this->individuService->getRepository()->findRequestedIndividu($this);
//        $admission = $this->admissionService->getRepository()->findOneByIndividu($individu);
//
//        //Si l'individu ne possède pas de dossier d'admission, on lui crée puis associe un fieldset étudiant
//        if($admission === null){
//            try {
//                $this->getEtudiantForm()->get('etudiant')->bindValues($data['etudiant']);
//                /** @var Admission $admission */
//                $admission = $this->getEtudiantForm()->getObject();
//                $admission->setIndividuId($individu);
//
//                $entity = $this->getEtudiantForm()->get('etudiant')->getObject();
//                $entity->setAdmission($admission);
//
//                $this->individuAdmissionService->create($entity, $admission);
//            }catch (\Exception $e) {
//                var_dump($e);
//            }
//        }else{
////            var_dump("l'individu possède déjà un dossier d'admission");
//            //Faire l'update du fieldset étudiant
//
//            //Vérifier que le fieldset inscription existe et si oui : populate les valeurs avec la BDD
////            var_dump($admission);
//            $inscriptionFieldset = $this->inscriptionService->getRepository()->findOneByAdmission($admission->getId());
//            var_dump($inscriptionFieldset);
//            if($inscriptionFieldset instanceof Inscription){
//                $this->getEtudiantForm()->get('inscription')->bind($inscriptionFieldset);
//            }else{
//                var_dump("le fieldset Inscription n'est pas initialisé");
//            }
//        }

        if ($response instanceof Response) {
            return $response;
        }
@@ -167,4 +202,28 @@ class AdmissionController extends AdmissionAbstractController {

        return $this->redirect()->toRoute('home', [], [], true );
    }

    public function saveData($fieldsetName, $service, $data){
//        if (isset($data[$fieldsetName]['nationalite']['label'])) {
//            $data[$fieldsetName]['nationalite'] = $data[$fieldsetName]['nationalite']['label'];
//        }
        $this->getEtudiantForm()->get($fieldsetName)->bindValues($data[$fieldsetName]);

        if(!$service->getRepository()->findIfCurrentUserHasAlreadyAdmission()){
            try {
                $admission = new Admission();

                $entity = $this->getEtudiantForm()->get('etudiant')->getObject();
                $entity->setAdmission($admission);
                var_dump($entity);
                $service->getEntityManager()->persist($admission);
                $service->create($entity);
            }
            catch (\Exception $e) {

            }
        }else{

        }
    }
}
 No newline at end of file
+9 −1
Changes for module/Admission/src/Admission/Controller/AdmissionControllerFactory.php: 9 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,9 @@
namespace Admission\Controller;

use Admission\Form\Admission\AdmissionForm;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Individu\IndividuService;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Notification\NotificationFactory;
use Application\Service\Discipline\DisciplineService;
use Interop\Container\ContainerInterface;
@@ -29,7 +31,10 @@ class AdmissionControllerFactory implements FactoryInterface
         * @var NotifierService $notifierService
         */
        $structureService = $container->get(StructureService::class);
        $individuService = $container->get(IndividuService::class);
        $individuAdmissionService = $container->get(IndividuService::class);
        $individuService = $container->get(\Individu\Service\IndividuService::class);
        $inscriptionService = $container->get(InscriptionService::class);
        $admissionService = $container->get(AdmissionService::class);
        $disciplineService = $container->get(DisciplineService::class);
        $notificationFactory = $container->get(NotificationFactory::class);
        $notifierService = $container->get(NotifierService::class);
@@ -42,7 +47,10 @@ class AdmissionControllerFactory implements FactoryInterface
        $controller = new AdmissionController();

        $controller->setStructureService($structureService);
        $controller->setIndividuAdmissionService($individuAdmissionService);
        $controller->setInscriptionService($inscriptionService);
        $controller->setIndividuService($individuService);
        $controller->setAdmissionService($admissionService);
        $controller->setDisciplineService($disciplineService);
        $controller->setNotificationFactory($notificationFactory);
        $controller->setNotifierService($notifierService);
+85 −55
Changes for module/Admission/src/Admission/Entity/Db/Admission.php: 85 added lines, 55 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;
@@ -17,37 +18,38 @@ class Admission implements HistoriqueAwareInterface{
    /**
     * @var int
     */
    private $id;
    private ?int $id = null;


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

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

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

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

    /**
     * Constructor
     */
    public function __construct()
    {
        $this->financements = new \Doctrine\Common\Collections\ArrayCollection();
        $this->individus = new \Doctrine\Common\Collections\ArrayCollection();
        $this->inscriptions = new \Doctrine\Common\Collections\ArrayCollection();
        $this->validations = new \Doctrine\Common\Collections\ArrayCollection();
        $this->financement = new ArrayCollection();
        $this->individu = new ArrayCollection();
        $this->inscription = new ArrayCollection();
        $this->validation = new ArrayCollection();
    }

    /**
@@ -91,9 +93,9 @@ class Admission implements HistoriqueAwareInterface{
     *
     * @return Admission
     */
    public function addFinancement(Financement $financement)
    public function addFinancement(Financement $financement): Admission
    {
        $this->financements[] = $financement;
        $this->financement[] = $financement;

        return $this;
    }
@@ -105,19 +107,9 @@ class Admission implements HistoriqueAwareInterface{
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     */
    public function removeFinancement(Financement $financement)
    {
        return $this->financements->removeElement($financement);
    }

    /**
     * Get financements.
     *
     * @return Collection
     */
    public function getFinancements()
    public function removeFinancement(Financement $financement): bool
    {
        return $this->financements;
        return $this->financement->removeElement($financement);
    }

    /**
@@ -127,9 +119,9 @@ class Admission implements HistoriqueAwareInterface{
     *
     * @return Admission
     */
    public function addIndividu(Individu $individu)
    public function addIndividu(Individu $individu): Admission
    {
        $this->individus[] = $individu;
        $this->individu[] = $individu;

        return $this;
    }
@@ -143,88 +135,126 @@ class Admission implements HistoriqueAwareInterface{
     */
    public function removeIndividu(Individu $individu)
    {
        return $this->individus->removeElement($individu);
        return $this->individu->removeElement($individu);
    }

    /**
     * Get individus.
     * Add inscription.
     *
     * @return Collection
     * @param Inscription $inscription
     *
     * @return Admission
     */
    public function getIndividus()
    public function addInscription(Inscription $inscription): Admission
    {
        return $this->individus;
        $this->inscription[] = $inscription;

        return $this;
    }

    /**
     * Add inscription.
     * Remove inscription.
     *
     * @param Inscription $inscription
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     */
    public function removeInscription(Inscription $inscription): bool
    {
        return $this->inscription->removeElement($inscription);
    }
    /**
     * Add validation.
     *
     * @param Validation $validation
     *
     * @return Admission
     */
    public function addInscription(Inscription $inscription)
    public function addValidation(Validation $validation)
    {
        $this->inscriptions[] = $inscription;
        $this->validation[] = $validation;

        return $this;
    }

    /**
     * Remove inscription.
     * Remove validation.
     *
     * @param Inscription $inscription
     * @param Validation $validation
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     */
    public function removeInscription(Inscription $inscription)
    public function removeValidation(Validation $validation)
    {
        return $this->inscriptions->removeElement($inscription);
        return $this->validation->removeElement($validation);
    }

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

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

    /**
     * Get inscription.
     *
     * @return Admission
     * @return Collection
     */
    public function addValidation(Validation $validation)
    public function getInscription()
    {
        $this->validations[] = $validation;
        return $this->inscription;
    }

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


    /**
     * Remove validation.
     * Set individuId.
     *
     * @param Validation $validation
     * @param \Individu\Entity\Db\Individu|null $individuId
     *
     * @return boolean TRUE if this collection contained the specified element, FALSE otherwise.
     * @return Admission
     */
    public function removeValidation(Validation $validation)
    public function setIndividuId(\Individu\Entity\Db\Individu $individuId = null)
    {
        return $this->validations->removeElement($validation);
        $this->individuId = $individuId;

        return $this;
    }

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