Commit 03175fc8 authored by Stephane Bouvry's avatar Stephane Bouvry
Browse files

Ajout des organisations centrales 

 -> Permet de proposer les membres de ces organisations comme observateur des étapes de signature
 -> Permet d'utiliser l'option membres de la DRI (à Caen)
parent 4a36388b

module/Oscar/config/module.config.php

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ return array( 
                        'logs',

                        'messages',

                        'motscles',

                        'organizationCentrale',

                        'organizationRole',

                        'organizationRoleApi',

                        'organizationType',

module/Oscar/config/routes.yml

+8 −0
Original line number Diff line number Diff line
@@ -2048,6 +2048,14 @@ administration: 
        defaults:

          action: motscles



    organization-centrale:

      type: segment

      may_terminate: true

      options:

        route: /organization-centrale

        defaults:

          action: organizationCentrale



    tva:

      type: segment

      may_terminate: true

module/Oscar/src/Oscar/Controller/AdministrationController.php

+200 −175

File changed.

Preview size limit exceeded, changes collapsed.

module/Oscar/src/Oscar/Entity/OrganizationRepository.php

+12 −0
Original line number Diff line number Diff line
@@ -373,4 +373,16 @@ class OrganizationRepository extends EntityRepository implements IConnectedRepos 
        $result = $qb->getQuery()->getResult();

        return array_column($result, 'id');

    }



    /**

     * @param array $ids

     * @return Organization[]

     */

    public function getOrganisationsByIds(array $ids):array

    {

        $qb = $this->createQueryBuilder('o')

            ->where('o.id IN(:ids)');

        $qb->setParameter('ids', $ids);

        return $qb->getQuery()->getResult();

    }

}

module/Oscar/src/Oscar/Service/OscarConfigurationService.php

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ class OscarConfigurationService implements ServiceLocatorAwareInterface 


    public function getOrganisationCentral(): array

    {

        return $this->getEditableConfKey('organisationCentral', []);

        return $this->getEditableConfKey('organizations_central', []);

    }



    public function setHighDelayRelance($value)