Renommage FormationInstanceFormateur => Formateur (86447ea2) · Commits · open-source / emc2

documentation/002-BD_EMC2.sql

+3 −3

Changes for documentation/002-BD_EMC2.sql: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -478,7 +478,7 @@ create table formation_instance_formateur
		histo_destruction timestamp,
		histo_destructeur_id integer constraint formation_instance_formateur_user_id_fk_3 references unicaen_utilisateur_user
		);
		create unique index formation_instance_formateur_id_uindex on formation_instance_formateur (id);
		create unique index formation_instance_formateur_id_uindex on formation_formateur (id);

		create table formation_instance_presence
		(
		@@ -1036,8 +1036,8 @@ create table fichemetier_competence
		create table fichemetier_activite
		(
		id serial not null constraint fichemetier_activite_pkey primary key,
		fiche integer not null constraint fichemetier_activite_fichemetier_id_fk references fichemetier on delete cascade,
		activite integer not null constraint fichemetier_activite_activite_id_fk references activite on delete cascade,
		fiche_id integer not null constraint fichemetier_activite_fichemetier_id_fk references fichemetier on delete cascade,
		activite_id integer not null constraint fichemetier_activite_activite_id_fk references activite on delete cascade,
		position integer default 0 not null
		);
		create unique index fichemetier_activite_id_uindex on fichemetier_activite (id);

module/Application/src/Application/Controller/AgentController.php

+0 −6

Changes for module/Application/src/Application/Controller/AgentController.php: 0 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,12 +2,10 @@

		namespace Application\Controller;

		use Application\Constant\RoleConstant;
		use Application\Entity\Db\AgentAccompagnement;
		use Application\Entity\Db\AgentPPP;
		use Application\Entity\Db\AgentStageObservation;
		use Application\Entity\Db\AgentTutorat;
		use Application\Entity\Db\FichePoste;
		use Element\Entity\Db\ApplicationElement;
		use Application\Form\AgentAccompagnement\AgentAccompagnementFormAwareTrait;
		use Application\Form\AgentPPP\AgentPPPFormAwareTrait;
		@@ -132,9 +130,6 @@ class AgentController extends AbstractActionController
		$superieures = $this->getAgentService()->computeSuperieures($agent);
		$autorites = $this->getAgentService()->computeAutorites($agent, $superieures);


		$entretiens = $this->getEntretienProfessionnelService()->getEntretiensProfessionnelsByAgent($agent);

		$fichespostes = $this->getFichePosteService()->getFichesPostesByAgent($agent);

		$parametreIntranet = $this->getParametreService()->getParametreByCode('ENTRETIEN_PROFESSIONNEL','INTRANET_DOCUMENT');
		@@ -149,7 +144,6 @@ class AgentController extends AbstractActionController
		'echelon' => $agent->getEchelonActif(),
		'fichespostes' => $fichespostes,

		'entretiens' => $entretiens,
		'superieures' => $superieures,
		'autorites' => $autorites,

module/Formation/config/merged/formation-instance-formateur.config.php→module/Formation/config/merged/formateur.config.php

+19 −19

Changes for module/Formation/config/merged/formateur.config.php: 19 added lines, 19 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,24 +2,24 @@

		namespace Formation;

		use Formation\Controller\FormationInstanceFormateurController;
		use Formation\Controller\FormationInstanceFormateurControllerFactory;
		use Formation\Form\FormationInstanceFormateur\FormationInstanceFormateurForm;
		use Formation\Form\FormationInstanceFormateur\FormationInstanceFormateurFormFactory;
		use Formation\Form\FormationInstanceFormateur\FormationInstanceFormateurHydrator;
		use Formation\Form\FormationInstanceFormateur\FormationInstanceFormateurHydratorFactory;
		use Formation\Controller\FormateurController;
		use Formation\Controller\FormateurControllerFactory;
		use Formation\Form\Formateur\FormateurForm;
		use Formation\Form\Formateur\FormateurFormFactory;
		use Formation\Form\Formateur\FormateurHydrator;
		use Formation\Form\Formateur\FormateurHydratorFactory;
		use Formation\Provider\Privilege\FormationinstancePrivileges;
		use Formation\Service\FormationInstanceFormateur\FormationInstanceFormateurService;
		use Formation\Service\FormationInstanceFormateur\FormationInstanceFormateurServiceFactory;
		use UnicaenPrivilege\Guard\PrivilegeController;
		use Formation\Service\Formateur\FormateurService;
		use Formation\Service\FormationInstanceFormateur\FormateurServiceFactory;
		use Laminas\Router\Http\Segment;
		use UnicaenPrivilege\Guard\PrivilegeController;

		return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => FormationInstanceFormateurController::class,
		'controller' => FormateurController::class,
		'action' => [
		'ajouter-formateur',
		'modifier-formateur',
		@@ -44,7 +44,7 @@ return [
		'options' => [
		'route' => '/ajouter-formateur/:formation-instance',
		'defaults' => [
		'controller' => FormationInstanceFormateurController::class,
		'controller' => FormateurController::class,
		'action' => 'ajouter-formateur',
		],
		],
		@@ -54,7 +54,7 @@ return [
		'options' => [
		'route' => '/modifier-formateur/:formateur',
		'defaults' => [
		'controller' => FormationInstanceFormateurController::class,
		'controller' => FormateurController::class,
		'action' => 'modifier-formateur',
		],
		],
		@@ -64,7 +64,7 @@ return [
		'options' => [
		'route' => '/historiser-journee/:formateur',
		'defaults' => [
		'controller' => FormationInstanceFormateurController::class,
		'controller' => FormateurController::class,
		'action' => 'historiser-formateur',
		],
		],
		@@ -74,7 +74,7 @@ return [
		'options' => [
		'route' => '/restaurer-formateur/:formateur',
		'defaults' => [
		'controller' => FormationInstanceFormateurController::class,
		'controller' => FormateurController::class,
		'action' => 'restaurer-formateur',
		],
		],
		@@ -84,7 +84,7 @@ return [
		'options' => [
		'route' => '/supprimer-formateur/:formateur',
		'defaults' => [
		'controller' => FormationInstanceFormateurController::class,
		'controller' => FormateurController::class,
		'action' => 'supprimer-formateur',
		],
		],
		@@ -96,22 +96,22 @@ return [

		'service_manager' => [
		'factories' => [
		FormationInstanceFormateurService::class => FormationInstanceFormateurServiceFactory::class,
		FormateurService::class => FormateurServiceFactory::class,
		],
		],
		'controllers' => [
		'factories' => [
		FormationInstanceFormateurController::class => FormationInstanceFormateurControllerFactory::class,
		FormateurController::class => FormateurControllerFactory::class,
		],
		],
		'form_elements' => [
		'factories' => [
		FormationInstanceFormateurForm::class => FormationInstanceFormateurFormFactory::class,
		FormateurForm::class => FormateurFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		FormationInstanceFormateurHydrator::class => FormationInstanceFormateurHydratorFactory::class,
		FormateurHydrator::class => FormateurHydratorFactory::class,
		],
		]

module/Formation/config/merged/formation-instance-inscrit.config.php

+43 −4

Changes for module/Formation/config/merged/formation-instance-inscrit.config.php: 43 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,12 +2,14 @@

		namespace Formation;

		use Application\Controller\IndexController;
		use Formation\Controller\FormationInstanceInscritController;
		use Formation\Controller\FormationInstanceInscritControllerFactory;
		use Formation\Controller\PlanFormationController;
		use Formation\Controller\ProjetPersonnelController;
		use Formation\Provider\Privilege\FormationinstanceinscritPrivileges;
		use Formation\Form\Inscription\InscriptionForm;
		use Formation\Form\Inscription\InscriptionFormFactory;
		use Formation\Form\Inscription\InscriptionHydrator;
		use Formation\Form\Inscription\InscriptionHydratorFactory;
		use Formation\Provider\Privilege\FormationinstancePrivileges;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritService;
		use Formation\Service\FormationInstanceInscrit\FormationInstanceInscritServiceFactory;
		@@ -30,6 +32,7 @@ return [
		'supprimer-agent',
		'envoyer-liste-principale',
		'envoyer-liste-complementaire',
		'classer-inscription',
		],
		'privileges' => [
		FormationinstancePrivileges::FORMATIONINSTANCE_GERER_INSCRIPTION,
		@@ -50,7 +53,9 @@ return [
		'controller' => FormationInstanceInscritController::class,
		'action' => [
		'valider-responsable',
		'refuser-responsable',
		'valider-drh',
		'refuser-drh',
		],
		'privileges' => [
		FormationinstancePrivileges::FORMATIONINSTANCE_GERER_INSCRIPTION,
		@@ -142,6 +147,16 @@ return [
		],
		],
		],
		'refuser-responsable' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/refuser-responsable/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'refuser-responsable',
		],
		],
		],
		'valider-drh' => [
		'type' => Segment::class,
		'options' => [
		@@ -152,6 +167,16 @@ return [
		],
		],
		],
		'refuser-drh' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/refuser-drh/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'refuser-drh',
		],
		],
		],
		'ajouter-agent' => [
		'type' => Segment::class,
		'options' => [
		@@ -212,6 +237,16 @@ return [
		],
		],
		],
		'classer-inscription' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/classer-inscription/:inscrit',
		'defaults' => [
		'controller' => FormationInstanceInscritController::class,
		'action' => 'classer-inscription',
		],
		],
		],
		],
		],
		],
		@@ -228,10 +263,14 @@ return [
		],
		],
		'form_elements' => [
		'factories' => [],
		'factories' => [
		InscriptionForm::class => InscriptionFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [],
		'factories' => [
		InscriptionHydrator::class => InscriptionHydratorFactory::class,
		],
		]

		];
		No newline at end of file

module/Formation/src/Formation/Controller/FormationInstanceFormateurController.php→module/Formation/src/Formation/Controller/FormateurController.php

+19 −18

Changes for module/Formation/src/Formation/Controller/FormateurController.php: 19 added lines, 18 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,29 +2,30 @@

		namespace Formation\Controller;

		use Formation\Entity\Db\FormationInstanceFormateur;
		use Formation\Form\FormationInstanceFormateur\FormationInstanceFormateurFormAwareTrait;
		use Formation\Entity\Db\Formateur;
		use Formation\Form\Formateur\FormateurFormAwareTrait;
		use Formation\Service\FormationInstance\FormationInstanceServiceAwareTrait;
		use Formation\Service\FormationInstanceFormateur\FormationInstanceFormateurServiceAwareTrait;
		use Formation\Service\Formateur\FormateurServiceAwareTrait;
		use Laminas\Http\Request;
		use Laminas\Http\Response;
		use Laminas\Mvc\Controller\AbstractActionController;
		use Laminas\View\Model\ViewModel;

		class FormationInstanceFormateurController extends AbstractActionController
		class FormateurController extends AbstractActionController
		{
		use FormationInstanceServiceAwareTrait;
		use FormationInstanceFormateurServiceAwareTrait;
		use FormationInstanceFormateurFormAwareTrait;
		use FormateurServiceAwareTrait;
		use FormateurFormAwareTrait;
		use FormateurFormAwareTrait;

		public function ajouterFormateurAction() : ViewModel
		{
		$instance = $this->getFormationInstanceService()->getRequestedFormationInstance($this);

		$formateur = new FormationInstanceFormateur();
		$formateur = new Formateur();
		$formateur->setInstance($instance);

		$form = $this->getFormationInstanceFormateurForm();
		$form = $this->getFormateurForm();
		$form->setAttribute('action', $this->url()->fromRoute('formation-instance/ajouter-formateur', ['formation-instance' => $instance->getId()], [], true));
		$form->bind($formateur);

		@@ -33,7 +34,7 @@ class FormationInstanceFormateurController extends AbstractActionController
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getFormationInstanceFormateurService()->create($formateur);
		$this->getFormateurService()->create($formateur);
		}
		}

		@@ -48,9 +49,9 @@ class FormationInstanceFormateurController extends AbstractActionController

		public function modifierFormateurAction() : ViewModel
		{
		$formateur = $this->getFormationInstanceFormateurService()->getRequestedFormationInstanceFormateur($this);
		$formateur = $this->getFormateurService()->getRequestedFormateur($this);

		$form = $this->getFormationInstanceFormateurForm();
		$form = $this->getFormateurForm();
		$form->setAttribute('action', $this->url()->fromRoute('formation-instance/modifier-formateur', ['formateur' => $formateur->getId()], [], true));
		$form->bind($formateur);

		@@ -59,7 +60,7 @@ class FormationInstanceFormateurController extends AbstractActionController
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getFormationInstanceFormateurService()->update($formateur);
		$this->getFormateurService()->update($formateur);
		}
		}

		@@ -74,27 +75,27 @@ class FormationInstanceFormateurController extends AbstractActionController

		public function historiserFormateurAction() : Response
		{
		$formateur = $this->getFormationInstanceFormateurService()->getRequestedFormationInstanceFormateur($this);
		$this->getFormationInstanceFormateurService()->historise($formateur);
		$formateur = $this->getFormateurService()->getRequestedFormateur($this);
		$this->getFormateurService()->historise($formateur);
		return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $formateur->getInstance()->getId()], [], true);
		}

		public function restaurerFormateurAction() : Response
		{
		$formateur = $this->getFormationInstanceFormateurService()->getRequestedFormationInstanceFormateur($this);
		$this->getFormationInstanceFormateurService()->restore($formateur);
		$formateur = $this->getFormateurService()->getRequestedFormateur($this);
		$this->getFormateurService()->restore($formateur);
		return $this->redirect()->toRoute('formation-instance/afficher', ['formation-instance' => $formateur->getInstance()->getId()], [], true);
		}

		public function supprimerFormateurAction() : ViewModel
		{
		$formateur = $this->getFormationInstanceFormateurService()->getRequestedFormationInstanceFormateur($this);
		$formateur = $this->getFormateurService()->getRequestedFormateur($this);

		/** @var Request $request */
		$request = $this->getRequest();
		if ($request->isPost()) {
		$data = $request->getPost();
		if ($data["reponse"] === "oui") $this->getFormationInstanceFormateurService()->delete($formateur);
		if ($data["reponse"] === "oui") $this->getFormateurService()->delete($formateur);
		exit();
		}