Commit 15b713b8 authored by thomas.hamel's avatar thomas.hamel Committed by Thomas Hamel
Browse files

WIP: ajout et modif de l'hydrator Admission

parent 4e20aa6b
Loading
Loading
Loading
Loading
+3 −0
Changes for module/Admission/config/module.config.php: 3 added lines, 0 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\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormFactory;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Etudiant\EtudiantFieldsetFactory;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
@@ -106,6 +108,7 @@ return array(

    'form_manager' => [
        'factories' => [
            AdmissionForm::class => AdmissionFormFactory::class,
            EtudiantFieldset::class => EtudiantFieldsetFactory::class,
            InscriptionFieldset::class => InscriptionFieldsetFactory::class,
            FinancementFieldset::class => FinancementFieldsetFactory::class,
+2 −2
Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@

namespace Admission\Controller;

use Admission\Form\Etudiant\EtudiantForm;
use Admission\Form\Admission\AdmissionForm;
use Laminas\Http\Response;
use Laminas\View\Model\ViewModel;
use UnicaenApp\Controller\Plugin\MultipageFormPlugin;
@@ -16,7 +16,7 @@ use Laminas\Mvc\Controller\AbstractActionController;
 */
class AdmissionAbstractController extends AbstractActionController
{
    protected function processMultipageForm(EtudiantForm $form): ViewModel|Response
    protected function processMultipageForm(AdmissionForm $form): ViewModel|Response
    {
        $response = $this->multipageForm($form)
            ->setUsePostRedirectGet()
+9 −14
Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 9 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@
namespace Admission\Controller;

use Admission\Entity\Db\Individu;
use Admission\Form\Etudiant\EtudiantForm;
use Admission\Form\Etudiant\EtudiantFormAwareTrait;
use Admission\Form\Admission\AdmissionForm;
use Admission\Form\Admission\AdmissionFormAwareTrait;
use Admission\Hydrator\IndividuHydrator;
use Admission\Provider\Template\MailTemplates;
use Admission\Service\Individu\IndividuServiceAwareTrait;
@@ -17,6 +17,7 @@ use Notification\Service\NotifierServiceAwareTrait;
use Structure\Entity\Db\TypeStructure;
use Structure\Service\Structure\StructureServiceAwareTrait;
use UnicaenApp\Controller\Plugin\MultipageFormPlugin;
use UnicaenApp\Form\Fieldset\MultipageFormNavFieldset;

class AdmissionController extends AdmissionAbstractController {

@@ -24,7 +25,7 @@ class AdmissionController extends AdmissionAbstractController {
    use DisciplineServiceAwareTrait;
    use NotificationFactoryAwareTrait;
    use NotifierServiceAwareTrait;
    use EtudiantFormAwareTrait;
    use AdmissionFormAwareTrait;
    use IndividuServiceAwareTrait;

    public function ajouterAction(): Response
@@ -53,21 +54,16 @@ class AdmissionController extends AdmissionAbstractController {
        $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->getEtudiantForm()->get('etudiant')->getHydrator());

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

        var_dump($data);

        /** @var Individu $individu */
        $individu = $this->getEtudiantForm()->get('etudiant')->populateValues($data["etudiant"]);
//
        $individu = $this->getEtudiantForm()->getObject();
        var_dump($individu);
//        $event = $this->individuService->create($individu);

        var_dump($this->getEtudiantForm()->get('etudiant')->getObject());
//        $this->individuService->create($individu);
//        var_dump($this->getEtudiantForm()->get('etudiant'));
        if ($response instanceof Response) {
            return $response;
        }
@@ -79,7 +75,6 @@ class AdmissionController extends AdmissionAbstractController {

    public function inscriptionAction(): Response|ViewModel
    {
//        var_dump($this->getRequest()->getPost()['inscription']['_nav']);
        var_dump($this->params()->fromPost());

        //Partie Informations sur l'inscription
+3 −3
Changes for module/Admission/src/Admission/Controller/AdmissionControllerFactory.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
<?php
namespace Admission\Controller;

use Admission\Form\Etudiant\EtudiantForm;
use Admission\Form\Admission\AdmissionForm;
use Admission\Service\Individu\IndividuService;
use Admission\Service\Notification\NotificationFactory;
use Application\Service\Discipline\DisciplineService;
@@ -35,9 +35,9 @@ class AdmissionControllerFactory implements FactoryInterface
        $notifierService = $container->get(NotifierService::class);

        /**
         * @var EtudiantForm $etudiantForm
         * @var AdmissionForm $etudiantForm
         */
        $etudiantForm = $container->get('FormElementManager')->get(EtudiantForm::class);
        $etudiantForm = $container->get('FormElementManager')->get(AdmissionForm::class);

        $controller = new AdmissionController();

+3 −3
Changes for module/Admission/src/Admission/Form/Admission/AdmissionForm.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
<?php

namespace Admission\Form\Etudiant;
namespace Admission\Form\Admission;

use Admission\Form\Fieldset\Etudiant\EtudiantFieldset;
use Admission\Form\Fieldset\Financement\FinancementFieldset;
@@ -9,14 +9,14 @@ use Admission\Form\Fieldset\Validation\ValidationFieldset;
use UnicaenApp\Form\Fieldset\MultipageFormNavFieldset;
use UnicaenApp\Form\MultipageForm;

class EtudiantForm extends MultipageForm
class AdmissionForm extends MultipageForm
{
    public function init()
    {
        parent::init();

        $etudiantFieldset = $this->getFormFactory()->getFormElementManager()->get(EtudiantFieldset::class);
        $etudiantFieldset->setName("etudiant")->setAttribute('class',"etudiantt");
        $etudiantFieldset->setName("etudiant")  ;
        $this->add($etudiantFieldset)->setAttribute('class',"etudiantt");

        $inscriptionFieldset = $this->getFormFactory()->getFormElementManager()->get(InscriptionFieldset::class);
Loading