Commit ccd103b6 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

ajout des modifications suite au GT : avis ajoutés, recherche individu accueil...

ajout des modifications suite au GT : avis ajoutés, recherche individu accueil admission, validation charte doctorale, recap dossier...
parent a246fbbd
Loading
Loading
Loading
Loading
+5 −0
Changes for module/Admission/Module.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Admission;

use Admission\Event\AdmissionEventListener;
use Admission\Event\Avis\AdmissionAvisEventListener;
use Admission\Event\Validation\AdmissionValidationEventListener;
use Laminas\Config\Factory as ConfigFactory;
use Laminas\Mvc\MvcEvent;
@@ -24,6 +25,10 @@ class Module
//        $admissionListener = $container->get(AdmissionEventListener::class);
//        $admissionListener->attach($eventManager);

        /** @var AdmissionAvisEventListener $admissionAvisListener */
        $admissionAvisListener = $container->get(AdmissionAvisEventListener::class);
        $admissionAvisListener->attach($eventManager);
        
        /** @var AdmissionValidationEventListener $admissionValidationListener */
        $admissionValidationListener = $container->get(AdmissionValidationEventListener::class);
        $admissionValidationListener->attach($eventManager);
+615 −16

File changed.

Preview size limit exceeded, changes collapsed.

+72 −15
Changes for module/Admission/config/module.config.php: 72 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -44,33 +44,26 @@ use Admission\Hydrator\Validation\AdmissionValidationHydratorFactory;
use Admission\Hydrator\Verification\VerificationHydrator;
use Admission\Hydrator\Verification\VerificationHydratorFactory;
use Admission\Provider\Privilege\AdmissionPrivileges;
use Admission\Rule\Operation\AdmissionOperationRule;
use Admission\Rule\Operation\AdmissionOperationRuleFactory;
use Admission\Rule\Operation\Notification\OperationAttendueNotificationRule;
use Admission\Rule\Operation\Notification\OperationAttendueNotificationRuleFactory;
use Admission\Service\Admission\AdmissionService;
use Admission\Service\Admission\AdmissionServiceFactory;
use Admission\Service\Document\DocumentService;
use Admission\Service\Document\DocumentServiceFactory;
use Admission\Service\Etudiant\EtudiantService;
use Admission\Service\Etudiant\EtudiantServiceFactory;
use Admission\Service\Exporter\Recapitulatif\RecapitulatifExporter;
use Admission\Service\Exporter\Recapitulatif\RecapitulatifExporterFactory;
use Admission\Service\Financement\FinancementService;
use Admission\Service\Financement\FinancementServiceFactory;
use Admission\Service\Inscription\InscriptionService;
use Admission\Service\Inscription\InscriptionServiceFactory;
use Admission\Service\Operation\AdmissionOperationService;
use Admission\Service\Operation\AdmissionOperationServiceFactory;
use Admission\Service\TypeValidation\TypeValidationService;
use Admission\Service\TypeValidation\TypeValidationServiceFactory;
use Admission\Service\Url\UrlService;
use Admission\Service\Url\UrlServiceFactory;
use Admission\Service\Validation\AdmissionValidationService;
use Admission\Service\Validation\AdmissionValidationServiceFactory;
use Admission\Service\Verification\VerificationService;
use Admission\Service\Verification\VerificationServiceFactory;
use Doctrine\ORM\Mapping\Driver\XmlDriver;
use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
use Laminas\Router\Http\Literal;
use Laminas\Router\Http\Segment;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;
@@ -104,8 +97,7 @@ return array(
                'allow' => [
                    [
                        'privileges' => [
                            AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION,
                            AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION,
                            AdmissionPrivileges::ADMISSION_LISTER_MES_DOSSIERS_ADMISSION,
                            AdmissionPrivileges::ADMISSION_AFFICHER_TOUS_DOSSIERS_ADMISSION,
                            AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
                            AdmissionPrivileges::ADMISSION_MODIFIER_TOUS_DOSSIERS_ADMISSION,
@@ -114,8 +106,11 @@ return array(
                            AdmissionPrivileges::ADMISSION_SUPPRIMER_SON_DOSSIER_ADMISSION,
                            AdmissionPrivileges::ADMISSION_HISTORISER,
                            AdmissionPrivileges::ADMISSION_VERIFIER,
                            AdmissionPrivileges::ADMISSION_ACCEDER_COMMENTAIRES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES
                            AdmissionPrivileges::ADMISSION_NOTIFIER_GESTIONNAIRES,
                            AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET,
                            AdmissionPrivileges::ADMISSION_GENERER_RECAPITULATIF
                        ],
                        'resources'  => ['Admission'],
                        'assertion'  => AdmissionAssertion::class,
@@ -132,8 +127,8 @@ return array(
                        'rechercher-individu'
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_LISTER_SON_DOSSIER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_LISTER_TOUS_DOSSIERS_ADMISSION,
                        AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
                        AdmissionPrivileges::ADMISSION_LISTER_MES_DOSSIERS_ADMISSION,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
@@ -145,6 +140,7 @@ return array(
                        'financement',
                        'document',
                        'enregistrer',
                        'generer-statut-dossier'
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_AFFICHER_SON_DOSSIER_ADMISSION,
@@ -185,7 +181,27 @@ return array(
                        AdmissionPrivileges::ADMISSION_NOTIFIER_COMMENTAIRES_AJOUTES,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ]
                ],
                [
                    'controller' => AdmissionController::class,
                    'action' => [
                        'notifier-dossier-complet',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_NOTIFIER_DOSSIER_COMPLET,
                    ],
                    'assertion' => AdmissionAssertion::class,
                ],
                [
                'controller' => AdmissionController::class,
                'action' => [
                    'generer-recapitulatif',
                ],
                'privileges' => [
                    AdmissionPrivileges::ADMISSION_GENERER_RECAPITULATIF,
                ],
                'assertion' => AdmissionAssertion::class,
            ],
            ]
        ],
    ],
@@ -212,6 +228,7 @@ return array(
                                 * @see AdmissionController::inscriptionAction()
                                 * @see AdmissionController::financementAction()
                                 * @see AdmissionController::documentAction()
                                 * @see AdmissionController::enregistrerAction()
                                 * @see AdmissionController::supprimerAction()
                                 */
                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
@@ -247,6 +264,44 @@ return array(
                            ],
                        ],
                    ],
                    'notifier-dossier-complet' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/notifier-dossier-complet/:admission',
                            'constraints' => [
                                'admission' => '[0-9]*'
                            ],
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action' => 'notifier-dossier-complet',
                                /* @see AdmissionController::notifierDossierCompletAction() */
                            ],
                        ],
                    ],
                    'generer-recapitulatif' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/generer-recapitulatif/:admission/signature-presidence',
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action'     => 'generer-recapitulatif',
                                /* @see AdmissionController::genererRecapitulatifAction() */
                            ],
                        ],
                    ],
                    'generer-statut-dossier' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/generer-statut-dossier/:admission',
                            'defaults' => [
                                'controller' => AdmissionController::class,
                                'action'     => 'generer-statut-dossier',
                                /* @see AdmissionController::genererStatutDossierAction() */
                            ],
                        ],
                    ],
                    'rechercher-individu' => [
                        'type'          => Segment::class,
                        'options'       => [
@@ -306,6 +361,8 @@ return array(
            AdmissionAssertion::class => AdmissionAssertionFactory::class,

            UrlService::class => UrlServiceFactory::class,

            RecapitulatifExporter::class => RecapitulatifExporterFactory::class
        ],
    ],

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

namespace Admission;

use Admission\Assertion\Avis\AdmissionAvisAssertion;
use Admission\Assertion\Avis\AdmissionAvisAssertionFactory;
use Admission\Config\ModuleConfig;
use Admission\Config\ModuleConfigFactory;
use Admission\Controller\Avis\AdmissionAvisController;
use Admission\Controller\Avis\AdmissionAvisControllerFactory;
use Admission\Controller\Validation\AdmissionValidationController;
use Admission\Event\Avis\AdmissionAvisEventListener;
use Admission\Event\Avis\AdmissionAvisEventListenerFactory;
use Admission\Provider\Privilege\AdmissionPrivileges;
use Admission\Rule\Operation\AdmissionOperationRule;
use Admission\Rule\Operation\AdmissionOperationRuleFactory;
use Admission\Rule\Operation\Notification\OperationAttendueNotificationRule;
use Admission\Rule\Operation\Notification\OperationAttendueNotificationRuleFactory;
use Admission\Service\Avis\AdmissionAvisService;
use Admission\Service\Avis\AdmissionAvisServiceFactory;
use Admission\Service\Notification\NotificationFactory;
use Admission\Service\Notification\NotificationFactoryFactory;
use Admission\Service\Operation\AdmissionOperationService;
use Admission\Service\Operation\AdmissionOperationServiceFactory;
use Laminas\Router\Http\Segment;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;

return array(
    'bjyauthorize' => [
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'AdmissionAvis' => []
            ],
        ],
        'rule_providers'     => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_SIEN,
                            AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_TOUT,
                            AdmissionPrivileges::ADMISSION_MODIFIER_AVIS_SIEN,
                            AdmissionPrivileges::ADMISSION_MODIFIER_AVIS_TOUT,
                            AdmissionPrivileges::ADMISSION_SUPPRIMER_AVIS_SIEN,
                            AdmissionPrivileges::ADMISSION_SUPPRIMER_AVIS_TOUT
                        ],
                        'resources'  => ['AdmissionAvis'],
                        'assertion'  => AdmissionAvisAssertion::class,
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => AdmissionAvisController::class,
                    'action' => [
                        'aviser',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_SIEN,
                        AdmissionPrivileges::ADMISSION_AJOUTER_AVIS_TOUT,
                    ],
                    'assertion' => AdmissionAvisAssertion::class,
                ],
                [
                    'controller' => AdmissionAvisController::class,
                    'action' => [
                        'modifier',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_MODIFIER_AVIS_SIEN,
                        AdmissionPrivileges::ADMISSION_MODIFIER_AVIS_TOUT,
                    ],
                    'assertion' => AdmissionAvisAssertion::class,
                ],
                [
                    'controller' => AdmissionAvisController::class,
                    'action' => [
                        'desaviser',
                    ],
                    'privileges' => [
                        AdmissionPrivileges::ADMISSION_SUPPRIMER_AVIS_SIEN,
                        AdmissionPrivileges::ADMISSION_SUPPRIMER_AVIS_TOUT,
                    ],
                    'assertion' => AdmissionAvisAssertion::class,
                ]
            ]
        ],
    ],
    'router' => [
        'routes' => [
            'admission' => [
                'child_routes' => [
                    'aviser' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/avis/ajouter/:admission/type/:typeAvis',
                            'constraints' => [
                                'admission' => '\d+',
                                'typeAvis' => '\d+',
                            ],
                            'defaults' => [
                                'action' => 'aviser',
                                /* @see AdmissionAvisController::aviserAction */
                                'controller' => AdmissionAvisController::class,
                            ],
                        ],
                    ],
                    'modifierAvis' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/avis/modifier/:admissionAvis',
                            'constraints' => [
                                'admissionAvis' => '\d+',
                            ],
                            'defaults' => [
                                'action' => 'modifier',
                                'controller' => AdmissionAvisController::class,
                                /* @see AdmissionAvisController::modifierAction */
                            ],
                        ],
                    ],
                    'desaviser' => [
                        'type' => Segment::class,
                        'options' => [
                            'route' => '/avis/supprimer/:admissionAvis',
                            'constraints' => [
                                'admissionAvis' => '\d+',
                            ],
                            'defaults' => [
                                'action' => 'desaviser',
                                'controller' => AdmissionAvisController::class,
                                /* @see AdmissionAvisController::desaviserAction */
                            ],
                        ],
                    ],
                ],
            ]
        ]
    ],

    'controllers' => [
        'factories' => [
            AdmissionAvisController::class => AdmissionAvisControllerFactory::class,
        ],
    ],

    'service_manager' => [
        'factories' => [
            AdmissionAvisService::class => AdmissionAvisServiceFactory::class,

            AdmissionAvisEventListener::class => AdmissionAvisEventListenerFactory::class,

            AdmissionAvisAssertion::class => AdmissionAvisAssertionFactory::class,
        ],
    ],
);
+110 −8

File changed.

Preview size limit exceeded, changes collapsed.

Loading