Commit 15206ccd authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Corection bug saisie nouvelle mission

parent 9127a049

module/Mission/src/Controller/SaisieController.php

+1 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ class SaisieController extends AbstractController 
        $intervenant = $this->getEvent()->getParam('intervenant');



        $mission = $this->getServiceMission()->newEntity();

        $mission->setEntityManager($this->em());

        $mission->setIntervenant($intervenant);



        $canAutoValidate = $this->isAllowed($mission, Privileges::MISSION_AUTOVALIDATION);

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

+28 −27
Original line number Diff line number Diff line
@@ -11,14 +11,18 @@ use Doctrine\Common\Collections\ArrayCollection; 
use Doctrine\Common\Collections\Collection;

use Laminas\Permissions\Acl\Resource\ResourceInterface;

use Paiement\Entity\Db\TauxRemu;

use Service\Entity\Db\TypeVolumeHoraire;

use UnicaenApp\Entity\HistoriqueAwareInterface;

use UnicaenApp\Entity\HistoriqueAwareTrait;

use UnicaenApp\Service\EntityManagerAwareInterface;

use UnicaenApp\Service\EntityManagerAwareTrait;



class Mission implements HistoriqueAwareInterface, ResourceInterface

class Mission implements HistoriqueAwareInterface, ResourceInterface, EntityManagerAwareInterface

{

    use HistoriqueAwareTrait;

    use IntervenantAwareTrait;

    use StructureAwareTrait;

    use EntityManagerAwareTrait;



    protected ?int $id = null;
@@ -145,9 +149,6 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface 






    /**

     * @return bool

     */

    public function isAutoValidation(): bool

    {

        return $this->autoValidation;
@@ -155,11 +156,6 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface 






    /**

     * @param bool $autoValidation

     *

     * @return Mission

     */

    public function setAutoValidation(bool $autoValidation): Mission

    {

        $this->autoValidation = $autoValidation;
@@ -214,8 +210,13 @@ class Mission implements HistoriqueAwareInterface, ResourceInterface 
        $oldHeures = $this->getHeures() ?: 0;

        $newHeures = $heures - $oldHeures;



        $prevu = $this->getEntityManager()

            ->getRepository(TypeVolumeHoraire::class)

            ->findOneBy(['code' => TypeVolumeHoraire::CODE_PREVU]);



        if ($newHeures != 0) {

            $nvh = new VolumeHoraireMission();

            $nvh->setTypeVolumeHoraire($prevu);

            $nvh->setMission($this);

            $this->addVolumeHoraire($nvh);

            $nvh->setHeures($newHeures);