Commit e70fa4d0 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : l'intitulé du partenaire principal est correctement enregistré dans les informations PCRU

parent a165461d

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

+1 −1
Original line number Diff line number Diff line
@@ -3503,7 +3503,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
        $return = $this->getProjectGrantService()->getPCRUService()->getPreview($activity);



        $return['contratSignedType'] = $this->getOscarConfigurationService()

            ->getOptionalConfiguration('pcru_contrat_type', "Contrat Version Définitive Signée");

            ->getPcruContractType();



        /** @var ActivityPcruInfos $pcruInfos */

        $pcruInfos = $return['infos'];

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

+5 −4
Original line number Diff line number Diff line
@@ -305,9 +305,10 @@ class ActivityPcruInfos 
    public function toArray(?EntityManager $entityManager = null) :array

    {

        $partenairePrincipal = "";

        if( $this->getIdPartenairePrincipal() && $entityManager ){

            $partenairePrincipal = $entityManager->getRepository(Organization::class)->getOrganizationByCodePCRU($this->getIdPartenairePrincipal());

        }



//        if( $this->getIdPartenairePrincipal() && $entityManager ){

//            $partenairePrincipal = $entityManager->getRepository(Organization::class)->getOrganizationByCodePCRU($this->getIdPartenairePrincipal());

//        }

        $out = [];

        $out['Objet'] = $this->getObjet();

        $out['CodeUniteLabintel'] = $this->getCodeUniteLabintel();
@@ -321,7 +322,7 @@ class ActivityPcruInfos 
        $out['EmployeurResponsableScientifique'] = $this->getEmployeurResponsableScientifique();

        $out['CoordinateurConsortium'] = $this->isCoordinateurConsortium() ? 'True' : 'False';

        $out['Partenaires'] = $this->getPartenaires();

        $out['PartenairePrincipal'] = $partenairePrincipal;

        $out['PartenairePrincipal'] = $this->getPartenairePrincipal();

        $out['IdPartenairePrincipal'] = $this->getIdPartenairePrincipal();

        $out['SourceFinancement'] = $this->getSourceFinancement() ? $this->getSourceFinancement()->getLabel() : "";

        $out['LieuExecution'] = $this->getLieuExecution();

module/Oscar/src/Oscar/Hydrator/ActivityInfosPCRUFormHydrator.php

+7 −1
Original line number Diff line number Diff line
@@ -48,9 +48,15 @@ class ActivityInfosPCRUFormHydrator implements HydratorInterface 
        $object->setEmployeurResponsableScientifique($data["employeurresponsablescientifique"]);

        $object->setCoordinateurConsortium($data["coordinateurconsortium"]);

        $object->setPartenaires($data["partenaires"]);

        $object->setPartenairePrincipal($data["partenaireprincipal"]);

        $partenairePrincipal = "TOTO";

        if( $data['idpartenaireprincipal'] ){

            $partenairePrincipal = $this->projectGrantService->getEntityManager()->getRepository(Organization::class)->getOrganizationByCodePCRU($data['idpartenaireprincipal']);

        }

        $object->setPartenairePrincipal($partenairePrincipal);

        $object->setIdPartenairePrincipal($data["idpartenaireprincipal"]);







        $sourceFinancement = $this->projectGrantService->getPcruSourceFinancementRepository()->findOneByLabel($data['sourcefinancement']);

        $object->setSourceFinancement($sourceFinancement);

module/Oscar/src/Oscar/Utils/PCRUCvsFile.php

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ class PCRUCvsFile 
     */

    public function writeContratsCsv($dest = null)

    {

        $headers = $this->getHeaders();

        if ($dest == null) {

            $dest = $this->pcruService->getOscarConfigurationService()->getPcruContratFile();

        }