Formulaire Structures encadrantes HDR : modif libellés UR affichés ; suppression de code inutile. (524b565a) · Commits · open-source / sygal

module/HDR/src/HDR/Fieldset/Structures/StructuresFieldset.php

+2 −91

Changes for module/HDR/src/HDR/Fieldset/Structures/StructuresFieldset.php: 2 added lines, 91 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,13 +3,10 @@
		namespace HDR\Fieldset\Structures;

		use DoctrineModule\Form\Element\ObjectSelect;
		use HDR\Entity\Db\HDR;
		use Laminas\Form\Element\Hidden;
		use Laminas\Form\Fieldset;
		use Laminas\InputFilter\InputFilterProviderInterface;
		use Laminas\Validator\NotEmpty;
		use Structure\Entity\Db\EcoleDoctorale;
		use Structure\Entity\Db\Etablissement;
		use Structure\Entity\Db\UniteRecherche;
		use Structure\Service\Etablissement\EtablissementServiceAwareTrait;
		use Structure\Service\Structure\StructureServiceAwareTrait;
		@@ -22,61 +19,21 @@ class StructuresFieldset extends Fieldset implements InputFilterProviderInterfac
		use StructureServiceAwareTrait;
		use EntityManagerAwareTrait;

		// private array $etablissements;
		private array $ecolesDoctorales;
		private array $unitesRecherche;

		// public function setEtablissements(array $etablissements): void
		// {
		// $options = [];
		// foreach ($etablissements as $etablissement) {
		// $sigle = $etablissement->getStructure()?->getSigle() ? " (".$etablissement->getStructure()->getSigle().")" : null;
		// $options[$etablissement->getId()] = $etablissement->getStructure()?->getLibelle() . $sigle;
		// }
		// $this->etablissements = $options;
		// }

		public function setEcolesDoctorales(array $ecolesDoctorales): void
		{
		$options = [];

		foreach ($ecolesDoctorales as $ecole) {
		$sigle = $ecole->getStructure()?->getCode() ? " (".$ecole->getStructure()->getCode().")" : null;
		$options[$ecole->getId()] = $ecole->getStructure()?->getLibelle() . $sigle;
		}
		$this->ecolesDoctorales = $options;
		}

		public function setUnitesRecherche(array $unitesRecherche): void
		{
		Assert::allIsInstanceOf($unitesRecherche, UniteRecherche::class);
		$this->unitesRecherche = $unitesRecherche;
		}

		public function init()
		public function init(): void
		{
		$this->add([
		'type' => Hidden::class,
		'name' => 'id',
		]);

		// $this->add([
		// 'type' => ObjectSelect::class,
		// 'name' => 'etablissement',
		// 'options' => [
		// 'label' => "Établissement <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> :",
		// 'label_options' => [ 'disable_html_escape' => true, ],
		// 'target_class' => Etablissement::class,
		// 'value_options' => $this->etablissements,
		// ],
		// 'attributes' => [
		// 'id' => 'etablissement',
		// 'class' => 'selectpicker show-menu-arrow',
		// 'title' => "Sélectionner l'établissement",
		// 'data-live-search' => 'true',
		// ],
		// ]);

		$this->add([
		'type' => ObjectSelect::class,
		'name' => 'uniteRecherche',
		@@ -93,29 +50,9 @@ class StructuresFieldset extends Fieldset implements InputFilterProviderInterfac
		'data-live-search' => 'true',
		],
		]);

		// $this->add([
		// 'type' => ObjectSelect::class,
		// 'name' => 'ecoleDoctorale',
		// 'options' => [
		// 'label' => "École doctorale <span class='icon icon-obligatoire' style='color: darkred;font-size: 0.8em;' data-bs-toggle='tooltip' title='Obligatoire'></span> : ",
		// 'label_options' => [ 'disable_html_escape' => true, ],
		// 'target_class' => EcoleDoctorale::class,
		// 'value_options' => $this->ecolesDoctorales,
		// ],
		// 'attributes' => [
		// 'id' => 'ecole-doctorale',
		// 'data-live-search' => 'true',
		// 'class' => 'selectpicker show-menu-arrow',
		// 'title' => "Sélectionner l'école doctorale"
		// ],
		// ]);
		}

		/**
		* @inheritDoc
		*/
		public function getInputFilterSpecification()
		public function getInputFilterSpecification(): array
		{
		return [
		'uniteRecherche' => [
		@@ -131,32 +68,6 @@ class StructuresFieldset extends Fieldset implements InputFilterProviderInterfac
		],
		],
		],
		// 'ecoleDoctorale' => [
		// 'required' => true,
		// 'validators' => [
		// [
		// 'name' => NotEmpty::class,
		// 'options' => [
		// 'messages' => [
		// NotEmpty::IS_EMPTY => 'Veuillez sélectionner une école doctorale.',
		// ],
		// ],
		// ],
		// ],
		// ],
		// 'etablissement' => [
		// 'required' => true,
		// 'validators' => [
		// [
		// 'name' => NotEmpty::class,
		// 'options' => [
		// 'messages' => [
		// NotEmpty::IS_EMPTY => 'Veuillez sélectionner un établissement.',
		// ],
		// ],
		// ],
		// ],
		// ],
		];
		}
		}
		No newline at end of file

module/HDR/src/HDR/Fieldset/Structures/StructuresFieldsetFactory.php

+2 −6

Changes for module/HDR/src/HDR/Fieldset/Structures/StructuresFieldsetFactory.php: 2 added lines, 6 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,11 +3,11 @@
		namespace HDR\Fieldset\Structures;

		use Doctrine\Laminas\Hydrator\DoctrineObject;
		use HDR\Entity\Db\HDR;
		use Interop\Container\ContainerInterface;
		use Structure\Entity\Db\TypeStructure;
		use Structure\Service\Etablissement\EtablissementService;
		use Structure\Service\Structure\StructureService;
		use HDR\Entity\Db\HDR;

		class StructuresFieldsetFactory
		{
		@@ -27,12 +27,8 @@ class StructuresFieldsetFactory
		$etablissementService = $container->get(EtablissementService::class);
		$fieldset->setEtablissementService($etablissementService);

		$ecolesDoctorales = $structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_ECOLE_DOCTORALE, 'structure.libelle', false);
		$fieldset->setEcolesDoctorales($ecolesDoctorales);
		$unitesRecherche = $structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, ['structure.sigle', 'structure.libelle'], false);
		$unitesRecherche = $structureService->findAllStructuresAffichablesByType(TypeStructure::CODE_UNITE_RECHERCHE, ['structure.code', 'structure.libelle'], false);
		$fieldset->setUnitesRecherche($unitesRecherche);
		// $etablissements = $etablissementService->getRepository()->findAllEtablissementsInscriptions();
		// $fieldset->setEtablissements($etablissements);

		/** @var EtablissementService $etablissementService */
		$etablissementService = $container->get(EtablissementService::class);

module/Structure/src/Structure/Entity/Db/UniteRecherche.php

+6 −1

Changes for module/Structure/src/Structure/Entity/Db/UniteRecherche.php: 6 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -82,7 +82,12 @@ class UniteRecherche implements

		public function __toString(): string
		{
		return ($this->structure->getSigle() ?: '???') . ' - ' . $this->structure->getLibelle();
		$sigle = $this->structure->getSigle();

		return implode(' -- ', array_filter([
		$this->structure->getCode(),
		$this->structure->getLibelle() . ($sigle ? sprintf(" (%s)", $sigle) : null),
		]));
		}

		/**