Commit 2bc32aec authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Fix : Bug de récupération du Responsable scientifique

parent 35f7e2c0

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

+0 −16
Changes for module/Oscar/src/Oscar/Controller/ProjectGrantController.php: 0 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -2809,22 +2809,6 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
        $datas = $pcruInfos->toArray();

        $validation = $pcruInfos->validation();



//        $form = new PcruInfosForm();

//        $form->setServiceContainer($this->getServiceContainer());

//        $form->setHydrator(new PcruInfosFormHydrator());

//        $form->init();

//

//        // Récupération des informations

//        if( $activity->getPcruInfo() ){

//            $pcruInfos = $activity->getPcruInfo();

//        } else {

//            $factory = new ActivityPcruInfoFromActivityFactory($this->getOscarConfigurationService(), $this->getEntityManager());

//            $pcruInfos = $factory->createNew($activity);

//        }

//

//        // Formulaire

//        $form->bind($pcruInfos);



        return [

            //'form' => $form,

            'validations' => $validation,

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

+1 −0
Changes for module/Oscar/src/Oscar/Entity/ActivityPcruInfos.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ class ActivityPcruInfos 


        if( $datas['ValidePoleCompetivite'] == true ){

            $out['ValidePoleCompetivite'] = self::VALIDATION_VALID;

            $out['PoleCompetivite'] = self::VALIDATION_ERROR;

            if( $out['PoleCompetivite'] ){

                $out['PoleCompetivite'] = self::VALIDATION_VALID;

            }

module/Oscar/src/Oscar/Factory/ActivityPcruInfoFromActivityFactory.php

+1 −1
Changes for module/Oscar/src/Oscar/Factory/ActivityPcruInfoFromActivityFactory.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ class ActivityPcruInfoFromActivityFactory 
        }



        // Recherche automatique du responsable scientifique

        $roleRSToFind = $this->oscarConfigurationService->getOptionalConfiguration('pcru_respscien_role', 'Responsable scientifique');

        $roleRSToFind = $this->oscarConfigurationService->getOptionalConfiguration('pcru_respscien_role', 'Responsable Scientifique');

        $responsable = "";



        /** @var ActivityPerson $personActivity */