Commit 288c9aab authored by thomas.hamel's avatar thomas.hamel Committed by Thomas Hamel
Browse files

WIP: ajout des entités

parent 4a391a78
Loading
Loading
Loading
Loading
+2 −1
Changes for composer.json: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@
        "unicaen/pdf": "6.1.0",
        "unicaen/renderer": "^6.0",
        "unicaen/sygal-api": "dev-master",
        "unicaen/zfc-user": "^5.0"
        "unicaen/zfc-user": "^5.0",
        "unicaen/etat": "^6.0"
    },
    "minimum-stability": "dev",
    "prefer-stable": true,
+52 −64
Changes for module/Admission/config/module.config.php: 52 added lines, 64 removed lines.
Original line number Diff line number Diff line
@@ -3,18 +3,49 @@
namespace Admission;


use Admission\Controller\AdmissionController;
use Admission\Controller\AdmissionControllerFactory;
use Admission\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Fieldset\Financement\FinancementFieldset;
use Admission\Fieldset\Inscription\InscriptionFieldset;
use Admission\Fieldset\Justificatifs\ValidationFieldset;
use Laminas\Router\Http\Literal;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldsetFactory;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldsetFactory;
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\IndividuHydrator;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Admission\AdmissionServiceFactory;
use Admission\Service\Financement\FinancementService;
use Admission\Service\Financement\FinancementServiceFactory;
use Admission\Service\Individu\IndividuService;
use Admission\Service\Individu\IndividuServiceFactory;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Inscription\InscriptionServiceFactory;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Laminas\Router\Http\Segment;
use Admission\Controller\AdmissionController;
use UnicaenAuth\Guard\PrivilegeController;
use Laminas\ServiceManager\Factory\InvokableFactory;
use UnicaenAuth\Guard\PrivilegeController;

return array(
    'doctrine' => [
        'driver' => [
            'orm_default' => [
                'class' => MappingDriverChain::class,
                'drivers' => [
                    'Admission\Entity\Db' => 'orm_default_xml_driver',
                ],
            ],
            'orm_default_xml_driver' => [
                'class' => XmlDriver::class,
                'cache' => 'array',
                'paths' => [
                    __DIR__ . '/../src/Admission/Entity/Db/Mapping',
                ],
            ],
        ],
    ],
    'bjyauthorize' => [
        'guards' => [
            PrivilegeController::class => [
@@ -53,7 +84,7 @@ return array(
                    'ajouter' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/ajouter/:action',
                            'route' => '/:action',
                            'constraints' => [
                                /**
                                 * @see AdmissionController::ajouterAction()
@@ -61,58 +92,6 @@ return array(
                                 */
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionController::class,
//
//                                'action' => "addInformationsEtudiant"
                            ],
                        ],
                    ],
                    'infos-etudiant' => [
                        'type' => Literal::class,
                        'may_terminate' => true,
                        'options' => [
                            'route' => '/informations-etudiant',
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action' => "addInformationsEtudiant"
                            ],
                        ],
                    ],
                    'infos-inscription' => [
                        'type' => Literal::class,
                        'may_terminate' => true,
                        'options' => [
                            'route' => '/informations-inscription',
                            'defaults' => [
                                'controller' => AdmissionController::class,
//                                'action' => 'inscription',
                                'action' => "addInformationsInscription"
                            ],
                        ],
                    ],
                    'infos-financement' => [
                        'type' => Literal::class,
                        'may_terminate' => true,
                        'options' => [
                            'route' => '/informations-financement',
                            'defaults' => [
                                'controller' => AdmissionController::class,
//                                'action' => 'financement',
                                'action' => "addInformationsFinancement"
                            ],
                        ],
                    ],
                    'infos-justificatifs' => [
                        'type' => Literal::class,
                        'may_terminate' => true,
                        'options' => [
                            'route' => '/informations-justificatifs',
                            'defaults' => [
                                'controller' => AdmissionController::class,
//                                'action' => 'justificatifs',
                                'action' => "addInformationsJustificatifs"
                            ],
                        ],
                    ],
                ],
@@ -129,15 +108,24 @@ return array(

    'form_manager' => [
        'factories' => [
            EtudiantFieldset::class => InvokableFactory::class,
            InscriptionFieldset::class => InvokableFactory::class,
            FinancementFieldset::class => InvokableFactory::class,
            ValidationFieldset::class => InvokableFactory::class
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
            ValidationFieldset::class => ValidationFieldsetFactory::class
        ],
    ],

    'hydrators' => [
        'factories' => [
        ],
    ],

    'service_manager' => [
        'factories' => [
            AdmissionService::class => AdmissionServiceFactory::class,
            FinancementService::class => FinancementServiceFactory::class,
            IndividuService::class => IndividuServiceFactory::class,
            InscriptionService::class => InscriptionServiceFactory::class
        ],
    ],

+82 −0
Changes for module/Admission/config/others/admission.config.php: 82 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Admission;


use Admission\Controller\AdmissionController;
use Admission\Service\Notification\NotificationFactory;
use Admission\Service\Notification\NotificationFactoryFactory;
use Laminas\Router\Http\Literal;
use UnicaenAuth\Guard\PrivilegeController;

return array(
    'bjyauthorize' => [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'envoyerMail'
                    ],
                ]
            ]
        ],
    ],
    'router' => [
        'routes' => [
            'admission' => [
                'child_routes' => [
                    'envoyer-mail' => [
                        'type' => Literal::class,
                        'options' => [
                            'route' => '/envoyer-mail',
                            'defaults' => [
                                /** @see AdmissionController::envoyerMailAction() */
                                'controller' => AdmissionController::class,
                                'action' => 'envoyerMail'
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],

    'controllers' => [
        'factories' => [
//            AdmissionController::class => AdmissionControllerFactory::class,
        ],
    ],

    'form_manager' => [
        'factories' => [
//            EtudiantFieldset::class => InvokableFactory::class,
//            InscriptionFieldset::class => InvokableFactory::class,
//            FinancementFieldset::class => InvokableFactory::class,
//            ValidationFieldset::class => InvokableFactory::class
        ],
    ],

    'service_manager' => [
        'factories' => [
            NotificationFactory::class => NotificationFactoryFactory::class,
        ],
    ],

    'view_manager' => [
        'template_path_stack' => [
            __DIR__ . '/../view',
        ],
    ],

    'public_files' => [
        'inline_scripts' => [
        ],
        'stylesheets' => [
            '080_admission' => '/css/admission.css',
        ],
        'head_scripts' => [
            '080_uploader' => "/js/admission.js",
        ],
    ],
);
+2 −4
Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -4,10 +4,8 @@ namespace Admission\Controller;

use Admission\Form\Etudiant\EtudiantForm;
use Laminas\Http\Response;
use Laminas\Session\Container;
use Laminas\View\Model\ViewModel;
use UnicaenApp\Controller\Plugin\MultipageFormPlugin;
use UnicaenApp\Exception\LogicException;
use UnicaenApp\Form\MultipageForm;
use Laminas\Mvc\Controller\AbstractActionController;

@@ -18,12 +16,12 @@ use Laminas\Mvc\Controller\AbstractActionController;
 */
class AdmissionAbstractController extends AbstractActionController
{
    protected function processMultipageForm(EtudiantForm $form)
    protected function processMultipageForm(EtudiantForm $form): ViewModel|Response
    {
        $response = $this->multipageForm($form)
            ->setUsePostRedirectGet()
            ->process();
//        var_dump($this->multipageForm($form)->getFormSessionData());

        if ($response instanceof Response) {
            return $response;
        }
+94 −58
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 94 added lines, 58 removed lines.
Original line number Diff line number Diff line
@@ -2,46 +2,100 @@

namespace Admission\Controller;

use Admission\Entity\Db\Individu;
use Admission\Form\Etudiant\EtudiantForm;
use Admission\Form\Etudiant\EtudiantFormAwareTrait;
use Admission\Hydrator\IndividuHydrator;
use Admission\Provider\Template\MailTemplates;
use Admission\Service\Individu\IndividuServiceAwareTrait;
use Admission\Service\Notification\NotificationFactoryAwareTrait;
use Application\Service\Discipline\DisciplineServiceAwareTrait;
use Laminas\Http\Response;
use Laminas\View\Model\ViewModel;
use Notification\Exception\RuntimeException;
use Notification\Service\NotifierServiceAwareTrait;
use Structure\Entity\Db\TypeStructure;
use Structure\Service\Structure\StructureServiceAwareTrait;
use UnicaenApp\Controller\Plugin\MultipageFormPlugin;

class AdmissionController extends AdmissionAbstractController {

    public function __construct(EtudiantForm $form)
    {
        $this->form = $form;
    }
    use StructureServiceAwareTrait;
    use DisciplineServiceAwareTrait;
    use NotificationFactoryAwareTrait;
    use NotifierServiceAwareTrait;
    use EtudiantFormAwareTrait;
    use IndividuServiceAwareTrait;

    public function ajouterAction()
    public function ajouterAction(): Response
    {
        return $this->multipageForm($this->form)
        return $this->multipageForm($this->getEtudiantForm())
            ->setUsePostRedirectGet()
            ->setReuseRequestQueryParams() // la redir vers la 1ere étape conservera les nom, prenom issus de la recherche
            ->start(); // réinit du plugin et redirection vers la 1ère étape
    }

    public function etudiantAction()
    public function etudiantAction(): Response|ViewModel
    {
        $this->form->get('etudiant')->get('infosEtudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
        $this->form->get('etudiant')->get('infosEtudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true));
        $this->getEtudiantForm()->get('etudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
        $this->getEtudiantForm()->get('etudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true));
        $request = $this->getRequest();
        var_dump($request);
        die();
//        $response = $this->processMultipageForm($this->getEtudiantForm());
//        if ($response instanceof Response) {
//            return $response;
//        }
//
//        $response->setTemplate('admission/ajouter-etudiant');

        $response = $this->processMultipageForm($this->form);
        if ($response instanceof Response) {
            return $response;
        }

        $response->setTemplate('admission/ajouter-etudiant');
        $data = $this->multipageForm($this->getEtudiantForm())->getFormSessionData();
        $this->getEtudiantForm()->bindValues($data);

        /** @var IndividuHydrator $individuObject */
        $individuObject = $this->getEtudiantForm()->getObject();

        try {
            /** @var Individu $individu */
            $individuData = $this->getEtudiantForm()->getData();
            $individu = $this->individuService->create($individuData);

            var_dump("c'est good!");
        }
        catch (\Exception $e) {
            var_dump("ça a pas marché");
        }
//        if ($request->isGet()) {
//            $data = $request->getPost();
//            var_dump($data);
//            $this->getEtudiantForm()->setData($data);
//            if (!$this->getEtudiantForm()->isValid()) {
//                var_dump("pas bon");
//                return $response;
//            }
//            var_dump("bon");
//        }
        return $response;
    }

    public function inscriptionAction()
    public function inscriptionAction(): Response|ViewModel
    {
        $this->form->get('inscription')->get('specifitesEnvisagees')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
        $data = $this->multipageForm($this->form)->getFormSessionData();
        $this->form->bindValues($data);
        $response = $this->processMultipageForm($this->form);
        //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();
        $this->getEtudiantForm()->get('inscription')->setDisciplines($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);

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

        $response = $this->processMultipageForm($this->getEtudiantForm());
        if ($response instanceof Response) {
            return $response;
        }
@@ -51,9 +105,9 @@ class AdmissionController extends AdmissionAbstractController {
        return $response;
    }

    public function financementAction()
    public function financementAction() : Response|ViewModel
    {
        $response = $this->processMultipageForm($this->form);
        $response = $this->processMultipageForm($this->getEtudiantForm());
        if ($response instanceof Response) {
            return $response;
        }
@@ -63,21 +117,22 @@ class AdmissionController extends AdmissionAbstractController {
        return $response;
    }

    public function validationAction()
    public function validationAction(): Response|ViewModel
    {
        $response = $this->processMultipageForm($this->form);
        $response = $this->processMultipageForm($this->getEtudiantForm());
        if ($response instanceof Response) {
            return $response;
        }
        $response->setVariable('data_form', "coucou");

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

        $response->setVariable('data_form', $data);
        $response->setTemplate('admission/ajouter-validation');

        return $response;
    }



    public function annulerAction()
    public function annulerAction(): Response
    {
        $this->multipageForm()->clearSession();

@@ -87,11 +142,11 @@ class AdmissionController extends AdmissionAbstractController {

    public function confirmerAction()
    {
        $response = $this->multipageForm($this->form)->process();
        $response = $this->multipageForm($this->getEtudiantForm())->process();
        if ($response instanceof Response) {
            return $response;
        }
        return array('form' => $this->form);
        return array('form' => $this->getEtudiantForm());
    }

//    public function ajouterEnregistrerAction()
@@ -103,34 +158,15 @@ class AdmissionController extends AdmissionAbstractController {
//        return $this->redirect()->toRoute('home');
//    }

    public function envoyerMailAction(): Response
    {
        try {
            $notif = $this->notificationFactory->createNotificationEnvoyerMail();
            $this->notifierService->trigger($notif);
        } catch (RuntimeException $e) {
            throw new RuntimeException("Un problème est survenu lors de l'envoi du mail [".MailTemplates::ENVOYER_MAIL."]",0,$e);
        }

//    public function addInformationsEtudiantAction() : ViewModel
//    {
//        $this->form->get('etudiant')->get('infosEtudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
//        $this->form->get('etudiant')->get('infosEtudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true));
//        return new ViewModel([
//            'form' => $this->form,
//        ]);
//    }
//    public function addInformationsInscriptionAction() : ViewModel
//    {
//        $this->form->get('inscription')->get('specifitesEnvisagees')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true));
//        return new ViewModel([
//            'form' => $this->form,
//        ]);
//    }
//
//    public function addInformationsFinancementAction() : ViewModel
//    {
//        return new ViewModel([
//            'form' => $this->form,
//        ]);
//    }
//
//    public function addInformationsJustificatifsAction() : ViewModel
//    {
//        return new ViewModel([
//            'form' => $this->form,
//        ]);
//    }
        return $this->redirect()->toRoute('home', [], [], true );
    }
}
 No newline at end of file
Loading