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

Fix : Erreur dans la récupération des données PCRU

parent dc933a20

dockerize/README.md

+12 −0
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ Enjoy 


# Dev



```bash

# Copier les données de prod dans la VM

pg_dump --clean --no-owner -h url.postgresql.ext -U user_login database > local/dev/postgresql/install-oscar.sql

```



```shell

#Stopper tous les containers

docker stop $(docker ps -a -q)
@@ -67,3 +72,10 @@ docker rm $(docker ps -a -q) 
#Supprimer les images Docker

docker rmi $(docker images -q)

```



## Proxy



> **PROXY** :

> Pour le service *Docker*, il faut configurer le proxy dans le fichier `/etc/systemd/system/docker.service.d/http-proxy.conf`

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

+1 −0
Original line number Diff line number Diff line
@@ -3251,6 +3251,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");

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

+0 −3
Original line number Diff line number Diff line
@@ -461,7 +461,6 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
        $pcruInfos = $this->getPcruInfosActivity($activity);

        $preview = false;





        if (!$pcruInfos) {

            $preview = true;

            $factory = new ActivityPcruInfoFromActivityFactory(
@@ -486,10 +485,8 @@ class PCRUService implements UseLoggerService, UseOscarConfigurationService, Use 
        $validatorPartner = new PCRUPartnerValidator();

        foreach ($activity->getOrganizationsWithOneRoleIn($this->getOscarConfigurationService()->getPcruPartnerRoles()) as $partner) {

            if( !$validatorPartner->isValid($partner) ){

                var_dump($partner->getCodePCRU());

                $msg = implode(',', $validatorPartner->getMessages());

                $pcruInfos->addError(sprintf($msg, $partner));

                die();

            }

        }

module/Oscar/view/oscar/project-grant/show.phtml

+0 −5
Original line number Diff line number Diff line
@@ -416,11 +416,6 @@ 
        </div>



        <div class="col-md-4">

            <pre>

                <?php

                var_dump($pcruEnabled)

                ?>

            </pre>

            <?php

            // -------------------------------------------------------------------------------------------------- PCRU

            if ($pcruEnabled && $this->grant()->privilege(\Oscar\Provider\Privileges::ACTIVITY_PCRU, $entity)):?>