Commit 6b988992 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Prise en compte des missions pour les CCActivite

parent e1082e2e

data/ddl/table/CC_ACTIVITE.php

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

            'commentaire' => NULL,

        ],

        'MISSION'               => [

            'name'        => 'MISSION',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => '0',

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '1',

            'position'    => 15,

            'commentaire' => NULL,

        ],

        'REFERENTIEL'           => [

            'name'        => 'REFERENTIEL',

            'type'        => 'bool',

data/ddl_columns_pos.php

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ return [ 
        'HISTO_MODIFICATEUR_ID',

        'HISTO_DESTRUCTION',

        'HISTO_DESTRUCTEUR_ID',

        'MISSION',

    ],

    'CENTRE_COUT'                    => [

        'ID',

data/nomenclatures.php

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ return [ 
            "FC"          => false,

            "FC_MAJOREES" => false,

            "REFERENTIEL" => true,

            "MISSION"     => false,

        ],

        [

            'ID'          => 2,
@@ -52,6 +53,7 @@ return [ 
            "FC"          => true,

            "FC_MAJOREES" => true,

            "REFERENTIEL" => false,

            "MISSION"     => false,

        ],

        [

            'ID'          => 3,
@@ -62,6 +64,7 @@ return [ 
            "FC"          => true,

            "FC_MAJOREES" => true,

            "REFERENTIEL" => false,

            "MISSION"     => true,

        ],

    ],

module/Paiement/src/Entity/Db/CcActivite.php

+32 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ class CcActivite implements HistoriqueAwareInterface 
     */

    private $referentiel;



    /**

     * @var boolean

     */

    private $mission;



    /**

     * @var integer

     */
@@ -261,6 +266,31 @@ class CcActivite implements HistoriqueAwareInterface 






    /**

     * Get mission

     *

     * @return boolean

     */

    public function getMission()

    {

        return $this->mission;

    }





    /**

     * Set mission

     *

     * @param boolean $mission

     *

     * @return CcActivite

     */

    public function setMission($mission)

    {

        $this->mission = $mission;



        return $this;

    }



    /**

     * Get id

     *
@@ -294,6 +324,8 @@ class CcActivite implements HistoriqueAwareInterface 
                return $this->getFcMajorees();

            case TypeHeures::REFERENTIEL:

                return $this->getReferentiel();

            case TypeHeures::MISSION:

                return $this->getMission();

        }



        return false;

module/Paiement/src/Entity/Db/Mapping/Paiement.Entity.Db.CcActivite.dcm.xml

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
    <field name="histoModification" type="datetime" column="HISTO_MODIFICATION" nullable="false"/>

    <field name="libelle" type="string" column="LIBELLE" length="200" nullable="false"/>

    <field name="referentiel" type="boolean" column="REFERENTIEL" nullable="false"/>

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

    <many-to-one field="histoModificateur" target-entity="Application\Entity\Db\Utilisateur">

      <join-columns>

        <join-column name="HISTO_MODIFICATEUR_ID" referenced-column-name="ID"/>