Debut du transfert vers module des actiosn (a9127909) · Commits · open-source / emc2

module/Application/config/merged/fiche-metier.config.php

+0 −62

Original line number	Diff line number	Diff line
		@@ -8,10 +8,6 @@ use Application\Form\FicheMetierImportation\FicheMetierImportationForm;
		use Application\Form\FicheMetierImportation\FicheMetierImportationFormFactory;
		use Application\Form\FicheMetierImportation\FichierMetierImportationHydrator;
		use Application\Form\FicheMetierImportation\FichierMetierImportationHydratorFactory;
		use Application\Form\Raison\RaisonForm;
		use Application\Form\Raison\RaisonFormFactory;
		use Application\Form\Raison\RaisonHydrator;
		use Application\Form\Raison\RaisonHydratorFactory;
		use Application\Form\SelectionFicheMetier\SelectionFicheMetierForm;
		use Application\Form\SelectionFicheMetier\SelectionFicheMetierFormFactory;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		@@ -70,8 +66,6 @@ return [
		'action' => [
		'editer',

		'editer-libelle',
		'editer-raison',
		'retirer-activite',
		'deplacer-activite',
		'ajouter-nouvelle-activite',
		@@ -89,16 +83,6 @@ return [
		FicheMetierPrivileges::FICHEMETIER_MODIFIER,
		],
		],
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'historiser',
		'restaurer',
		],
		'privileges' => [
		FicheMetierPrivileges::FICHEMETIER_HISTORISER,
		],
		],
		[
		'controller' => FicheMetierController::class,
		'action' => [
		@@ -372,28 +356,6 @@ return [
		],
		'may_terminate' => true,
		],
		'historiser' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'historiser',
		],
		],
		'may_terminate' => true,
		],
		'restaurer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'restaurer',
		],
		],
		'may_terminate' => true,
		],
		'detruire' => [
		'type' => Segment::class,
		'options' => [
		@@ -427,28 +389,6 @@ return [
		],
		'may_terminate' => true,
		],
		'editer-libelle' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/editer-libelle/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'editer-libelle',
		],
		],
		'may_terminate' => true,
		],
		'editer-raison' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/editer-libelle/:fiche-metier',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'editer-raison',
		],
		],
		'may_terminate' => true,
		],
		'retirer-activite' => [
		'type' => Segment::class,
		'options' => [
		@@ -536,13 +476,11 @@ return [
		'factories' => [
		SelectionFicheMetierForm::class => SelectionFicheMetierFormFactory::class,
		FicheMetierImportationForm::class => FicheMetierImportationFormFactory::class,
		RaisonForm::class => RaisonFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		FichierMetierImportationHydrator::class => FichierMetierImportationHydratorFactory::class,
		RaisonHydrator::class => RaisonHydratorFactory::class,
		],
		],
		'view_helpers' => [

module/Application/src/Application/Controller/FicheMetierController.php

+1 −70

Original line number	Diff line number	Diff line
		@@ -3,12 +3,10 @@
		namespace Application\Controller;

		use Application\Entity\Db\Activite;
		use FicheMetier\Entity\Db\FicheMetier;
		use Application\Entity\Db\ParcoursDeFormation;
		use Application\Form\Activite\ActiviteForm;
		use Application\Form\Activite\ActiviteFormAwareTrait;
		use Application\Form\FicheMetierImportation\FicheMetierImportationFormAwareTrait;
		use Application\Form\Raison\RaisonFormAwareTrait;
		use Application\Form\SelectionFicheMetier\SelectionFicheMetierFormAwareTrait;
		use Application\Provider\Etat\FicheMetierEtats;
		use Application\Provider\Template\PdfTemplate;
		@@ -27,6 +25,7 @@ use Element\Form\SelectionApplication\SelectionApplicationFormAwareTrait;
		use Element\Form\SelectionCompetence\SelectionCompetenceFormAwareTrait;
		use Element\Service\HasApplicationCollection\HasApplicationCollectionServiceAwareTrait;
		use Element\Service\HasCompetenceCollection\HasCompetenceCollectionServiceAwareTrait;
		use FicheMetier\Entity\Db\FicheMetier;
		use Formation\Form\SelectionFormation\SelectionFormationFormAwareTrait;
		use Laminas\Http\Request;
		use Laminas\Http\Response;
		@@ -66,7 +65,6 @@ class FicheMetierController extends AbstractActionController
		/** Traits associés aux formulaires */
		use ActiviteFormAwareTrait;
		use FicheMetierImportationFormAwareTrait;
		use RaisonFormAwareTrait;
		use SelectionApplicationFormAwareTrait;
		use SelectionCompetenceFormAwareTrait;
		use SelectionEtatFormAwareTrait;
		@@ -205,20 +203,6 @@ class FicheMetierController extends AbstractActionController
		}
		}

		public function historiserAction() : Response
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);
		$this->getFicheMetierService()->historise($fiche);
		return $this->redirect()->toRoute('fiche-metier-type', [], [], true);
		}

		public function restaurerAction() : Response
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);
		$this->getFicheMetierService()->restore($fiche);
		return $this->redirect()->toRoute('fiche-metier-type', [], [], true);
		}

		public function detruireAction() : ViewModel
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'fiche-metier');
		@@ -245,59 +229,6 @@ class FicheMetierController extends AbstractActionController
		return $vm;
		}

		/ Action lier à l'édition d'une fiche métier ******************************************************************/

		public function editerRaisonAction() : ViewModel
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'fiche-metier');

		$form = $this->getRaisonForm();
		$form->setAttribute('action', $this->url()->fromRoute('fiche-metier-type/editer-raison', ['fiche-metier' => $fiche->getId()], [], true));
		$form->bind($fiche);

		$request = $this->getRequest();
		if ($request->isPost()) {
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getFicheMetierService()->update($fiche);
		$this->flashMessenger()->addSuccessMessage("Mise à jour de la \"raison d'être du métier\" effectuée.");
		exit();
		}
		}

		$vm = new ViewModel([
		'title' => "Modification de la raison d'être du métier",
		'form' => $form,
		'info' => "Laisser vide si aucun raison n'est nécessaire",
		]);
		$vm->setTemplate('application/default/default-form');
		return $vm;
		}

		public function editerLibelleAction() : ViewModel
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id', true);

		$form = $this->getSelectionnerMetierForm();
		$form->setAttribute('action', $this->url()->fromRoute('fiche-metier-type/editer-libelle', ['id' => $fiche->getId()], [], true));
		$form->bind($fiche);

		/** @var Request $request */
		$request = $this->getRequest();
		if ($request->isPost()) {
		$this->getFicheMetierService()->updateFromForm($request, $form, $this->getFicheMetierService());
		}

		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		$vm->setVariables([
		'title' => 'Modifier le libellé',
		'form' => $form,
		]);
		return $vm;
		}

		/ ACTIVITE LIEE ***********************************************************************************************/

		public function ajouterNouvelleActiviteAction() : ViewModel

module/Application/src/Application/Controller/FicheMetierControllerFactory.php

+0 −4

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ namespace Application\Controller;

		use Application\Form\Activite\ActiviteForm;
		use Application\Form\FicheMetierImportation\FicheMetierImportationForm;
		use Application\Form\Raison\RaisonForm;
		use Application\Form\SelectionFicheMetier\SelectionFicheMetierForm;
		use Application\Service\Activite\ActiviteService;
		use Application\Service\ActiviteDescription\ActiviteDescriptionService;
		@@ -71,7 +70,6 @@ class FicheMetierControllerFactory
		/**
		* @var FicheMetierImportationForm $ficheMetierImportationForm
		* @var ActiviteForm $activiteForm
		* @var RaisonForm $raisonForm
		* @var SelectionApplicationForm $selectionApplicationForm
		* @var SelectionCompetenceForm $selectionCompetenceForm
		* @var SelectionFormationForm $selectionFormationForm
		@@ -80,7 +78,6 @@ class FicheMetierControllerFactory
		* @var SelectionnerMetierForm $selectionnerMetierForm
		*/
		$activiteForm = $container->get('FormElementManager')->get(ActiviteForm::class);
		$raisonForm = $container->get('FormElementManager')->get(RaisonForm::class);
		$selectionApplicationForm = $container->get('FormElementManager')->get(SelectionApplicationForm::class);
		$selectionCompetenceForm = $container->get('FormElementManager')->get(SelectionCompetenceForm::class);
		$selectionFormationForm = $container->get('FormElementManager')->get(SelectionFormationForm::class);
		@@ -107,7 +104,6 @@ class FicheMetierControllerFactory
		$controller->setParcoursDeFormationService($parcoursService);

		$controller->setActiviteForm($activiteForm);
		$controller->setRaisonForm($raisonForm);
		$controller->setSelectionApplicationForm($selectionApplicationForm);
		$controller->setSelectionCompetenceForm($selectionCompetenceForm);
		$controller->setSelectionFormationForm($selectionFormationForm);

module/Application/view/application/fiche-metier/afficher.phtml

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ $libelle = ($fiche->getMetier())?$fiche->getMetier()->getLibelle():"Aucun libell
		$this->headTitle('Affichage de la fiche métier #' . $fiche->getId(). " : " . $libelle);

		echo $this->partial('partial/entete', ['fichemetier' => $fiche, 'mode' => $mode], [], true);
		echo $this->partial('partial/raison', ['fichemetier' => $fiche, 'mode' => $mode], [], true);
		echo $this->partial('partial/missions-principales', ['fichemetier' => $fiche, 'missionsprincipales' => $missions, 'mode' => $mode ], [], true);
		echo $this->partial('partial/competences', ['fichemetier' => $fiche, 'competences' => $competences, 'mode' => $mode ], [], true);
		echo $this->partial('partial/applications', ['fichemetier' => $fiche, 'applications' => $applications, 'mode' => $mode ], [], true);

module/Application/view/application/fiche-metier/editer.phtml

+3 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,9 @@ $libelle = ($fiche->getMetier())?$fiche->getMetier()->getLibelle():"Aucun libell
		$this->headTitle('Modification de la fiche métier #' . $fiche->getId(). " : " . $libelle);

		echo $this->partial('partial/entete', ['fichemetier' => $fiche, 'mode' => $mode], [], true);
		echo $this->partial('partial/raison', ['fichemetier' => $fiche, 'mode' => $mode], [], true);

		echo $this->messenger()->addMessagesFromFlashMessenger();

		echo $this->partial('partial/missions-principales', ['fichemetier' => $fiche, 'missionsprincipales' => $fiche->getActivites(), 'mode' => $mode], [], true);
		echo $this->partial('partial/competences', ['fichemetier' => $fiche, 'competences' => $competences, 'mode' => $mode], [], true);
		echo $this->partial('partial/applications', ['fichemetier' => $fiche, 'applications' => $applications, 'mode' => $mode], [], true);