Commit 01fa0585 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'b14' of https://git.unicaen.fr/open-source/OSE into b14

parents a55b6532 64159ca9

data/ddl/view/V_INDICATEUR_340.sql

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ FROM 
  tbl_service s

  JOIN tbl_workflow w ON w.intervenant_id = s.intervenant_id AND w.structure_id = s.structure_id

WHERE

  s.type_intervenant_code = 'V'

  s.type_intervenant_code = 'E'

  AND s.type_volume_horaire_code = 'PREVU'

  AND nbvh <> valide

  AND w.etape_code = 'CONTRAT'

data/privileges.php

+9 −8
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ return [ 
            'suppression'            => 'Suppression',

            'statut-edition'         => 'Statuts (Édition)',

            'statut-visualisation'   => 'Statuts (Visualisation)',

            'regles-validation-type' => 'Règles validation par type intervenant',

        ],

    ],

module/Application/config/intervenant.config.php

+11 −11
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ return [ 
                                     'validation-volume-horaire-type-intervenant-delete',

                    ],

                    'privileges' => [

                        Privileges::MODIF_SERVICE_DU_EDITION,

                        Privileges::INTERVENANT_REGLES_VALIDATION_TYPE,

                    ],

                ],

            ],

module/Application/src/Application/Provider/Privilege/Privileges.php

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class Privileges extends \UnicaenAuth\Provider\Privilege\Privileges 
    const INTERVENANT_RECHERCHE                               = 'intervenant-recherche';

    const INTERVENANT_STATUT_EDITION                          = 'intervenant-statut-edition';

    const INTERVENANT_STATUT_VISUALISATION                    = 'intervenant-statut-visualisation';

    const INTERVENANT_REGLES_VALIDATION_TYPE                  = 'intervenant-regles-validation-type';

    const INTERVENANT_SUPPRESSION                             = 'intervenant-suppression';

    const MISE_EN_PAIEMENT_DEMANDE                            = 'mise-en-paiement-demande';

    const MISE_EN_PAIEMENT_EDITION                            = 'mise-en-paiement-edition';

module/Application/src/Application/Validator/NumeroINSEEValidator.php

+2 −2
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ class NumeroINSEEValidator extends NumeroINSEE 


        $this->provisoire = $this->getProvisoire();



        $this->civilite = (!empty($context['civilite'])) ?

        /*$this->civilite = (!empty($context['civilite'])) ?

            $this->getServiceCivilite()->get((int)$context['civilite']) : null;



        if ($this->civilite && !$this->isValidCivilite()) return false;

        if ($this->civilite && !$this->isValidCivilite()) return false;*/



        $this->dateNaissance = (!empty($context['dateNaissance'])) ?

            \DateTime::createFromFormat(Constants::DATE_FORMAT, $context['dateNaissance']) : null;