Reworks des formations (a1887f4b) · Commits · open-source / emc2

config/autoload/unicaen-app.global.php

+2 −2

Changes for config/autoload/unicaen-app.global.php: 2 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,8 +26,8 @@ return [
		'app_infos' => [
		'nom' => "PrEECoG",
		'desc' => "Gestion Prévisionnelle des effectifs, des emplois et des compétences",
		'version' => "0.2.4",
		'date' => "16/09/2019",
		'version' => "0.2.5",
		'date' => "17/09/2019",
		'contact' => ['mail' => "dsi.applications@unicaen.fr", /'tel' => "01 02 03 04 05"/],
		'mentionsLegales' => "http://www.unicaen.fr/acces-direct/mentions-legales/",
		'informatiqueEtLibertes' => "http://www.unicaen.fr/acces-direct/informatique-et-libertes/",

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

+18 −2

Changes for module/Application/config/merged/fiche-metier.config.php: 18 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ use Application\Form\FicheMetier\FormationComportementaleHydrator;
		use Application\Form\FicheMetier\FormationOperationnelleForm;
		use Application\Form\FicheMetier\FormationOperationnelleFormFactory;
		use Application\Form\FicheMetier\FormationOperationnelleHydrator;
		use Application\Form\FicheMetier\FormationsForm;
		use Application\Form\FicheMetier\FormationsFormFactory;
		use Application\Form\FicheMetier\FormationsHydrator;
		use Application\Form\FicheMetier\FormationsHydratorFactory;
		use Application\Form\FicheMetier\LibelleForm;
		use Application\Form\FicheMetier\LibelleFormFactory;
		use Application\Form\FicheMetier\LibelleHydrator;
		@@ -65,6 +69,7 @@ return [
		'modifier-operationnelle',
		'modifier-comportementale',
		'modifier-application',
		'modifier-formation',
		'ajouter',
		],
		'privileges' => [
		@@ -264,6 +269,17 @@ return [
		],
		'may_terminate' => true,
		],
		'modifier-formation' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier-formation/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'modifier-formation',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		],
		@@ -287,11 +303,11 @@ return [
		'factories' => [
		ActiviteExistanteForm::class => ActiviteExistanteFormFactory::class,
		LibelleForm::class => LibelleFormFactory::class,

		FormationBaseForm::class => FormationBaseFormFactory::class,
		FormationOperationnelleForm::class => FormationOperationnelleFormFactory::class,
		FormationComportementaleForm::class => FormationComportementaleFormFactory::class,
		ApplicationsForm::class => ApplicationsFormFactory::class,
		FormationsForm::class => FormationsFormFactory::class,


		],
		@@ -301,11 +317,11 @@ return [
		FormationBaseHydrator::class => FormationBaseHydrator::class,
		FormationOperationnelleHydrator::class => FormationOperationnelleHydrator::class,
		FormationComportementaleHydrator::class => FormationComportementaleHydrator::class,

		],
		'factories' => [
		LibelleHydrator::class => LibelleHydratorFactory::class,
		ApplicationsHydrator::class => ApplicationsHydratorFactory::class,
		FormationsHydrator::class => FormationsHydratorFactory::class,
		],
		],
		'view_helpers' => [

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

+39 −4

Changes for module/Application/src/Application/Controller/FicheMetierController.php: 39 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ use Application\Form\FicheMetier\FormationComportementaleForm;
		use Application\Form\FicheMetier\FormationComportementaleFormAwareTrait;
		use Application\Form\FicheMetier\FormationOperationnelleForm;
		use Application\Form\FicheMetier\FormationOperationnelleFormAwareTrait;
		use Application\Form\FicheMetier\FormationsForm;
		use Application\Form\FicheMetier\FormationsFormAwareTrait;
		use Application\Form\FicheMetier\LibelleForm;
		use Application\Form\FicheMetier\LibelleFormAwareTrait;
		use Application\Service\Activite\ActiviteServiceAwareTrait;
		@@ -37,10 +39,13 @@ class FicheMetierController extends AbstractActionController{
		use ActiviteFormAwareTrait;
		use ActiviteExistanteFormAwareTrait;
		use ApplicationsFormAwareTrait;
		use FormationsFormAwareTrait;
		use LibelleFormAwareTrait;

		use FormationBaseFormAwareTrait;
		use FormationComportementaleFormAwareTrait;
		use FormationOperationnelleFormAwareTrait;
		use LibelleFormAwareTrait;


		public function indexAction()
		{
		@@ -345,11 +350,41 @@ class FicheMetierController extends AbstractActionController{
		}
		}

		return new ViewModel([
		'type' => 'comportementale',
		'title' => 'Modification des compétences comportementales',
		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		$vm->setVariables([
		'title' => 'Modification des applications',
		'form' => $form,
		]);
		return $vm;
		}

		public function modifierFormationAction()
		{
		$fiche = $this->getFicheMetierService()->getRequestedFicheMetier($this, 'id');

		/** @var FormationsForm $form */
		$form = $this->getFormationsForm();
		$form->setAttribute('action', $this->url()->fromRoute('fiche-metier-type/modifier-formation', ['id' => $fiche->getId()], [], true));
		$form->bind($fiche);

		/** @var Request $request */
		$request = $this->getRequest();
		if ($request->isPost()) {
		$data = $request->getPost();
		$form->setData($data);
		if ($form->isValid()) {
		$this->getFicheMetierService()->update($fiche);
		}
		}

		$vm = new ViewModel();
		$vm->setTemplate('application/default/default-form');
		$vm->setVariables([
		'title' => 'Modification des formations',
		'form' => $form,
		]);
		return $vm;
		}

		/** Document pour la signature en présidence */

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

+12 −3

Changes for module/Application/src/Application/Controller/FicheMetierControllerFactory.php: 12 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ use Application\Form\FicheMetier\ApplicationsForm;
		use Application\Form\FicheMetier\FormationBaseForm;
		use Application\Form\FicheMetier\FormationComportementaleForm;
		use Application\Form\FicheMetier\FormationOperationnelleForm;
		use Application\Form\FicheMetier\FormationsForm;
		use Application\Form\FicheMetier\LibelleForm;
		use Application\Service\Activite\ActiviteService;
		use Application\Service\FicheMetier\FicheMetierService;
		@@ -28,21 +29,26 @@ class FicheMetierControllerFactory {
		$ressourceRhService = $container->get(RessourceRhService::class);

		/**
		* @var LibelleForm $libelleForm
		* @var ActiviteForm $activiteForm
		* @var ActiviteExistanteForm $activiteExistanteForm
		* @var ApplicationsForm $applicationsForm
		* @var FormationsForm $formationsForm
		*
		* @var FormationBaseForm $formationBaseForm
		* @var FormationComportementaleForm $formationComportementalForm
		* @var FormationOperationnelleForm $formationOperationnelleForm
		* @var LibelleForm $libelleForm
		*/
		$libelleForm = $container->get('FormElementManager')->get(LibelleForm::class);
		$activiteForm = $container->get('FormElementManager')->get(ActiviteForm::class);
		$activiteExistanteForm = $container->get('FormElementManager')->get(ActiviteExistanteForm::class);
		$applicationsForm = $container->get('FormElementManager')->get(ApplicationsForm::class);
		$formationsForm = $container->get('FormElementManager')->get(FormationsForm::class);

		$formationBaseForm = $container->get('FormElementManager')->get(FormationBaseForm::class);
		$formationComportementalForm = $container->get('FormElementManager')->get(FormationComportementaleForm::class);
		$formationOperationnelleForm = $container->get('FormElementManager')->get(FormationOperationnelleForm::class);
		$libelleForm = $container->get('FormElementManager')->get(LibelleForm::class);



		/** @var FicheMetierController $controller */
		@@ -52,13 +58,16 @@ class FicheMetierControllerFactory {
		$controller->setFicheMetierService($ficheMetierService);
		$controller->setRessourceRhService($ressourceRhService);

		$controller->setLibelleForm($libelleForm);
		$controller->setActiviteForm($activiteForm);
		$controller->setActiviteExistanteForm($activiteExistanteForm);
		$controller->setApplicationsForm($applicationsForm);
		$controller->setFormationsForm($formationsForm);

		$controller->setFormationBaseForm($formationBaseForm);
		$controller->setFormationComportementaleForm($formationComportementalForm);
		$controller->setFormationOperationnelleForm($formationOperationnelleForm);
		$controller->setLibelleForm($libelleForm);



		return $controller;

module/Application/src/Application/Entity/Db/FicheMetier.php

+45 −1

Changes for module/Application/src/Application/Entity/Db/FicheMetier.php: 45 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -22,15 +22,17 @@ class FicheMetier {

		/** @var ArrayCollection */
		private $applications;

		/** @var ArrayCollection */
		private $activites;
		/** @var ArrayCollection */
		private $formations;


		public function __construct()
		{
		$this->applications = new ArrayCollection();
		$this->activites = new ArrayCollection();
		$this->formations = new ArrayCollection();
		}


		@@ -185,4 +187,46 @@ class FicheMetier {
		$this->activites->removeElement($activite);
		return $this;
		}

		/**
		* @return Formation[]
		*/
		public function getFormations()
		{
		return $this->formations->toArray();
		}

		/**
		* @param Formation $formation
		* @return FicheMetier
		*/
		public function addFormation($formation)
		{
		$this->formations->add($formation);
		return $this;
		}

		/**
		* @param Formation $formation
		* @return FicheMetier
		*/
		public function removeFormation($formation)
		{
		$this->formations->removeElement($formation);
		return $this;
		}

		/**
		* @param Formation $formation
		* @return boolean
		*/
		public function hasFormation($formation)
		{
		return $this->formations->contains($formation);
		}

		public function clearFormations()
		{
		$this->formations->clear();
		}
		}
		No newline at end of file