Commit 5b4dcaaa authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/master'

parents 7106d82a a52e2c7c

data/ddl/table/STATUT.php

+24 −0
Original line number Diff line number Diff line
@@ -693,6 +693,18 @@ return [ 
            'position'    => 83,

            'commentaire' => NULL,

        ],

        'MISSION_EDITION'                => [

            'name'        => 'MISSION_EDITION',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => '0',

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 89,

            'commentaire' => NULL,

        ],

        'MISSION_REALISE_EDITION'        => [

            'name'        => 'MISSION_REALISE_EDITION',

            'type'        => 'bool',
@@ -705,6 +717,18 @@ return [ 
            'position'    => 84,

            'commentaire' => NULL,

        ],

        'MISSION_VISUALISATION'          => [

            'name'        => 'MISSION_VISUALISATION',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => '0',

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '1',

            'position'    => 88,

            'commentaire' => NULL,

        ],

        'MODIF_SERVICE_DU'               => [

            'name'        => 'MODIF_SERVICE_DU',

            'type'        => 'bool',

data/ddl_columns_pos.php

+2 −0
Original line number Diff line number Diff line
@@ -1311,6 +1311,8 @@ return [ 
        'TAUX_REMU_ID',

        'DOSSIER_STATUT',

        'OFFRE_EMPLOI_POSTULER',

        'MISSION_VISUALISATION',

        'MISSION_EDITION',

    ],

    'STRUCTURE'                      => [

        'ID',

module/Intervenant/src/Entity/Db/Mapping/Intervenant.Entity.Db.Statut.dcm.xml

+2 −0
Original line number Diff line number Diff line
@@ -87,6 +87,8 @@ 
        <field name="referentielRealiseEdition" type="boolean" column="REFERENTIEL_REALISE_EDITION" nullable="false"/>



        <field name="mission" type="boolean" column="MISSION" nullable="false"/>

        <field name="missionVisualisation" type="boolean" column="MISSION_VISUALISATION" nullable="false"/>

        <field name="missionEdition" type="boolean" column="MISSION_EDITION" nullable="false"/>

        <field name="missionRealiseEdition" type="boolean" column="MISSION_REALISE_EDITION" nullable="false"/>

        <field name="offreEmploiPostuler" type="boolean" column="OFFRE_EMPLOI_POSTULER" nullable="false"/>

module/Intervenant/src/Entity/Db/Statut.php

+3 −0
Original line number Diff line number Diff line
@@ -1557,6 +1557,9 @@ class Statut implements ParametreEntityInterface, RoleInterface, ResourceInterfa 
            Privileges::MISE_EN_PAIEMENT_VISUALISATION_INTERVENANT => $this->paiementVisualisation,

            Privileges::CLOTURE_CLOTURE                            => $this->cloture && ($this->serviceRealiseEdition || $this->referentielRealiseEdition),

            Privileges::CONTRAT_CONTRAT_GENERATION                 => $this->contrat && $this->contratGeneration,

            Privileges::MISSION_VISUALISATION                      => $this->mission && $this->missionVisualisation,

            Privileges::MISSION_EDITION                            => $this->mission && $this->missionEdition,

            Privileges::MISSION_EDITION_REALISE                    => $this->mission && $this->missionRealiseEdition,

            Privileges::MISSION_OFFRE_EMPLOI_POSTULER              => $this->offreEmploiPostuler,

        ];

module/Intervenant/src/Form/StatutSaisieForm.php

+4 −6
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class StatutSaisieForm extends AbstractForm 
            'tauxRemu'                      => 'Taux de rémunération',

            'typeIntervenant'               => 'Type d\'intervenant',

            'mission'                       => 'Visualisation/Modification de mission',

            'missionRealise'                => 'Saisie du réalisé',

            'missionRealise'                => 'Suivi de mission',

            'offreEmploiPostuler'           => 'Postuler à une offre d\'emploi',

        ];
@@ -164,15 +164,13 @@ class StatutSaisieForm extends AbstractForm 
            'name'     => 'missionRealise',

            'options'  => [

                'value_options' => [

                    'desactive' => 'Désactivé',

                    //'active'        => 'Activé mais non visible par l\'intervenant',

                    //'visualisation' => 'Activé et visible par l\'intervenant',

                    'edition'   => 'Activé et modifiable par l\'intervenant',

                    'visualisation' => 'Visible par l\'intervenant',

                    'edition'       => 'Modifiable par l\'intervenant',

                ],

            ],

            'hydrator' => [

                'getter' => function (Statut $statut, string $name) {

                    $real = $statut->getMissionRealiseEdition() ? 'edition' : 'desactive';

                    $real = $statut->getMissionRealiseEdition() ? 'edition' : 'visualisation';



                    return $real;

                },