Commit 73a39263 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

FIX : Type de contrat non-détecté (à améliorer)

parent 3f6d1b0f

module/Oscar/src/Oscar/Controller/ProjectGrantController.php

+1 −0
Original line number Diff line number Diff line
@@ -3029,6 +3029,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
                case 'remove-waiting';

                    $idActivityPcruInfo = intval($this->params()->fromPost('activitypcruinfo_id'));

                    $this->getProjectGrantService()->getPCRUService()->removeWaiting($idActivityPcruInfo);

                    $this->redirect()->toRoute('contract/show', ['id'=>$activity->getId()]);



                case 'add-pool':

                    $this->getProjectGrantService()->getPCRUService()->addToPool($activity);

module/Oscar/src/Oscar/Entity/ActivityPcruInfos.php

+1 −1
Original line number Diff line number Diff line
@@ -608,7 +608,7 @@ class ActivityPcruInfos 
    /**

     * @param PcruTypeContract $typeContrat

     */

    public function setTypeContrat( PcruTypeContract $typeContrat): self

    public function setTypeContrat( ?PcruTypeContract $typeContrat): self

    {

        $this->typeContrat = $typeContrat;

        return $this;

module/Oscar/src/Oscar/Service/PCRUService.php

+2 −0
Original line number Diff line number Diff line
@@ -246,6 +246,8 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
        /** @var ActivityPcruInfos $pcruInfo */

        $pcruInfo = $this->getActivityPCRUInfoRepository()->find($idActivityPcruInfo);



        $this->getLoggerService()->debug("Suppression PCRU (en attente)");



        if( $pcruInfo == null ){

            throw new OscarException("Informations PCRU introuvable (id = $idActivityPcruInfo)");

        }