Commit b8195c54 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Détection des prolongations pour les avenants, indépendamment des volumes horaires

parent 5796298d

data/ddl/table/TBL_CONTRAT.php

+14 −2
Changes for data/ddl/table/TBL_CONTRAT.php: 14 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ return [ 
            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'nullable'    => FALSE,

            'default'     => NULL,

            'position'    => 12,

            'commentaire' => NULL,
@@ -136,7 +136,7 @@ return [ 
            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => TRUE,

            'nullable'    => FALSE,

            'default'     => NULL,

            'position'    => 13,

            'commentaire' => NULL,
@@ -237,6 +237,18 @@ return [ 
            'position'    => 42,

            'commentaire' => NULL,

        ],

        'PROLONGATION'                     => [

            'name'        => 'PROLONGATION',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => NULL,

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 10,

            'commentaire' => NULL,

        ],

        'SERVICE_ID'                => [

            'name'        => 'SERVICE_ID',

            'type'        => 'int',

data/ddl/view/V_CONTRAT_MAIN.sql

+1 −0
Changes for data/ddl/view/V_CONTRAT_MAIN.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -93,6 +93,7 @@ SELECT 
    AND tc.volume_horaire_ref_id IS NULL

    AND tc.volume_horaire_mission_id IS NULL

  THEN 1 ELSE 0 END                                                                     "sansHeure",

  tc.prolongation                                                                       "prolongation",





  -- Données portant sur les heures

data/ddl_columns_pos.php

+1 −0
Changes for data/ddl_columns_pos.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -1496,6 +1496,7 @@ return [ 
        'CONTRAT_ID',

        'CONTRAT_PARENT_ID',

        'TYPE_CONTRAT_ID',

        'PROLONGATION',

        'EDITE',

        'SIGNE',

        'DATE_DEBUT',

module/Administration/src/Migration/v24Contrats.php

+1 −1
Changes for module/Administration/src/Migration/v24Contrats.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class v24Contrats extends MigrationAction 


    public function utile(): bool

    {

        return $this->manager()->hasNewColumn('TBL_CONTRAT', 'AUTRES_LIBELLES');

        return $this->manager()->hasNewColumn('TBL_CONTRAT', 'PROLONGATION');

    }

module/Contrat/src/Entity/Db/Mapping/Contrat.Entity.Db.TblContrat.dcm.xml

+1 −0
Changes for module/Contrat/src/Entity/Db/Mapping/Contrat.Entity.Db.TblContrat.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
            <join-column name="CONTRAT_PARENT_ID" referenced-column-name="ID"/>

        </many-to-one>

        <field name="numeroAvenant" type="integer" column="NUMERO_AVENANT" nullable="false"/>

        <field name="prolongation" type="boolean" column="PROLONGATION" nullable="false"/>

        <field name="edite" type="boolean" column="EDITE" nullable="false"/>

        <field name="signe" type="boolean" column="SIGNE" nullable="false"/>

        <field name="termine" type="boolean" column="TERMINE" nullable="false"/>