administration participants étudiant et personnel (4d5db891) · Commits · open-source / inscription_suac

module/Atelier/view/atelier/inscription/modifier.phtml

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		use Atelier\Form\Inscription\InscriptionForm;

		/**
		* @see InscriptionController::ajouterExterneAction()
		* @see InscriptionController::ajouterParticipantAction()
		* @see InscriptionController::modifierAction()
		* @var InscriptionForm $form
		*/

module/Evenementiel/config/merged/Evenement.config.php

+6 −5

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ return [
		'modifier',
		'televerser-image',
		'supprimer-image',
		'inscription-externe-gestionnaire',
		'inscription-participant-gestionnaire',
		'inscription-etudiant-gestionnaire'
		],
		'privileges' => [
		@@ -100,7 +100,7 @@ return [
		[
		'controller' => EvenementController::class,
		'action' => [
		'inscription-externe-gestionnaire',
		'inscription-participant-gestionnaire',
		'inscription-etudiant-gestionnaire',
		'inscription-personnel-gestionnaire'
		],
		@@ -283,12 +283,13 @@ return [
		],
		],
		],
		'inscription-externe-gestionnaire' => [
		'inscription-participant-gestionnaire' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/inscription-externe-gestionnaire/:entity',
		/** @see EvenementController::inscriptionParticipantGestionnaireAction() */
		'route' => '/inscription-participant-gestionnaire/:entity',
		'defaults' => [
		'action' => 'inscription-externe-gestionnaire',
		'action' => 'inscription-participant-gestionnaire',
		],
		],
		],

module/Evenementiel/config/merged/Inscription.config.php

+11 −10

Original line number	Diff line number	Diff line
		@@ -22,10 +22,10 @@ use Evenementiel\Service\Inscription\InscriptionServiceFactory;
		use Evenementiel\Provider\Privilege\EvenementielinscriptionPrivileges;
		use Evenementiel\Controller\InscriptionController;
		use Evenementiel\Controller\InscriptionControllerFactory;
		use Evenementiel\Form\Inscription\InscriptionExterneForm;
		use Evenementiel\Form\Inscription\InscriptionExterneFormFactory;
		use Evenementiel\Form\Inscription\InscriptionExterneHydrator;
		use Evenementiel\Form\Inscription\InscriptionExterneHydratorFactory;
		use Evenementiel\Form\Inscription\InscriptionParticipantForm;
		use Evenementiel\Form\Inscription\InscriptionParticipantFormFactory;
		use Evenementiel\Form\Inscription\InscriptionParticipantHydrator;
		use Evenementiel\Form\Inscription\InscriptionParticipantHydratorFactory;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;

		return [
		@@ -71,7 +71,7 @@ return [
		[
		'controller' => InscriptionController::class,
		'action' => [
		'ajouter-externe',
		'ajouter-participant',
		],
		'privileges' => [
		EvenementielinscriptionPrivileges::AJOUTER,
		@@ -162,12 +162,13 @@ return [
		],
		],
		],
		'ajouter-externe' => [
		'ajouter-participant' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter-externe',
		'route' => '/ajouter-participant',
		'defaults' => [
		'action' => 'ajouter-externe',
		/** @see InscriptionController::ajouterParticipantAction() */
		'action' => 'ajouter-participant',
		],
		],
		],
		@@ -331,14 +332,14 @@ return [
		],
		'form_elements' => [
		'factories' => [
		InscriptionExterneForm::class => InscriptionExterneFormFactory::class,
		InscriptionParticipantForm::class => InscriptionParticipantFormFactory::class,
		InscriptionEtudiantForm::class => InscriptionEtudiantFormFactory::class,
		InscriptionPersonnelForm::class => InscriptionPersonnelFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		InscriptionExterneHydrator::class => InscriptionExterneHydratorFactory::class,
		InscriptionParticipantHydrator::class => InscriptionParticipantHydratorFactory::class,
		InscriptionEtudiantHydrator::class => InscriptionEtudiantHydratorFactory::class,
		InscriptionPersonnelHydrator::class => InscriptionPersonnelHydratorFactory::class,
		],

module/Evenementiel/config/merged/Participant.config.php

+26 −0

Original line number	Diff line number	Diff line
		@@ -4,10 +4,14 @@ namespace Participant;

		use Evenementiel\Controller\ParticipantController;
		use Evenementiel\Controller\ParticipantControllerFactory;
		use Evenementiel\Form\Participant\EtudiantForm;
		use Evenementiel\Form\Participant\EtudiantFormFactory;
		use Evenementiel\Form\Participant\ParticipantForm;
		use Evenementiel\Form\Participant\ParticipantFormFactory;
		use Evenementiel\Form\Participant\ParticipantHydrator;
		use Evenementiel\Form\Participant\ParticipantHydratorFactory;
		use Evenementiel\Form\Participant\PersonnelForm;
		use Evenementiel\Form\Participant\PersonnelFormFactory;
		use Evenementiel\Provider\Privilege\EvenementielparticipantPrivileges;
		use Evenementiel\Service\Participant\ParticipantService;
		use Evenementiel\Service\Participant\ParticipantServiceFactory;
		@@ -43,6 +47,8 @@ return [
		'controller' => ParticipantController::class,
		'action' => [
		'ajouter-externe',
		'ajouter-etudiant',
		'ajouter-personnel',
		],
		'privileges' => [
		EvenementielparticipantPrivileges::AJOUTER,
		@@ -122,6 +128,24 @@ return [
		],
		],
		],
		'ajouter-etudiant' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter-etudiant',
		'defaults' => [
		'action' => 'ajouter-etudiant',
		],
		],
		],
		'ajouter-personnel' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/ajouter-personnel',
		'defaults' => [
		'action' => 'ajouter-personnel',
		],
		],
		],
		'modifier' => [
		'type' => Segment::class,
		'options' => [
		@@ -207,6 +231,8 @@ return [
		'form_elements' => [
		'factories' => [
		ParticipantForm::class => ParticipantFormFactory::class,
		EtudiantForm::class => EtudiantFormFactory::class,
		PersonnelForm::class => PersonnelFormFactory::class,
		],
		],
		'hydrators' => [

module/Evenementiel/src/Controller/EvenementController.php

+7 −7

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ use Evenementiel\Entity\Db\Evenement;
		use Evenementiel\Entity\Db\Inscription;
		use Evenementiel\Entity\Db\Participant;
		use Evenementiel\Form\Inscription\InscriptionEtudiantFormAwareTrait;
		use Evenementiel\Form\Inscription\InscriptionExterneFormAwareTrait;
		use Evenementiel\Form\Inscription\InscriptionParticipantFormAwareTrait;
		use Evenementiel\Provider\Etat\EvenementEtats;
		use Evenementiel\Provider\Etat\InscriptionEtats;
		use Evenementiel\Service\Inscription\InscriptionServiceAwareTrait;
		@@ -42,7 +42,7 @@ class EvenementController extends AbstractActionController
		use UploadFormAwareTrait;
		use EtatInstanceServiceAwareTrait;
		use EtatTypeServiceAwareTrait;
		use InscriptionExterneFormAwareTrait;
		use InscriptionParticipantFormAwareTrait;
		use InscriptionServiceAwareTrait;
		use InscriptionEtudiantFormAwareTrait;
		use ParticipantServiceAwareTrait;
		@@ -339,20 +339,20 @@ class EvenementController extends AbstractActionController

		/ Ajout d'inscription *****************************************************************************************/

		public function inscriptionExterneGestionnaireAction(): ViewModel
		public function inscriptionParticipantGestionnaireAction(): ViewModel
		{
		$evenement = $this->getEvenementService()->getRequestedEntity($this);

		$inscription = new Inscription();
		$inscription->setEvenement($evenement);

		$form = $this->getInscriptionExterneForm();
		$form = $this->getInscriptionParticipantForm();

		// ne pas afficher le label et le champ evenement
		$form->get('evenement')->setLabel('');
		$form->get('evenement')->setAttribute('style', 'display: none;');

		$form->setAttribute('action', $this->url()->fromRoute('evenementiel/evenement/inscription-externe-gestionnaire', ['entity' => $evenement->getId()], [], true));
		$form->setAttribute('action', $this->url()->fromRoute('evenementiel/evenement/inscription-participant-gestionnaire', ['entity' => $evenement->getId()], [], true));
		$form->setAttribute("method", "post");
		$form->bind($inscription);

		@@ -370,7 +370,7 @@ class EvenementController extends AbstractActionController
		}

		$vm = new ViewModel([
		'title' => "Inscription d'un·e Extern·e à l'évènement " . $evenement->getLibelle() . " du" . $evenement->getDateToString(),
		'title' => "Inscription d'un·e Participant·e à l'évènement " . $evenement->getLibelle() . " du" . $evenement->getDateToString(),
		'form' => $form,
		]);
		$vm->setTemplate('evenementiel/inscription/modifier');
		@@ -578,7 +578,7 @@ class EvenementController extends AbstractActionController
		{
		$evenement = $this->getEvenementService()->getRequestedEntity($this);
		$participant = $this->getParticipantService()->getRequestedEntity($this,'participant');
		$form = $this->getInscriptionExterneForm();
		$form = $this->getInscriptionParticipantForm();


		// Masquer les champs communs