Loading module/Formation/config/merged/formation-instance-frais.config.php −74 File deleted. Show changes module/Formation/config/merged/inscription.config.php +33 −2 Changes for module/Formation/config/merged/inscription.config.php: 33 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -2,12 +2,17 @@ namespace Formation; use Formation\Controller\FormationController; use Formation\Controller\InscriptionController; use Formation\Controller\InscriptionControllerFactory; use Formation\Form\Inscription\InscriptionForm; use Formation\Form\Inscription\InscriptionFormFactory; use Formation\Form\Inscription\InscriptionHydrator; use Formation\Form\Inscription\InscriptionHydratorFactory; use Formation\Form\InscriptionFrais\InscriptionFraisForm; use Formation\Form\InscriptionFrais\InscriptionFraisFormFactory; use Formation\Form\InscriptionFrais\InscriptionFraisHydrator; use Formation\Form\InscriptionFrais\InscriptionFraisHydratorFactory; use Formation\Form\Justificatif\JustificatifForm; use Formation\Form\Justificatif\JustificatifFormFactory; use Formation\Form\Justificatif\JustificatifHydrator; Loading @@ -16,6 +21,8 @@ use Formation\Provider\Privilege\FormationinstanceinscritPrivileges; use Formation\Provider\Privilege\FormationinstancePrivileges; use Formation\Service\Inscription\InscriptionService; use Formation\Service\Inscription\InscriptionServiceFactory; use Formation\Service\InscriptionFrais\InscriptionFraisService; use Formation\Service\InscriptionFrais\InscriptionFraisServiceFactory; use UnicaenPrivilege\Guard\PrivilegeController; use Laminas\Router\Http\Literal; use Laminas\Router\Http\Segment; Loading @@ -42,6 +49,7 @@ return [ 'historiser', 'restaurer', 'supprimer', 'renseigner-frais', ], 'privileges' => [ FormationinstancePrivileges::FORMATIONINSTANCE_GERER_INSCRIPTION, Loading Loading @@ -78,13 +86,21 @@ return [ 'router' => [ 'routes' => [ 'formation' => [ 'type' => Literal::class, 'options' => [ 'route' => '/formation', 'defaults' => [ 'controller' => FormationController::class, 'action' => 'index', ], ], 'may_terminate' => true, 'child_routes' => [ 'inscription' => [ 'type' => Literal::class, 'options' => [ 'route' => '/inscription', 'defaults' => [ /** @see InscriptionController::indexAction() */ 'controller' => InscriptionController::class, 'action' => 'index', ], Loading Loading @@ -233,6 +249,18 @@ return [ ], ], ], /** autre * */ 'renseigner-frais' => [ 'type' => Segment::class, 'options' => [ 'route' => '/renseigner-frais/:inscription', 'defaults' => [ /** @see InscriptionController::renseignerFraisAction() */ 'controller' => InscriptionController::class, 'action' => 'renseigner-frais', ], ], ], ], ], ], Loading @@ -242,7 +270,8 @@ return [ 'service_manager' => [ 'factories' => [ InscriptionService::class => InscriptionServiceFactory::class InscriptionService::class => InscriptionServiceFactory::class, InscriptionFraisService::class => InscriptionFraisServiceFactory::class, ], ], 'controllers' => [ Loading @@ -253,6 +282,7 @@ return [ 'form_elements' => [ 'factories' => [ InscriptionForm::class => InscriptionFormFactory::class, InscriptionFraisForm::class => InscriptionFraisFormFactory::class, JustificatifForm::class => JustificatifFormFactory::class, ], ], Loading @@ -260,6 +290,7 @@ return [ 'factories' => [ InscriptionHydrator::class => InscriptionHydratorFactory::class, JustificatifHydrator::class => JustificatifHydratorFactory::class, InscriptionFraisHydrator::class => InscriptionFraisHydratorFactory::class, ], ] Loading module/Formation/config/merged/presence.config.php +2 −2 Changes for module/Formation/config/merged/presence.config.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -55,7 +55,7 @@ return [ 'toggle-presence' => [ 'type' => Segment::class, 'options' => [ 'route' => '/toggle-presence/:journee/:inscrit', 'route' => '/toggle-presence/:journee/:inscription', 'defaults' => [ /** @see PresenceController::togglePresenceAction() */ 'controller' => PresenceController::class, Loading @@ -66,7 +66,7 @@ return [ 'toggle-presences' => [ 'type' => Segment::class, 'options' => [ 'route' => '/toggle-presences/:mode/:inscrit', 'route' => '/toggle-presences/:mode/:inscription', 'defaults' => [ /** @see PresenceController::togglePresencesAction() */ 'controller' => PresenceController::class, Loading module/Formation/src/Formation/Controller/FormationInstanceController.php +1 −1 Changes for module/Formation/src/Formation/Controller/FormationInstanceController.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -84,7 +84,7 @@ class FormationInstanceController extends AbstractActionController $dictionnaire = []; foreach ($presences as $presence) { $dictionnaire[$presence->getJournee()->getId()][$presence->getInscrit()->getId()] = $presence; $dictionnaire[$presence->getJournee()->getId()][$presence->getInscription()->getId()] = $presence; } return new ViewModel([ Loading module/Formation/src/Formation/Controller/FormationInstanceFraisController.php −53 File deleted. Show changes Loading
module/Formation/config/merged/inscription.config.php +33 −2 Changes for module/Formation/config/merged/inscription.config.php: 33 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -2,12 +2,17 @@ namespace Formation; use Formation\Controller\FormationController; use Formation\Controller\InscriptionController; use Formation\Controller\InscriptionControllerFactory; use Formation\Form\Inscription\InscriptionForm; use Formation\Form\Inscription\InscriptionFormFactory; use Formation\Form\Inscription\InscriptionHydrator; use Formation\Form\Inscription\InscriptionHydratorFactory; use Formation\Form\InscriptionFrais\InscriptionFraisForm; use Formation\Form\InscriptionFrais\InscriptionFraisFormFactory; use Formation\Form\InscriptionFrais\InscriptionFraisHydrator; use Formation\Form\InscriptionFrais\InscriptionFraisHydratorFactory; use Formation\Form\Justificatif\JustificatifForm; use Formation\Form\Justificatif\JustificatifFormFactory; use Formation\Form\Justificatif\JustificatifHydrator; Loading @@ -16,6 +21,8 @@ use Formation\Provider\Privilege\FormationinstanceinscritPrivileges; use Formation\Provider\Privilege\FormationinstancePrivileges; use Formation\Service\Inscription\InscriptionService; use Formation\Service\Inscription\InscriptionServiceFactory; use Formation\Service\InscriptionFrais\InscriptionFraisService; use Formation\Service\InscriptionFrais\InscriptionFraisServiceFactory; use UnicaenPrivilege\Guard\PrivilegeController; use Laminas\Router\Http\Literal; use Laminas\Router\Http\Segment; Loading @@ -42,6 +49,7 @@ return [ 'historiser', 'restaurer', 'supprimer', 'renseigner-frais', ], 'privileges' => [ FormationinstancePrivileges::FORMATIONINSTANCE_GERER_INSCRIPTION, Loading Loading @@ -78,13 +86,21 @@ return [ 'router' => [ 'routes' => [ 'formation' => [ 'type' => Literal::class, 'options' => [ 'route' => '/formation', 'defaults' => [ 'controller' => FormationController::class, 'action' => 'index', ], ], 'may_terminate' => true, 'child_routes' => [ 'inscription' => [ 'type' => Literal::class, 'options' => [ 'route' => '/inscription', 'defaults' => [ /** @see InscriptionController::indexAction() */ 'controller' => InscriptionController::class, 'action' => 'index', ], Loading Loading @@ -233,6 +249,18 @@ return [ ], ], ], /** autre * */ 'renseigner-frais' => [ 'type' => Segment::class, 'options' => [ 'route' => '/renseigner-frais/:inscription', 'defaults' => [ /** @see InscriptionController::renseignerFraisAction() */ 'controller' => InscriptionController::class, 'action' => 'renseigner-frais', ], ], ], ], ], ], Loading @@ -242,7 +270,8 @@ return [ 'service_manager' => [ 'factories' => [ InscriptionService::class => InscriptionServiceFactory::class InscriptionService::class => InscriptionServiceFactory::class, InscriptionFraisService::class => InscriptionFraisServiceFactory::class, ], ], 'controllers' => [ Loading @@ -253,6 +282,7 @@ return [ 'form_elements' => [ 'factories' => [ InscriptionForm::class => InscriptionFormFactory::class, InscriptionFraisForm::class => InscriptionFraisFormFactory::class, JustificatifForm::class => JustificatifFormFactory::class, ], ], Loading @@ -260,6 +290,7 @@ return [ 'factories' => [ InscriptionHydrator::class => InscriptionHydratorFactory::class, JustificatifHydrator::class => JustificatifHydratorFactory::class, InscriptionFraisHydrator::class => InscriptionFraisHydratorFactory::class, ], ] Loading
module/Formation/config/merged/presence.config.php +2 −2 Changes for module/Formation/config/merged/presence.config.php: 2 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -55,7 +55,7 @@ return [ 'toggle-presence' => [ 'type' => Segment::class, 'options' => [ 'route' => '/toggle-presence/:journee/:inscrit', 'route' => '/toggle-presence/:journee/:inscription', 'defaults' => [ /** @see PresenceController::togglePresenceAction() */ 'controller' => PresenceController::class, Loading @@ -66,7 +66,7 @@ return [ 'toggle-presences' => [ 'type' => Segment::class, 'options' => [ 'route' => '/toggle-presences/:mode/:inscrit', 'route' => '/toggle-presences/:mode/:inscription', 'defaults' => [ /** @see PresenceController::togglePresencesAction() */ 'controller' => PresenceController::class, Loading
module/Formation/src/Formation/Controller/FormationInstanceController.php +1 −1 Changes for module/Formation/src/Formation/Controller/FormationInstanceController.php: 1 added line, 1 removed line. Original line number Diff line number Diff line Loading @@ -84,7 +84,7 @@ class FormationInstanceController extends AbstractActionController $dictionnaire = []; foreach ($presences as $presence) { $dictionnaire[$presence->getJournee()->getId()][$presence->getInscrit()->getId()] = $presence; $dictionnaire[$presence->getJournee()->getId()][$presence->getInscription()->getId()] = $presence; } return new ViewModel([ Loading
module/Formation/src/Formation/Controller/FormationInstanceFraisController.php −53 File deleted. Show changes