Loading module/Admission/config/module.config.php +69 −54 Changes for module/Admission/config/module.config.php: 69 added lines, 54 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,10 @@ namespace Admission; 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 Laminas\Router\Http\Segment; use Admission\Controller\AdmissionController; Loading @@ -17,19 +21,18 @@ return array( [ 'controller' => AdmissionController::class, 'action' => [ 'index', 'ajouter', 'etudiant', 'ajouterInscription', 'ajouterFinancement', 'ajouterJustificatifs', 'inscription', 'financement', 'validation', 'confirmer', 'annuler', 'addInformationsEtudiant', 'addInformationsInscription', 'addInformationsFinancement', 'addInformationsJustificatifs' ], 'role' => [], 'roles' => [], ] ] ] ], Loading Loading @@ -65,53 +68,53 @@ return array( ], ], ], // '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" // ], // ], // ], '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" ], ], ], ], ], Loading @@ -124,6 +127,15 @@ return array( ], ], 'form_manager' => [ 'factories' => [ EtudiantFieldset::class => InvokableFactory::class, InscriptionFieldset::class => InvokableFactory::class, FinancementFieldset::class => InvokableFactory::class, ValidationFieldset::class => InvokableFactory::class ], ], 'service_manager' => [ 'factories' => [ ], Loading @@ -141,5 +153,8 @@ return array( 'stylesheets' => [ '080_admission' => '/css/admission.css', ], 'head_scripts' => [ '080_uploader' => "/js/admission.js", ], ], ); module/Admission/src/Admission/Controller/AdmissionAbstractController.php +20 −5 Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 20 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2,13 +2,13 @@ namespace Admission\Controller; use Application\Controller\Plugin\LogMessenger; use Application\Controller\Plugin\Notifier; 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\Plugin\FlashMessenger\FlashMessenger; use ZfcUser\Controller\Plugin\ZfcUserAuthentication; use Laminas\Http\Request as HttpRequest; use Laminas\Mvc\Controller\AbstractActionController; /** Loading @@ -18,4 +18,19 @@ use Laminas\Mvc\Controller\AbstractActionController; */ class AdmissionAbstractController extends AbstractActionController { protected function processMultipageForm(EtudiantForm $form) { $response = $this->multipageForm($form) ->setUsePostRedirectGet() ->process(); // var_dump($this->multipageForm($form)->getFormSessionData()); if ($response instanceof Response) { return $response; } $form->prepare(); // requis return new ViewModel($response); } } No newline at end of file module/Admission/src/Admission/Controller/AdmissionController.php +85 −77 Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 85 added lines, 77 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Admission\Controller; use Admission\Form\Etudiant\EtudiantForm; use Laminas\Http\Response; use Laminas\View\Model\ViewModel; class AdmissionController extends AdmissionAbstractController { Loading @@ -12,32 +13,20 @@ class AdmissionController extends AdmissionAbstractController { $this->form = $form; } protected $form; public function indexAction() { return []; // TODO: Change the autogenerated stub } // public function ajouterAction() { // $form = $this->getForm(); // // return $this->multipageForm($form) // ->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 return $this->multipageForm($this->form) ->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() { $form = $this->getForm(); $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)); $form->get('etudiant')->get('infosEtudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true)); $form->get('etudiant')->get('infosEtudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true)); // $response = $this->processMultipageForm($form); $response = $this->processMultipageForm($this->form); if ($response instanceof Response) { return $response; } Loading @@ -46,83 +35,102 @@ class AdmissionController extends AdmissionAbstractController { return $response; } // protected function processMultipageForm(EtudiantForm $form) { $response = $this->multipageForm($form) ->setUsePostRedirectGet() ->process(); public function inscriptionAction() { $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); if ($response instanceof Response) { return $response; } $form->prepare(); // requis $response->setTemplate('admission/ajouter-inscription'); return new ViewModel($response); return $response; } // // public function ajouterAnnulerAction() // { // return $this->redirect()->toRoute('admission/informations-etudiants'); // } // // public function ajouterConfirmerAction() // { // $response = $this->multipageForm($this->getForm())->process(); // if ($response instanceof Response) { // return $response; // } // return array('form' => $this->getForm()); // } // // public function ajouterEnregistrerAction() // { // $data = $this->multipageForm($this->getForm())->getFormSessionData(); // // ... // // enregistrement en base de données (par exemple) // // ... // return $this->redirect()->toRoute('home'); // } // protected function getForm() public function financementAction() { if (null === $this->form) { $this->form = new EtudiantForm(); $response = $this->processMultipageForm($this->form); if ($response instanceof Response) { return $response; } return $this->form; } $response->setTemplate('admission/ajouter-financement'); return $response; } public function addInformationsEtudiantAction() : ViewModel public function validationAction() { $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, ]); $response = $this->processMultipageForm($this->form); if ($response instanceof Response) { return $response; } public function addInformationsInscriptionAction() : ViewModel { $this->form->get('inscription')->get('specifitesEnvisagees')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true)); return new ViewModel([ 'form' => $this->form, ]); $response->setVariable('data_form', "coucou"); $response->setTemplate('admission/ajouter-validation'); return $response; } public function addInformationsFinancementAction() : ViewModel public function annulerAction() { return new ViewModel([ 'form' => $this->form, ]); $this->multipageForm()->clearSession(); // todo: fournir une page de demande de confirmation d'annulation via le plugin multipageForm() ? return $this->redirect()->toRoute('admission/ajouter/etudiant'); } public function addInformationsJustificatifsAction() : ViewModel public function confirmerAction() { return new ViewModel([ 'form' => $this->form, ]); $response = $this->multipageForm($this->form)->process(); if ($response instanceof Response) { return $response; } return array('form' => $this->form); } // public function ajouterEnregistrerAction() // { // $data = $this->multipageForm($this->getForm())->getFormSessionData(); // // ... // // enregistrement en base de données (par exemple) // // ... // return $this->redirect()->toRoute('home'); // } // 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, // ]); // } } No newline at end of file module/Admission/src/Admission/Fieldset/Etudiant/EtudiantFieldset.php +0 −17 Changes for module/Admission/src/Admission/Fieldset/Etudiant/EtudiantFieldset.php: 0 added lines, 17 removed lines. Original line number Diff line number Diff line Loading @@ -5,23 +5,6 @@ use Laminas\Form\Fieldset; class EtudiantFieldset extends Fieldset { // public function __construct($name = null, $options = array()) // { // parent::__construct($name, $options); // $this->setLabel("Divers"); // // $this->add([ // 'name' => "infosEtudiant", // 'type' => InformationsEtudiantFieldset::class, // ]); // // $this->add([ // 'name' => "diplomeEtudiant", // 'type' => NiveauEtudeFieldset::class, // ]); // // } public function init() { $this->add([ Loading module/Admission/src/Admission/Fieldset/Etudiant/InformationsEtudiantFieldset.php +1 −163 Changes for module/Admission/src/Admission/Fieldset/Etudiant/InformationsEtudiantFieldset.php: 1 added line, 163 removed lines. Original line number Diff line number Diff line Loading @@ -37,168 +37,6 @@ class InformationsEtudiantFieldset extends Fieldset implements InputFilterProvid $this->$urlNationalite = $urlNationalite; $this->get('nationalite')->setAutocompleteSource($this->$urlNationalite); } // public function __construct($name = null, $options = array()) // { // parent::__construct($name, $options); // $this->add( // (new Hidden('id')) // ); // // $this->add( // (new Radio('civilite')) // ->setValueOptions([ // null => "(Aucune)", // Individu::CIVILITE_M => Individu::CIVILITE_M, // Individu::CIVILITE_MME => Individu::CIVILITE_MME, // ]) // ->setLabel("Civilité") // ); // // $this->add( // (new Text('nomUsuel')) // ->setLabel("Nom d'usage") // ); // // $this->add( // (new Text('nomPatronymique')) // ->setLabel("Nom") // ); // // $this->add( // (new Text('prenom1')) // ->setLabel("Prénom") // ); // // $this->add( // (new Text('prenom2')) // ->setLabel("Prénom 2 :") // ); // // $this->add( // (new Text('prenom3')) // ->setLabel("Prénom 3 :") // ); // // $this->add( // (new Text('ine')) // ->setLabel("Numéro I.N.E (Numéro inscrit au verso de la carte)") // ); // // $this->add( // (new Text('numero_etudiant')) // ->setLabel("Numéro Etudiant (pour les étudiants déjà inscrits à Unicaen)") // ); // // $this->add( // (new Email('email')) // ->setLabel("Mél") // ); // // $this->add( // (new Date('dateNaissance')) // ->setLabel("Date de naissance") // ); // // $paysNationalite = new SearchAndSelect('paysNationalite', ['label' => "Pays de naissance"]); // $paysNationalite // ->setAutocompleteSource($this->urlPaysNationalite) // ->setSelectionRequired() // ->setAttributes([ // 'class' => 'selectpicker show-tick', // 'data-live-search' => 'true', // 'id' => 'paysNationalite', // ]); // $this->add($paysNationalite); // // $this->add( // (new Text('ville_naissance')) // ->setLabel("Ville de naissance") // ); // // $this->add( // (new Text('nationalite')) // ->setLabel("Nationalité") // ); // // $nationalite = new SearchAndSelect('nationalite', ['label' => "Nationalité"]); // $nationalite // ->setAutocompleteSource($this->urlNationalite) // ->setSelectionRequired() // ->setAttributes([ // 'class' => 'selectpicker show-tick', // 'data-live-search' => 'true', // 'id' => 'nationalite', // ]); // $this->add($nationalite); // // $this->add( // (new Hidden('code_pays_nationalite')) // ); // // $this->add( // (new Hidden('code_nationalite')) // ); // // $this->add( // (new Text('adresse_ligne1_etage')) // ->setLabel("Adresse") // ); // // $this->add( // (new Text('adresse_ligne2_etage')) // ->setLabel("Adresse") // ); // // $this->add( // (new Text('adresse_ligne3_batiment')) // ->setLabel("Adresse (Bâtiment)") // ); // // $this->add( // (new Text('adresse_ligne3_bvoie')) // ->setLabel("Adresse") // ); // // $this->add( // (new Text('adresse_ligne4_complement')) // ->setLabel("Adresse (complément)") // ); // // $this->add( // (new Number('adresse_code_postale')) // ->setLabel("Code postal") // ); // // $this->add( // (new Text('adresse_code_commune')) // ->setLabel("Ville") // ); // // $this->add( // (new Number('adresse_cp_ville_etranger')) // ->setLabel("Code postal") // ); // // $this->add( // (new Tel('numero_telephone1')) // ->setLabel("Numéro de téléphone") // ); // // $this->add( // (new Tel('numero_telephone2')) // ->setLabel("Numéro de téléphone") // ); // // $this->add( // (new Radio('situation_handicap')) // ->setValueOptions([ // 1 => "Oui", // 0 => "Non", // ]) // ->setLabel("Êtes-vous en situation de handicap ?") // ); // } public function init() { Loading Loading @@ -389,7 +227,7 @@ class InformationsEtudiantFieldset extends Fieldset implements InputFilterProvid ], 'prenom1' => [ 'name' => 'prenom1', 'required' => true, 'required' => false, 'filters' => [ ['name' => StripTags::class], ['name' => StringTrim::class], Loading Loading
module/Admission/config/module.config.php +69 −54 Changes for module/Admission/config/module.config.php: 69 added lines, 54 removed lines. Original line number Diff line number Diff line Loading @@ -4,6 +4,10 @@ namespace Admission; 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 Laminas\Router\Http\Segment; use Admission\Controller\AdmissionController; Loading @@ -17,19 +21,18 @@ return array( [ 'controller' => AdmissionController::class, 'action' => [ 'index', 'ajouter', 'etudiant', 'ajouterInscription', 'ajouterFinancement', 'ajouterJustificatifs', 'inscription', 'financement', 'validation', 'confirmer', 'annuler', 'addInformationsEtudiant', 'addInformationsInscription', 'addInformationsFinancement', 'addInformationsJustificatifs' ], 'role' => [], 'roles' => [], ] ] ] ], Loading Loading @@ -65,53 +68,53 @@ return array( ], ], ], // '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" // ], // ], // ], '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" ], ], ], ], ], Loading @@ -124,6 +127,15 @@ return array( ], ], 'form_manager' => [ 'factories' => [ EtudiantFieldset::class => InvokableFactory::class, InscriptionFieldset::class => InvokableFactory::class, FinancementFieldset::class => InvokableFactory::class, ValidationFieldset::class => InvokableFactory::class ], ], 'service_manager' => [ 'factories' => [ ], Loading @@ -141,5 +153,8 @@ return array( 'stylesheets' => [ '080_admission' => '/css/admission.css', ], 'head_scripts' => [ '080_uploader' => "/js/admission.js", ], ], );
module/Admission/src/Admission/Controller/AdmissionAbstractController.php +20 −5 Changes for module/Admission/src/Admission/Controller/AdmissionAbstractController.php: 20 added lines, 5 removed lines. Original line number Diff line number Diff line Loading @@ -2,13 +2,13 @@ namespace Admission\Controller; use Application\Controller\Plugin\LogMessenger; use Application\Controller\Plugin\Notifier; 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\Plugin\FlashMessenger\FlashMessenger; use ZfcUser\Controller\Plugin\ZfcUserAuthentication; use Laminas\Http\Request as HttpRequest; use Laminas\Mvc\Controller\AbstractActionController; /** Loading @@ -18,4 +18,19 @@ use Laminas\Mvc\Controller\AbstractActionController; */ class AdmissionAbstractController extends AbstractActionController { protected function processMultipageForm(EtudiantForm $form) { $response = $this->multipageForm($form) ->setUsePostRedirectGet() ->process(); // var_dump($this->multipageForm($form)->getFormSessionData()); if ($response instanceof Response) { return $response; } $form->prepare(); // requis return new ViewModel($response); } } No newline at end of file
module/Admission/src/Admission/Controller/AdmissionController.php +85 −77 Changes for module/Admission/src/Admission/Controller/AdmissionController.php: 85 added lines, 77 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Admission\Controller; use Admission\Form\Etudiant\EtudiantForm; use Laminas\Http\Response; use Laminas\View\Model\ViewModel; class AdmissionController extends AdmissionAbstractController { Loading @@ -12,32 +13,20 @@ class AdmissionController extends AdmissionAbstractController { $this->form = $form; } protected $form; public function indexAction() { return []; // TODO: Change the autogenerated stub } // public function ajouterAction() { // $form = $this->getForm(); // // return $this->multipageForm($form) // ->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 return $this->multipageForm($this->form) ->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() { $form = $this->getForm(); $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)); $form->get('etudiant')->get('infosEtudiant')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true)); $form->get('etudiant')->get('infosEtudiant')->setUrlNationalite($this->url()->fromRoute('pays/rechercher-nationalite', [], [], true)); // $response = $this->processMultipageForm($form); $response = $this->processMultipageForm($this->form); if ($response instanceof Response) { return $response; } Loading @@ -46,83 +35,102 @@ class AdmissionController extends AdmissionAbstractController { return $response; } // protected function processMultipageForm(EtudiantForm $form) { $response = $this->multipageForm($form) ->setUsePostRedirectGet() ->process(); public function inscriptionAction() { $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); if ($response instanceof Response) { return $response; } $form->prepare(); // requis $response->setTemplate('admission/ajouter-inscription'); return new ViewModel($response); return $response; } // // public function ajouterAnnulerAction() // { // return $this->redirect()->toRoute('admission/informations-etudiants'); // } // // public function ajouterConfirmerAction() // { // $response = $this->multipageForm($this->getForm())->process(); // if ($response instanceof Response) { // return $response; // } // return array('form' => $this->getForm()); // } // // public function ajouterEnregistrerAction() // { // $data = $this->multipageForm($this->getForm())->getFormSessionData(); // // ... // // enregistrement en base de données (par exemple) // // ... // return $this->redirect()->toRoute('home'); // } // protected function getForm() public function financementAction() { if (null === $this->form) { $this->form = new EtudiantForm(); $response = $this->processMultipageForm($this->form); if ($response instanceof Response) { return $response; } return $this->form; } $response->setTemplate('admission/ajouter-financement'); return $response; } public function addInformationsEtudiantAction() : ViewModel public function validationAction() { $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, ]); $response = $this->processMultipageForm($this->form); if ($response instanceof Response) { return $response; } public function addInformationsInscriptionAction() : ViewModel { $this->form->get('inscription')->get('specifitesEnvisagees')->setUrlPaysNationalite($this->url()->fromRoute('pays/rechercher-pays', [], [], true)); return new ViewModel([ 'form' => $this->form, ]); $response->setVariable('data_form', "coucou"); $response->setTemplate('admission/ajouter-validation'); return $response; } public function addInformationsFinancementAction() : ViewModel public function annulerAction() { return new ViewModel([ 'form' => $this->form, ]); $this->multipageForm()->clearSession(); // todo: fournir une page de demande de confirmation d'annulation via le plugin multipageForm() ? return $this->redirect()->toRoute('admission/ajouter/etudiant'); } public function addInformationsJustificatifsAction() : ViewModel public function confirmerAction() { return new ViewModel([ 'form' => $this->form, ]); $response = $this->multipageForm($this->form)->process(); if ($response instanceof Response) { return $response; } return array('form' => $this->form); } // public function ajouterEnregistrerAction() // { // $data = $this->multipageForm($this->getForm())->getFormSessionData(); // // ... // // enregistrement en base de données (par exemple) // // ... // return $this->redirect()->toRoute('home'); // } // 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, // ]); // } } No newline at end of file
module/Admission/src/Admission/Fieldset/Etudiant/EtudiantFieldset.php +0 −17 Changes for module/Admission/src/Admission/Fieldset/Etudiant/EtudiantFieldset.php: 0 added lines, 17 removed lines. Original line number Diff line number Diff line Loading @@ -5,23 +5,6 @@ use Laminas\Form\Fieldset; class EtudiantFieldset extends Fieldset { // public function __construct($name = null, $options = array()) // { // parent::__construct($name, $options); // $this->setLabel("Divers"); // // $this->add([ // 'name' => "infosEtudiant", // 'type' => InformationsEtudiantFieldset::class, // ]); // // $this->add([ // 'name' => "diplomeEtudiant", // 'type' => NiveauEtudeFieldset::class, // ]); // // } public function init() { $this->add([ Loading
module/Admission/src/Admission/Fieldset/Etudiant/InformationsEtudiantFieldset.php +1 −163 Changes for module/Admission/src/Admission/Fieldset/Etudiant/InformationsEtudiantFieldset.php: 1 added line, 163 removed lines. Original line number Diff line number Diff line Loading @@ -37,168 +37,6 @@ class InformationsEtudiantFieldset extends Fieldset implements InputFilterProvid $this->$urlNationalite = $urlNationalite; $this->get('nationalite')->setAutocompleteSource($this->$urlNationalite); } // public function __construct($name = null, $options = array()) // { // parent::__construct($name, $options); // $this->add( // (new Hidden('id')) // ); // // $this->add( // (new Radio('civilite')) // ->setValueOptions([ // null => "(Aucune)", // Individu::CIVILITE_M => Individu::CIVILITE_M, // Individu::CIVILITE_MME => Individu::CIVILITE_MME, // ]) // ->setLabel("Civilité") // ); // // $this->add( // (new Text('nomUsuel')) // ->setLabel("Nom d'usage") // ); // // $this->add( // (new Text('nomPatronymique')) // ->setLabel("Nom") // ); // // $this->add( // (new Text('prenom1')) // ->setLabel("Prénom") // ); // // $this->add( // (new Text('prenom2')) // ->setLabel("Prénom 2 :") // ); // // $this->add( // (new Text('prenom3')) // ->setLabel("Prénom 3 :") // ); // // $this->add( // (new Text('ine')) // ->setLabel("Numéro I.N.E (Numéro inscrit au verso de la carte)") // ); // // $this->add( // (new Text('numero_etudiant')) // ->setLabel("Numéro Etudiant (pour les étudiants déjà inscrits à Unicaen)") // ); // // $this->add( // (new Email('email')) // ->setLabel("Mél") // ); // // $this->add( // (new Date('dateNaissance')) // ->setLabel("Date de naissance") // ); // // $paysNationalite = new SearchAndSelect('paysNationalite', ['label' => "Pays de naissance"]); // $paysNationalite // ->setAutocompleteSource($this->urlPaysNationalite) // ->setSelectionRequired() // ->setAttributes([ // 'class' => 'selectpicker show-tick', // 'data-live-search' => 'true', // 'id' => 'paysNationalite', // ]); // $this->add($paysNationalite); // // $this->add( // (new Text('ville_naissance')) // ->setLabel("Ville de naissance") // ); // // $this->add( // (new Text('nationalite')) // ->setLabel("Nationalité") // ); // // $nationalite = new SearchAndSelect('nationalite', ['label' => "Nationalité"]); // $nationalite // ->setAutocompleteSource($this->urlNationalite) // ->setSelectionRequired() // ->setAttributes([ // 'class' => 'selectpicker show-tick', // 'data-live-search' => 'true', // 'id' => 'nationalite', // ]); // $this->add($nationalite); // // $this->add( // (new Hidden('code_pays_nationalite')) // ); // // $this->add( // (new Hidden('code_nationalite')) // ); // // $this->add( // (new Text('adresse_ligne1_etage')) // ->setLabel("Adresse") // ); // // $this->add( // (new Text('adresse_ligne2_etage')) // ->setLabel("Adresse") // ); // // $this->add( // (new Text('adresse_ligne3_batiment')) // ->setLabel("Adresse (Bâtiment)") // ); // // $this->add( // (new Text('adresse_ligne3_bvoie')) // ->setLabel("Adresse") // ); // // $this->add( // (new Text('adresse_ligne4_complement')) // ->setLabel("Adresse (complément)") // ); // // $this->add( // (new Number('adresse_code_postale')) // ->setLabel("Code postal") // ); // // $this->add( // (new Text('adresse_code_commune')) // ->setLabel("Ville") // ); // // $this->add( // (new Number('adresse_cp_ville_etranger')) // ->setLabel("Code postal") // ); // // $this->add( // (new Tel('numero_telephone1')) // ->setLabel("Numéro de téléphone") // ); // // $this->add( // (new Tel('numero_telephone2')) // ->setLabel("Numéro de téléphone") // ); // // $this->add( // (new Radio('situation_handicap')) // ->setValueOptions([ // 1 => "Oui", // 0 => "Non", // ]) // ->setLabel("Êtes-vous en situation de handicap ?") // ); // } public function init() { Loading Loading @@ -389,7 +227,7 @@ class InformationsEtudiantFieldset extends Fieldset implements InputFilterProvid ], 'prenom1' => [ 'name' => 'prenom1', 'required' => true, 'required' => false, 'filters' => [ ['name' => StripTags::class], ['name' => StringTrim::class], Loading