Commit 6a506066 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Travaux en cours

parent 7b059e6b

databases_maintenance/migration_data_backup.json

0 → 100644
+1854 −0

File added.

Preview size limit exceeded, changes collapsed.

install/datas/fr-esr-repertoire-national-structures-recherche.csv

0 → 100644
+11416 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −2
Original line number Diff line number Diff line
@@ -2851,8 +2851,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif 
        $activity = $this->getActivityFromRoute();



        if( $this->params()->fromQuery("a") == "beta" ){

            $form = new ActivityInfosPcruForm();

            $form->setHydrator(new ActivityInfosPCRUFormHydrator());

            $form = new ActivityInfosPcruForm($this->getProjectGrantService(), $activity);

            $preview = $this->getProjectGrantService()->getPCRUService()->getPreview($activity);

            $form->init();

            $form->bind($preview['infos']);

module/Oscar/src/Oscar/Entity/PcruTypeContractRepository.php

+3 −1
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ class PcruTypeContractRepository extends EntityRepository 
    public function getPcruContractForActivityTypeChained( ActivityType $activityType) : ?PcruTypeContract

    {

        $labelPcru = $this->getPcruContractByActivityType($activityType);



        if( $labelPcru == null ){

            $typeChain = $this->getEntityManager()->getRepository(ActivityType::class)->getChainFromActivityType($activityType);

            foreach ($typeChain as $type) {
@@ -89,6 +90,7 @@ class PcruTypeContractRepository extends EntityRepository 
                }

            }

        }

        return null;



        return $labelPcru;

    }

}
 
 No newline at end of file

module/Oscar/src/Oscar/Entity/Person.php

+5 −0
Original line number Diff line number Diff line
@@ -494,6 +494,11 @@ class Person implements ResourceInterface 
        return $this->firstname;

    }



    public function getFullname()

    {

        return $this->getFirstname() . ' ' . $this->getLastname();

    }



    /**

     * @param string $firstname

     */