Soutenance : renommage de Avis en AvisMembre (en prévision d'une nouvelle... (7b3b8a2a) · Commits · open-source / sygal

module/HDR/config/module.config.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ return [
		// ],
		// 'avis' => [
		// 'label' => 'Avis de soutenance',
		// 'route' => 'soutenance_hdr/avis-soutenance',
		// 'route' => 'soutenance_hdr/avis-soutenance-membre',
		// 'order' => 400,
		// 'resource' => PrivilegeController::getResourceId(AvisController::class, 'index'),
		// 'withtarget' => true,

module/Soutenance/config/module.config.php

+5 −7

Original line number	Diff line number	Diff line
		@@ -5,11 +5,9 @@ namespace Soutenance;
		use Application\Navigation\ApplicationNavigationFactory;
		use Doctrine\ORM\Mapping\Driver\XmlDriver;
		use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
		use Soutenance\Controller\AbstractSoutenanceControllerFactory;
		use Soutenance\Controller\AvisController;
		use Soutenance\Controller\AvisMembreController;
		use Soutenance\Controller\EngagementImpartialiteController;
		use Soutenance\Controller\IndexController;
		use Soutenance\Provider\Privilege\IndexPrivileges;
		use Soutenance\Provider\Privilege\PresoutenancePrivileges;
		use Soutenance\Provider\Privilege\PropositionPrivileges;
		use Soutenance\Service\Membre\MembreService;
		@@ -151,9 +149,9 @@ return [
		],
		'avis' => [
		'label' => 'Avis de soutenance',
		'route' => 'soutenance_these/avis-soutenance',
		'route' => 'soutenance_these/avis-soutenance-membre',
		'order' => 400,
		'resource' => PrivilegeController::getResourceId(AvisController::class, 'index'),
		'resource' => PrivilegeController::getResourceId(AvisMembreController::class, 'index'),
		'withtarget' => true,
		'paramsInject' => [
		'Acteur',
		@@ -282,9 +280,9 @@ return [
		],
		'avis' => [
		'label' => 'Avis de soutenance',
		'route' => 'soutenance_hdr/avis-soutenance',
		'route' => 'soutenance_hdr/avis-soutenance-membre',
		'order' => 400,
		'resource' => PrivilegeController::getResourceId(AvisController::class, 'index'),
		'resource' => PrivilegeController::getResourceId(AvisMembreController::class, 'index'),
		'withtarget' => true,
		'paramsInject' => [
		'Acteur',

module/Soutenance/config/others/avis.config.php→module/Soutenance/config/others/avis-membre.config.php

+34 −34

Original line number	Diff line number	Diff line
		@@ -2,20 +2,20 @@

		namespace Soutenance;

		use Soutenance\Assertion\AvisSoutenanceAssertion;
		use Soutenance\Assertion\AvisSoutenanceAssertionFactory;
		use Soutenance\Controller\AvisController;
		use Soutenance\Controller\AvisControllerFactory;
		use Soutenance\Form\Avis\AvisForm;
		use Soutenance\Form\Avis\AvisFormFactory;
		use Soutenance\Form\Avis\AvisHydrator;
		use Soutenance\Provider\Privilege\AvisSoutenancePrivileges;
		use Soutenance\Service\Avis\AvisService;
		use Soutenance\Service\Avis\AvisServiceFactory;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;
		use Soutenance\Assertion\AvisMembreAssertion;
		use Soutenance\Assertion\AvisMembreAssertionFactory;
		use Soutenance\Controller\AvisMembreController;
		use Soutenance\Controller\AvisMembreControllerFactory;
		use Soutenance\Form\AvisMembre\AvisMembreForm;
		use Soutenance\Form\AvisMembre\AvisMembreFormFactory;
		use Soutenance\Form\AvisMembre\AvisMembreHydrator;
		use Soutenance\Provider\Privilege\AvisMembreSoutenancePrivileges;
		use Soutenance\Service\AvisMembre\AvisMembreService;
		use Soutenance\Service\AvisMembre\AvisMembreServiceFactory;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;

		return array(
		'bjyauthorize' => [
		@@ -30,12 +30,12 @@ return array(
		'allow' => [
		[
		'privileges' => [
		AvisSoutenancePrivileges::AVIS_VISUALISER,
		AvisSoutenancePrivileges::AVIS_MODIFIER,
		AvisSoutenancePrivileges::AVIS_ANNULER,
		AvisMembreSoutenancePrivileges::AVIS_VISUALISER,
		AvisMembreSoutenancePrivileges::AVIS_MODIFIER,
		AvisMembreSoutenancePrivileges::AVIS_ANNULER,
		],
		'resources' => ['ActeurThese', 'ActeurHDR'],
		'assertion' => AvisSoutenanceAssertion::class,
		'assertion' => AvisMembreAssertion::class,
		],
		],
		],
		@@ -43,24 +43,24 @@ return array(
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => [
		'index',
		'afficher',
		],
		'privileges' => AvisSoutenancePrivileges::AVIS_VISUALISER,
		'assertion' => AvisSoutenanceAssertion::class,
		'privileges' => AvisMembreSoutenancePrivileges::AVIS_VISUALISER,
		'assertion' => AvisMembreAssertion::class,
		],
		[
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => [
		'annuler',
		],
		'privileges' => AvisSoutenancePrivileges::AVIS_ANNULER,
		'assertion' => AvisSoutenanceAssertion::class,
		'privileges' => AvisMembreSoutenancePrivileges::AVIS_ANNULER,
		'assertion' => AvisMembreAssertion::class,
		],
		[
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => [
		'telecharger',
		],
		@@ -74,13 +74,13 @@ return array(
		'routes' => [
		'soutenance_these' => [
		'child_routes' => $soutenanceChildRoutes =[
		'avis-soutenance' => [
		'avis-soutenance-membre' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/avis-soutenance/:rapporteur',
		'route' => '/avis-soutenance-membre/:rapporteur',
		'defaults' => [
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => 'index',
		],
		],
		@@ -91,7 +91,7 @@ return array(
		'options' => [
		'route' => '/afficher',
		'defaults' => [
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => 'afficher',
		],
		],
		@@ -102,7 +102,7 @@ return array(
		'options' => [
		'route' => '/annuler',
		'defaults' => [
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => 'annuler',
		],
		],
		@@ -113,7 +113,7 @@ return array(
		'options' => [
		'route' => '/telecharger',
		'defaults' => [
		'controller' => AvisController::class,
		'controller' => AvisMembreController::class,
		'action' => 'telecharger',
		],
		],
		@@ -130,26 +130,26 @@ return array(

		'service_manager' => [
		'factories' => [
		AvisService::class => AvisServiceFactory::class,
		AvisSoutenanceAssertion::class => AvisSoutenanceAssertionFactory::class,
		AvisMembreService::class => AvisMembreServiceFactory::class,
		AvisMembreAssertion::class => AvisMembreAssertionFactory::class,

		],
		],
		'controllers' => [
		'factories' => [
		AvisController::class => AvisControllerFactory::class,
		AvisMembreController::class => AvisMembreControllerFactory::class,
		],
		],

		'form_elements' => [
		'factories' => [
		AvisForm::class => AvisFormFactory::class,
		AvisMembreForm::class => AvisMembreFormFactory::class,
		],
		],

		'hydrators' => [
		'invokables' => [
		AvisHydrator::class => AvisHydrator::class,
		AvisMembreHydrator::class => AvisMembreHydrator::class,
		],
		],
		);

module/Soutenance/config/others/presoutenance.config.php

+14 −14

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ use Soutenance\Form\AdresseSoutenance\AdresseSoutenanceHydrator;
		use Soutenance\Form\DateRenduRapport\DateRenduRapportForm;
		use Soutenance\Form\DateRenduRapport\DateRenduRapportFormFactory;
		use Soutenance\Form\DateRenduRapport\DateRenduRapportHydrator;
		use Soutenance\Provider\Privilege\AvisSoutenancePrivileges;
		use Soutenance\Provider\Privilege\AvisMembreSoutenancePrivileges;
		use Soutenance\Provider\Privilege\EngagementImpartialitePrivileges;
		use Soutenance\Provider\Privilege\PresoutenancePrivileges;
		use Soutenance\Service\Adresse\AdresseService;
		@@ -72,14 +72,14 @@ $soutenanceChildRoutes = fn(string $controllerClass) => [
		],
		],
		],
		'avis-soutenance' => [
		'avis-soutenance-membre' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/avis-soutenance',
		'route' => '/avis-soutenance-membre',
		'defaults' => [
		'controller' => $controllerClass,
		'action' => 'avis-soutenance',
		'action' => 'avis-soutenance-membre',
		],
		],
		],
		@@ -260,25 +260,25 @@ $soutenanceChildRoutes = fn(string $controllerClass) => [
		],
		],
		],
		'notifier-demande-avis-soutenance' => [
		'notifier-demande-avis-soutenance-membre' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/notifier-demande-avis-soutenance[/:membre]',
		'route' => '/notifier-demande-avis-soutenance-membre[/:membre]',
		'defaults' => [
		'controller' => $controllerClass,
		'action' => 'notifier-demande-avis-soutenance',
		'action' => 'notifier-demande-avis-soutenance-membre',
		],
		],
		],
		'revoquer-avis-soutenance' => [
		'revoquer-avis-soutenance-membre' => [
		'type' => Segment::class,
		'may_terminate' => true,
		'options' => [
		'route' => '/revoquer-avis-soutenance/:avis',
		'route' => '/revoquer-avis-soutenance-membre/:avis',
		'defaults' => [
		'controller' => $controllerClass,
		'action' => 'revoquer-avis-soutenance',
		'action' => 'revoquer-avis-soutenance-membre',
		],
		],
		],
		@@ -364,7 +364,7 @@ return [
		'indiquer-dossier-complet',
		'feu-vert',
		'stopper-demarche',
		// 'avis-soutenance',
		// 'avis-soutenance-membre',
		// 'convocations',
		'envoyer-convocation',
		// 'transmettre-documents-direction',
		@@ -407,16 +407,16 @@ return [
		[
		'controller' => PresoutenanceController::class,
		'action' => [
		'notifier-demande-avis-soutenance',
		'notifier-demande-avis-soutenance-membre',
		],
		'privileges' => EngagementImpartialitePrivileges::ENGAGEMENT_IMPARTIALITE_NOTIFIER,
		],
		[
		'controller' => PresoutenanceController::class,
		'action' => [
		'revoquer-avis-soutenance'
		'revoquer-avis-soutenance-membre'
		],
		'privileges' => AvisSoutenancePrivileges::AVIS_ANNULER,
		'privileges' => AvisMembreSoutenancePrivileges::AVIS_ANNULER,
		],
		[
		'controller' => PresoutenanceController::class,

module/Soutenance/config/others/presoutenanceHDR.config.php

+5 −5

Original line number	Diff line number	Diff line
		@@ -7,7 +7,7 @@ use Soutenance\Assertion\EngagementImpartialiteAssertion;
		use Soutenance\Assertion\PresoutenanceAssertion;
		use Soutenance\Controller\HDR\Presoutenance\PresoutenanceHDRController;
		use Soutenance\Controller\HDR\Presoutenance\PresoutenanceHDRControllerFactory;
		use Soutenance\Provider\Privilege\AvisSoutenancePrivileges;
		use Soutenance\Provider\Privilege\AvisMembreSoutenancePrivileges;
		use Soutenance\Provider\Privilege\EngagementImpartialitePrivileges;
		use Soutenance\Provider\Privilege\PresoutenancePrivileges;
		use UnicaenPrivilege\Guard\PrivilegeController;
		@@ -54,7 +54,7 @@ return [
		'indiquer-dossier-complet',
		'feu-vert',
		'stopper-demarche',
		'avis-soutenance',
		'avis-soutenance-membre',
		'convocations',
		'envoyer-convocation',
		'transmettre-documents-direction',
		@@ -94,7 +94,7 @@ return [
		[
		'controller' => PresoutenanceHDRController::class,
		'action' => [
		'notifier-demande-avis-soutenance',
		'notifier-demande-avis-soutenance-membre',
		],
		'privileges' => EngagementImpartialitePrivileges::ENGAGEMENT_IMPARTIALITE_NOTIFIER,
		],
		@@ -109,9 +109,9 @@ return [
		[
		'controller' => PresoutenanceHDRController::class,
		'action' => [
		'revoquer-avis-soutenance'
		'revoquer-avis-soutenance-membre'
		],
		'privileges' => AvisSoutenancePrivileges::AVIS_ANNULER,
		'privileges' => AvisMembreSoutenancePrivileges::AVIS_ANNULER,
		],
		[
		'controller' => PresoutenanceHDRController::class,