Refactor centreCoutsLinkers en centreCoutsTypeMission (69d8e232) · Commits · open-source / OSE

module/Mission/src/Controller/MissionTypeController.php

+5 −5

Original line number	Diff line number	Diff line
		@@ -112,7 +112,7 @@ class MissionTypeController extends AbstractController
		$centreCoutTypeLinker->setCentreCouts($centreCouts);
		$this->getServiceMissionType()->saveCentreCoutTypeLinker($centreCoutTypeLinker);

		$entity->addCentreCoutsLinker($centreCoutTypeLinker);
		$entity->addCentreCoutTypeMission($centreCoutTypeLinker);
		$this->getServiceMissionType()->save($entity);
		}
		}
		@@ -120,10 +120,10 @@ class MissionTypeController extends AbstractController

		$form = $this->getFormMissionCentreCoutsType();

		$centreCoutsLinkers = $entity->getCentreCoutsLinkers();
		$centreCoutsTypeMission = $entity->getCentreCoutsTypeMission();
		$vm = new ViewModel();

		$vm->setVariables(compact('form', 'title', 'canEditCC', 'entity', 'centreCoutsLinkers'));
		$vm->setVariables(compact('form', 'title', 'canEditCC', 'entity', 'centreCoutsTypeMission'));

		return $vm;
		}
		@@ -136,9 +136,9 @@ class MissionTypeController extends AbstractController
		* @var TypeMission $entity
		*/
		$entity = $this->getEvent()->getParam('typeMission');
		$centreCoutsLinker = $this->getEvent()->getParam('centreCoutTypeMission');
		$centreCoutTypeMission = $this->getEvent()->getParam('centreCoutTypeMission');

		$this->getServiceMissionType()->removeCentreCoutLinker($centreCoutsLinker);
		$this->getServiceMissionType()->removeCentreCoutLinker($centreCoutTypeMission);


		return $this->redirect()->toRoute('missions-type/centre-couts', ['typeMission' => $entity->getId()]);

module/Mission/src/Entity/Db/Mapping/Mission.Entity.Db.TypeMission.dcm.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,6 +36,6 @@
		<join-column name="HISTO_DESTRUCTEUR_ID" referenced-column-name="ID"/>
		</join-columns>
		</many-to-one>
		<one-to-many field="centreCoutsLinkers" target-entity="Mission\Entity\Db\CentreCoutTypeMission" mapped-by="typeMission"/>
		<one-to-many field="centreCoutsTypeMission" target-entity="Mission\Entity\Db\CentreCoutTypeMission" mapped-by="typeMission"/>
		</entity>
		</doctrine-mapping>
		No newline at end of file

module/Mission/src/Entity/Db/TypeMission.php

+33 −12

Original line number	Diff line number	Diff line
		@@ -27,7 +27,7 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface

		protected bool $besoinFormation = false;

		protected $centreCoutsLinkers = null;
		protected $centreCoutsTypeMission = null;



		@@ -50,7 +50,7 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface
		*/
		public function __construct()
		{
		$this->centreCoutsLinkers = new ArrayCollection();
		$this->centreCoutsTypeMission = new ArrayCollection();
		}


		@@ -58,9 +58,9 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface
		/**
		* @return ArrayCollection
		*/
		public function getCentreCoutsLinkers()
		public function getCentreCoutsTypeMission(): ArrayCollection
		{
		return $this->centreCoutsLinkers->filter(function ($centreCoutLinker) {
		return $this->centreCoutsTypeMission->filter(function ($centreCoutLinker) {
		return !$centreCoutLinker->estHistorise();
		});
		}
		@@ -68,23 +68,28 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface


		/**
		* @param null $centreCoutsLinker
		* @param null $centreCoutTypeMission
		*
		* @return TypeMission
		*/
		public function addCentreCoutsLinker($centreCoutsLinker): TypeMission
		public function addCentreCoutTypeMission($centreCoutTypeMission): TypeMission
		{
		$this->centreCoutsLinkers[] = $centreCoutsLinker;
		$this->centreCoutsTypeMission[] = $centreCoutTypeMission;

		return $this;
		}



		public function removeCentreCoutsLinker($centreCoutsLinker): TypeMission
		/**
		* @param $centreCoutTypeMission
		*
		* @return $this
		*/
		public function removeCentreCoutTypeMission($centreCoutTypeMission): TypeMission
		{

		$this->centreCoutsLinkers->removeElement($centreCoutsLinker);
		$this->centreCoutsTypeMission->removeElement($centreCoutTypeMission);
		return $this;
		}

		@@ -124,6 +129,9 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface



		/**
		* @return TauxRemu\|null
		*/
		public function getTauxRemu(): ?TauxRemu
		{
		return $this->tauxRemu;
		@@ -131,6 +139,11 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface



		/**
		* @param TauxRemu\|null $tauxRemu
		*
		* @return $this
		*/
		public function setTauxRemu(?TauxRemu $tauxRemu): TypeMission
		{
		$this->tauxRemu = $tauxRemu;
		@@ -140,6 +153,9 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface



		/**
		* @return TauxRemu\|null
		*/
		public function getTauxRemuMajore(): ?TauxRemu
		{
		return $this->tauxRemuMajore;
		@@ -147,6 +163,11 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface



		/**
		* @param TauxRemu\|null $tauxRemuMajore
		*
		* @return $this
		*/
		public function setTauxRemuMajore(?TauxRemu $tauxRemuMajore): self
		{
		$this->tauxRemuMajore = $tauxRemuMajore;
		@@ -201,10 +222,10 @@ class TypeMission implements ParametreEntityInterface, PlafondPerimetreInterface
		{
		$centreCoutsIds = [];
		/**
		* @var $centreCoutsLinker CentreCoutTypeMission
		* @var CentreCoutTypeMission $centreCoutTypeMission
		*/
		foreach ($this->centreCoutsLinkers as $centreCoutsLinker) {
		$centreCoutsIds[] = $centreCoutsLinker->getCentreCouts()->getId();
		foreach ($this->centreCoutsTypeMission as $centreCoutTypeMission) {
		$centreCoutsIds[] = $centreCoutTypeMission->getCentreCouts()->getId();
		}

		return $centreCoutsIds;

module/Mission/src/Service/MissionTypeService.php

+5 −5

Original line number	Diff line number	Diff line
		@@ -67,16 +67,16 @@ class MissionTypeService extends AbstractEntityService



		public function removeCentreCoutLinker(CentreCoutTypeMission $centreCoutsLinker, $softDelete = true)
		public function removeCentreCoutLinker(CentreCoutTypeMission $centreCoutTypeMission, $softDelete = true)
		{
		if($softDelete){
		$centreCoutsLinker->historiser($this->getServiceContext()->getUtilisateur());
		$this->getEntityManager()->persist($centreCoutsLinker);
		$centreCoutTypeMission->historiser($this->getServiceContext()->getUtilisateur());
		$this->getEntityManager()->persist($centreCoutTypeMission);
		}else{
		$this->getEntityManager()->remove($centreCoutsLinker);
		$this->getEntityManager()->remove($centreCoutTypeMission);

		}
		$this->getEntityManager()->flush($centreCoutsLinker);
		$this->getEntityManager()->flush($centreCoutTypeMission);

		}

module/Mission/view/mission/mission-type/centre-couts.phtml

+6 −6

Original line number	Diff line number	Diff line
		@@ -10,9 +10,9 @@ use Application\Provider\Privilege\Privileges;
		echo '<br>' . $this->form($form);
		/**
		* @var $entity \Mission\Entity\Db\TypeMission
		* @var $centreCoutsLinkers \Doctrine\ORM\PersistentCollection
		* @var $centreCoutsTypeMission \Doctrine\ORM\PersistentCollection
		*/
		if ($centreCoutsLinkers != null && !empty($centreCoutsLinkers)): ?>
		if ($centreCoutsTypeMission != null && !empty($centreCoutsTypeMission)): ?>
		<br>
		<table class="table table-bordered">
		<thead>
		@@ -25,12 +25,12 @@ if ($centreCoutsLinkers != null && !empty($centreCoutsLinkers)): ?>

		<?php
		/**
		* @var $centreCoutsLinker \Mission\Entity\Db\CentreCoutTypeMission
		* @var $centreCoutTypeMission \Mission\Entity\Db\CentreCoutTypeMission
		*/
		foreach ($centreCoutsLinkers as $centreCoutsLinker): ?>
		foreach ($centreCoutsTypeMission as $centreCoutTypeMission): ?>
		<tr>
		<td>
		<?php echo $centreCoutsLinker->getCentreCouts()->getCode() . "-" . $centreCoutsLinker->getCentreCouts()->getLibelle(); ?>
		<?php echo $centreCoutTypeMission->getCentreCouts()->getCode() . "-" . $centreCoutTypeMission->getCentreCouts()->getLibelle(); ?>
		</td>
		<td>
		<a class="pop-ajax"
		@@ -40,7 +40,7 @@ if ($centreCoutsLinkers != null && !empty($centreCoutsLinkers)): ?>
		data-cancel-button="Non"
		data-submit-close="true"
		data-submit-event="event-supprimer-cc"
		href="<?= $this->url('missions-type/centre-couts-supprimer', ['typeMission' => $entity->getId(), 'centreCoutTypeMission' => $centreCoutsLinker->getId()]) ?>"
		href="<?= $this->url('missions-type/centre-couts-supprimer', ['typeMission' => $entity->getId(), 'centreCoutTypeMission' => $centreCoutTypeMission->getId()]) ?>"
		title="Supprimer le scénario"><i class="fas fa-trash-can"></i>
		</a>
		</td>