wip fin (5f5b2fa4) · Commits · open-source / sygal

bin/generate_entity_elements/Module/config/place-holder.config.php

+6 −49

Changes for bin/generate_entity_elements/Module/config/place-holder.config.php: 6 added lines, 49 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@

		namespace Module;

		use Application\Navigation\ApplicationNavigationFactory;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;
		use Module\Assertion\PlaceHolderAssertion;
		use Module\Assertion\PlaceHolderAssertionFactory;
		@@ -92,19 +90,6 @@ return [
		],
		'assertion' => PlaceHolderAssertion::class,
		],
		[
		'controller' => PlaceHolderController::class,
		'action' => [
		'rechercherEtablissement',
		],
		'privileges' => [
		PlaceHolderPrivileges::PlaceHolder_AJOUTER_TOUTES,
		PlaceHolderPrivileges::PlaceHolder_AJOUTER_MIENNES,
		PlaceHolderPrivileges::PlaceHolder_MODIFIER_TOUTES,
		PlaceHolderPrivileges::PlaceHolder_MODIFIER_MIENNES,
		],
		'assertion' => PlaceHolderAssertion::class,
		],
		],
		],
		],
		@@ -112,10 +97,10 @@ return [
		'routes' => [
		'these' => [
		'child_routes' => [
		'cotutelle' => [
		'place-holder' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/cotutelle',
		'route' => '/place-holder',
		'defaults' => [
		'controller' => PlaceHolderController::class,
		],
		@@ -151,9 +136,9 @@ return [
		'modifier' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/modifier/:place-holder',
		'route' => '/modifier/:placeHolder',
		'constraints' => [
		'place-holder' => '\d+',
		'placeHolder' => '\d+',
		],
		'defaults' => [
		/** @see PlaceHolderController::modifierAction() */
		@@ -164,9 +149,9 @@ return [
		'supprimer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/supprimer/:place-holder',
		'route' => '/supprimer/:placeHolder',
		'constraints' => [
		'place-holder' => '\d+',
		'placeHolder' => '\d+',
		],
		'defaults' => [
		/** @see PlaceHolderController::supprimerAction() */
		@@ -180,34 +165,6 @@ return [
		],
		],
		],
		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		ApplicationNavigationFactory::THESE_SELECTIONNEE_PAGE_ID => [
		'pages' => $thesePages = [
		// DEPTH = 2
		'these-cotutelle' => [
		'order' => 10,
		'label' => 'Cotutelle',
		'route' => 'these/cotutelle/consulter',
		'withtarget' => true,
		'paramsInject' => [
		'these',
		],
		'icon' => 'fas fa-globe',
		'resource' => PrivilegeController::getResourceId(PlaceHolderController::class, 'consulter'),
		'visible' => PlaceHolderMenuVisible::class,
		],
		],
		],
		ApplicationNavigationFactory::MA_THESE_PAGE_ID => [
		'pages' => $thesePages
		],
		],
		],
		],
		],
		'form_elements' => [
		'factories' => [
		PlaceHolderForm::class => PlaceHolderFormFactory::class,

bin/generate_entity_elements/Module/src/Module/Controller/PlaceHolderController.php

+4 −4

Changes for bin/generate_entity_elements/Module/src/Module/Controller/PlaceHolderController.php: 4 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ class PlaceHolderController extends AbstractController

		$vm->setVariables([
		'these' => $this->these,
		'place-holder' => $this->placeHolder,
		'placeHolder' => $this->placeHolder,
		]);

		return $vm;
		@@ -96,9 +96,9 @@ class PlaceHolderController extends AbstractController
		$vm = new ViewModel();
		$vm->setVariables([
		'form' => $this->placeHolderForm,
		'title' => $this->placeHolder->getId() ? "Modification de cotutelle" : "Déclaration d'une cotutelle",
		'title' => $this->placeHolder->getId() ? "Modification" : "Ajout",
		]);
		$vm->setTemplate("these-cotutelle/these-cotutelle/modifier");
		$vm->setTemplate("module/place-holder/modifier");

		return $vm;
		}
		@@ -145,7 +145,7 @@ class PlaceHolderController extends AbstractController
		private function getRequestedPlaceHolder(): PlaceHolder
		{
		/** @var \Module\Entity\Db\PlaceHolder $placeHolder */
		$placeHolder = $this->placeHolderService->getRepository()->find($this->params('place-holder'));
		$placeHolder = $this->placeHolderService->getRepository()->find($this->params('placeHolder'));
		Assert::notNull($placeHolder);
		return $placeHolder;
		}

bin/generate_entity_elements/Module/src/Module/Entity/Db/PlaceHolder.php

+5 −0

Changes for bin/generate_entity_elements/Module/src/Module/Entity/Db/PlaceHolder.php: 5 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -17,6 +17,11 @@ class PlaceHolder implements HistoriqueAwareInterface, ResourceInterface
		{
		}

		public function __toString(): string
		{
		return 'PlaceHolder ' . $this->id;
		}

		public function getId(): ?int
		{
		return $this->id;

bin/generate_entity_elements/Module/src/Module/Entity/Db/Service/PlaceHolderService.php

+0 −9

Changes for bin/generate_entity_elements/Module/src/Module/Entity/Db/Service/PlaceHolderService.php: 0 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -27,15 +27,6 @@ class PlaceHolderService extends BaseService
		$this->entityManager->persist($placeHolder);
		}

		// raz des éventuelles anciennes traces de cotutelle obsoletes
		$these = $placeHolder->getThese();
		if ($etablissement = $placeHolder->getEtablissement()) {
		$these->setLibelleEtabCotutelle(null);
		if ($etablissement->getStructure()->getPays()) {
		$these->setLibellePaysCotutelle(null);
		}
		}

		$this->entityManager->flush();
		$this->entityManager->commit();
		} catch (Exception $e) {

bin/generate_entity_elements/Module/src/Module/Form/PlaceHolderFormFactory.php

+3 −4

Changes for bin/generate_entity_elements/Module/src/Module/Form/PlaceHolderFormFactory.php: 3 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,7 +3,6 @@
		namespace Module\Form;

		use Laminas\ServiceManager\Factory\FactoryInterface;
		use Module\Entity\Db\PlaceHolderMotifFin;
		use Module\Hydrator\PlaceHolderHydrator;
		use Psr\Container\ContainerInterface;

		@@ -13,9 +12,9 @@ class PlaceHolderFormFactory implements FactoryInterface
		{
		$form = new PlaceHolderForm();

		// /** @var \Module\Hydrator\PlaceHolderHydrator $hydrator */
		// $hydrator = $container->get('HydratorManager')->get(PlaceHolderHydrator::class);
		// $form->setHydrator($hydrator);
		/** @var \Module\Hydrator\PlaceHolderHydrator $hydrator */
		$hydrator = $container->get('HydratorManager')->get(PlaceHolderHydrator::class);
		$form->setHydrator($hydrator);

		/** @var \Doctrine\ORM\EntityManager $em */
		$em = $container->get('doctrine.entitymanager.orm_default');