Commit 950cef4e authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'refs/heads/b24'

parents 5937fbc3 1f7fbe18

data/ddl/table/TYPE_PIECE_JOINTE_STATUT.php

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ return [ 
            'position'    => 12,

            'commentaire' => NULL,

        ],

        'FA'                    => [

            'name'        => 'FA',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 20,

            'commentaire' => NULL,

        ],

        'HISTO_CREATEUR_ID'     => [

            'name'        => 'HISTO_CREATEUR_ID',

            'type'        => 'int',

data/ddl/view/V_TBL_PIECE_JOINTE_DEMANDE.sql

+4 −2
Original line number Diff line number Diff line
@@ -4,8 +4,8 @@ WITH i_h AS ( 
    s.intervenant_id,

    SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NULL THEN vh.heures ELSE 0 END) heures,

    SUM(CASE WHEN vh.MOTIF_NON_PAIEMENT_ID IS NOT NULL THEN vh.heures ELSE 0 END) heures_non_payables,

    --SUM(ep.taux_fc) fc

    SUM(CASE WHEN ep.taux_fc > 0 THEN vh.heures ELSE 0 END) fc

    SUM(CASE WHEN ep.taux_fc > 0 THEN vh.heures ELSE 0 END) fc,

    SUM(CASE WHEN ep.taux_fa > 0 THEN vh.heures ELSE 0 END) fa

  FROM

         service               s

    JOIN type_volume_horaire tvh ON tvh.code = 'PREVU'
@@ -82,6 +82,8 @@ WHERE i.histo_destruction IS NULL 
      END = 1

  -- Filtre FC

  AND (tpjs.fc = 0 OR i_h.fc > 0)

-- Filtre FA

  AND (tpjs.fa = 0 OR i_h.fa > 0)

GROUP BY i.annee_id,

         i.id,

         i.code,

module/PieceJointe/src/Entity/Db/Mapping/PieceJointe.Entity.Db.TypePieceJointeStatut.dcm.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
        <field name="nationaliteEtrangere" type="boolean" column="NATIONALITE_ETRANGERE" nullable="false"/>



        <field name="fc" type="boolean" column="FC" nullable="false"/>

        <field name="fa" type="boolean" column="FA" nullable="false"/>

        <field name="dureeVie" type="integer" column="DUREE_VIE" nullable="false"/>

        <field name="numRegle" type="integer" column="NUM_REGLE" nullable="false"/>

        <field name="obligatoireHNP" type="boolean" column="OBLIGATOIRE_HNP" nullable="false"/>

module/PieceJointe/src/Entity/Db/TypePieceJointeStatut.php

+28 −9
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ class TypePieceJointeStatut implements ParametreEntityInterface 


    private bool $fc = false;



    private bool $fa = false;



    private bool $changementRIB = false;



    private bool $nationaliteEtrangere = false;
@@ -82,6 +84,21 @@ class TypePieceJointeStatut implements ParametreEntityInterface 






    public function getFa(): bool

    {

        return $this->fa;

    }







    public function setFa(bool $fa): TypePieceJointeStatut

    {

        $this->fa = $fa;



        return $this;

    }





    public function getChangementRIB(): bool

    {

        return $this->changementRIB;
@@ -191,6 +208,7 @@ class TypePieceJointeStatut implements ParametreEntityInterface 
        $txt = $this->getObligatoire() ? 'Obl' : 'Fac';

        if ($this->getSeuilHetd()) $txt .= ' >' . $this->getSeuilHetd();

        if ($this->getFc()) $txt .= ' FC ';

        if ($this->getFa()) $txt .= ' FA ';

        if ($this->getChangementRIB()) $txt .= ' RIB';

        if ($this->isNationaliteEtrangere()) $txt .= ' Etr';

        if ($this->getDureeVie() && $this->getDureeVie() > 1) $txt .= ' ' . $this->getDureeVie() . 'ans';
@@ -210,6 +228,7 @@ class TypePieceJointeStatut implements ParametreEntityInterface 
        $t[] = $this->getObligatoire() ? 'Pièce obligatoire' : 'Pièce facultative';

        if ($this->getSeuilHetd()) $t[] = 'À partir de ' . $this->getSeuilHetd() . ' heures';

        if ($this->getFc()) $t[] = 'Uniquement avec des enseignements en Formation Continue';

        if ($this->getFa()) $t[] = 'Uniquement avec des enseignements en Formation Apprentissage';

        if ($this->getChangementRIB()) $t[] = 'Uniquement si le RIB a changé';

        if ($this->isNationaliteEtrangere()) $t[] = 'Uniquement si nationalité étrangère';

        if ($this->getDureeVie()) $t[] = 'Redemander la pièce tous les ' . $this->getDureeVie() . ' an(s)';

module/PieceJointe/src/Form/ModifierTypePieceJointeStatutForm.php

+10 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ class ModifierTypePieceJointeStatutForm extends AbstractForm 
            'type'    => 'Checkbox',

        ]);



        $this->add([

                       'name'    => 'fa',

                       'options' => [

                           'label' => 'Limité aux actions de formation apprentissage',

                       ],

                       'type'    => 'Checkbox',

                   ]);

        $this->add([

            'type'       => 'Number',

            'name'       => 'duree-vie',
@@ -147,6 +154,9 @@ class ModifierTypePieceJointeStatutForm extends AbstractForm 
            'fc'              => [

                'required' => true,

            ],

            'fa' => [

                'required' => true,

            ],

            'obligatoire-hnp' => [

                'required' => true,

            ],