Poursuite du nettoyage lié au CompetenceElement (564e6d14) · Commits · open-source / emc2

module/Application/config/merged/agent.config.php

+0 −6

Original line number	Diff line number	Diff line
		@@ -6,10 +6,6 @@ use Application\Assertion\AgentAssertion;
		use Application\Assertion\AgentAssertionFactory;
		use Application\Controller\AgentController;
		use Application\Controller\AgentControllerFactory;
		use Application\Form\AgentCompetence\AgentCompetenceForm;
		use Application\Form\AgentCompetence\AgentCompetenceFormFactory;
		use Application\Form\AgentCompetence\AgentCompetenceHydrator;
		use Application\Form\AgentCompetence\AgentCompetenceHydratorFactory;
		use Application\Form\AgentFormation\AgentFormationForm;
		use Application\Form\AgentFormation\AgentFormationFormFactory;
		use Application\Form\AgentFormation\AgentFormationHydrator;
		@@ -508,14 +504,12 @@ return [
		],
		'form_elements' => [
		'factories' => [
		AgentCompetenceForm::class => AgentCompetenceFormFactory::class,
		AgentFormationForm::class => AgentFormationFormFactory::class,
		SelectionAgentForm::class => SelectionAgentFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		AgentCompetenceHydrator::class => AgentCompetenceHydratorFactory::class,
		AgentFormationHydrator::class => AgentFormationHydratorFactory::class,
		SelectionAgentHydrator::class => SelectionAgentHydratorFactory::class,
		],

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

+1 −3

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ use Application\Entity\Db\Agent;
		use Application\Entity\Db\AgentFormation;
		use Application\Entity\Db\ApplicationElement;
		use Application\Entity\Db\CompetenceElement;
		use Application\Form\AgentCompetence\AgentCompetenceFormAwareTrait;
		use Application\Form\AgentFormation\AgentFormationFormAwareTrait;
		use Application\Form\ApplicationElement\ApplicationElementForm;
		use Application\Form\ApplicationElement\ApplicationElementFormAwareTrait;
		@@ -60,7 +59,6 @@ class AgentController extends AbstractActionController

		use ApplicationElementFormAwareTrait;
		use CompetenceElementFormAwareTrait;
		use AgentCompetenceFormAwareTrait;
		use AgentFormationFormAwareTrait;
		use SelectionApplicationFormAwareTrait;
		use UploadFormAwareTrait;
		@@ -488,7 +486,7 @@ class AgentController extends AbstractActionController
		$elementText = "l'application [" . $entity->getApplication()->getLibelle() . "]";
		break;
		case 'AgentCompetence' :
		$entity = $this->getAgentService()->getAgentCompetence($entityId);
		$entity = $this->getCompetenceElementService()->getCompetenceElement($entityId);
		$validationType = $this->getValidationTypeService()->getValidationTypeByCode("AGENT_COMPETENCE");
		$elementText = "la compétence [" . $entity->getCompetence()->getLibelle() . "]";
		break;

module/Application/src/Application/Controller/AgentControllerFactory.php

+0 −4

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@

		namespace Application\Controller;

		use Application\Form\AgentCompetence\AgentCompetenceForm;
		use Application\Form\AgentFormation\AgentFormationForm;
		use Application\Form\ApplicationElement\ApplicationElementForm;
		use Application\Form\CompetenceElement\CompetenceElementForm;
		@@ -65,13 +64,11 @@ class AgentControllerFactory {
		/**
		* @var ApplicationElementForm $applicationElementForm
		* @var CompetenceElementForm $competenceElementForm
		* @var AgentCompetenceForm $agentCompetenceForm
		* @var AgentFormationForm $agentFormationForm
		* @var UploadForm $uploadForm
		*/
		$applicationElementForm = $container->get('FormElementManager')->get(ApplicationElementForm::class);
		$competenceElementForm = $container->get('FormElementManager')->get(CompetenceElementForm::class);
		$agentCompetenceForm = $container->get('FormElementManager')->get(AgentCompetenceForm::class);
		$agentFormationForm = $container->get('FormElementManager')->get(AgentFormationForm::class);
		$uploadForm = $container->get('FormElementManager')->get(UploadForm::class);

		@@ -96,7 +93,6 @@ class AgentControllerFactory {

		$controller->setApplicationElementForm($applicationElementForm);
		$controller->setCompetenceElementForm($competenceElementForm);
		$controller->setAgentCompetenceForm($agentCompetenceForm);
		$controller->setAgentFormationForm($agentFormationForm);
		$controller->setUploadForm($uploadForm);

module/Application/src/Application/Form/AgentCompetence/AgentCompetenceForm.php

deleted100644 → 0

+0 −82

Original line number	Diff line number	Diff line
		<?php

		namespace Application\Form\AgentCompetence;

		use Application\Service\Competence\CompetenceServiceAwareTrait;
		use Zend\Form\Element\Button;
		use Zend\Form\Element\Select;
		use Zend\Form\Form;
		use Zend\InputFilter\Factory;

		class AgentCompetenceForm extends Form {
		use CompetenceServiceAwareTrait;

		public function init()
		{
		//competence
		$this->add([
		'name' => 'competence',
		'type' => Select::class,
		'options' => [
		'label' => 'Competence* : ',
		'label_attributes' => [
		'class' => 'control-label',
		],
		'empty_option' => "Sélectionner une compétence ... ",
		'value_options' => $this->getCompetenceService()->getCompetencesAsGroupOptions(),
		],
		'attributes' => [
		'id' => 'competence',
		'class' => 'bootstrap-selectpicker show-tick',
		'data-live-search' => 'true',
		]
		]);
		//niveau
		$this->add([
		'name' => 'niveau',
		'type' => Select::class,
		'options' => [
		'label' => 'Niveau* : ',
		'label_attributes' => [
		'class' => 'control-label',
		],
		'empty_option' => "Sélectionner un niveau de maîtrise ... ",
		'value_options' => [
		'à acquérir' => "À acquérir",
		'à développer' => "À développer",
		'maîtrise' => "Maîtrise",
		'expert' => "Expert",
		],
		],
		'attributes' => [
		'id' => 'niveau',
		'class' => 'bootstrap-selectpicker show-tick',
		'data-live-search' => 'true',
		]
		]);
		// button
		$this->add([
		'type' => Button::class,
		'name' => 'creer',
		'options' => [
		'label' => '<i class="fas fa-save"></i> Enregistrer',
		'label_options' => [
		'disable_html_escape' => true,
		],
		],
		'attributes' => [
		'type' => 'submit',
		'class' => 'btn btn-primary',
		],
		]);

		$this->setInputFilter((new Factory())->createInputFilter([
		'competence' => [
		'required' => true,
		],
		'niveau' => [
		'required' => true,
		],
		]));
		}
		}
		No newline at end of file

module/Application/src/Application/Form/AgentCompetence/AgentCompetenceFormAwareTrait.php

deleted100644 → 0

+0 −29

Original line number	Diff line number	Diff line
		<?php

		namespace Application\Form\AgentCompetence;

		trait AgentCompetenceFormAwareTrait {

		/** @var AgentCompetenceForm $agentCompetenceForm */
		private $agentCompetenceForm;

		/**
		* @return AgentCompetenceForm
		*/
		public function getAgentCompetenceForm()
		{
		return $this->agentCompetenceForm;
		}

		/**
		* @param AgentCompetenceForm $agentCompetenceForm
		* @return AgentCompetenceForm
		*/
		public function setAgentCompetenceForm($agentCompetenceForm)
		{
		$this->agentCompetenceForm = $agentCompetenceForm;
		return $this->agentCompetenceForm;
		}


		}
		No newline at end of file