Commit e1b9daab authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Ajout de l'option "Uniquement en cas de nationalité étrangère" pour les pièces jointes par statut

parent 843db6ac

data/ddl/package/UNICAEN_TBL/body.sql

+713 −327

File changed.

Preview size limit exceeded, changes collapsed.

data/ddl/table/TYPE_PIECE_JOINTE_STATUT.php

+12 −0
Changes for data/ddl/table/TYPE_PIECE_JOINTE_STATUT.php: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -141,6 +141,18 @@ return [ 
            'position'    => 1,

            'commentaire' => NULL,

        ],

        'NATIONALITE_ETRANGERE' => [

            'name'        => 'NATIONALITE_ETRANGERE',

            'type'        => 'bool',

            'bdd-type'    => 'NUMBER',

            'length'      => 0,

            'scale'       => '0',

            'precision'   => 1,

            'nullable'    => FALSE,

            'default'     => '0',

            'position'    => 19,

            'commentaire' => NULL,

        ],

        'NUM_REGLE'             => [

            'name'        => 'NUM_REGLE',

            'type'        => 'int',

data/ddl/unique-constraint/EMPLOYEUR_SOURCE_UN.php

+1 −1
Changes for data/ddl/unique-constraint/EMPLOYEUR_SOURCE_UN.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
return [

    'name'    => 'EMPLOYEUR_SOURCE_UN',

    'table'   => 'EMPLOYEUR',

    'index'   => 'EMPLOYEUR_SOURCE_UN',

    'index'   => NULL,

    'columns' => [

        'SOURCE_CODE',

        'HISTO_DESTRUCTION',

data/ddl/view/V_TBL_PIECE_JOINTE_DEMANDE.sql

+10 −1
Changes for data/ddl/view/V_TBL_PIECE_JOINTE_DEMANDE.sql: 10 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -70,7 +70,16 @@ WHERE i.histo_destruction IS NULL 
                       THEN 0

                   ELSE 1 END

          END = 1



   -- Demandé uniquement si nationalité étrangère

   AND CASE

  		WHEN tpjs.nationalite_etrangere = 0 OR d.id IS null

			THEN 1

		ELSE CASE

				WHEN

					d.pays_nationalite_id = (SELECT MAX(id) FROM pays p WHERE libelle IN ('France','FRANCE') AND histo_destruction IS NULL GROUP BY id)

				THEN 0

				ELSE 1 END

			END = 1

  -- Filtre FC

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

GROUP BY i.annee_id,

data/ddl_columns_pos.php

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

        'ANNEE_ID',

        'NUM_REGLE',

        'NATIONALITE_ETRANGERE',

    ],

    'TYPE_RESSOURCE'                 => [

        'ID',
@@ -2223,6 +2224,54 @@ return [ 
        'HISTO_DESTRUCTION',

        'HISTO_DESTRUCTEUR_ID',

    ],

    'MODELE_CONTRAT'                 => [

        'ID',

        'LIBELLE',

        'STATUT_ID',

        'STRUCTURE_ID',

        'FICHIER',

        'REQUETE',

        'BLOC1_NOM',

        'BLOC1_ZONE',

        'BLOC1_REQUETE',

        'BLOC2_NOM',

        'BLOC2_ZONE',

        'BLOC2_REQUETE',

        'BLOC3_NOM',

        'BLOC3_ZONE',

        'BLOC3_REQUETE',

        'BLOC4_NOM',

        'BLOC4_ZONE',

        'BLOC4_REQUETE',

        'BLOC5_NOM',

        'BLOC5_ZONE',

        'BLOC5_REQUETE',

        'BLOC6_NOM',

        'BLOC6_ZONE',

        'BLOC6_REQUETE',

        'BLOC7_NOM',

        'BLOC7_ZONE',

        'BLOC7_REQUETE',

        'BLOC8_NOM',

        'BLOC8_ZONE',

        'BLOC8_REQUETE',

        'BLOC9_NOM',

        'BLOC9_ZONE',

        'BLOC9_REQUETE',

        'BLOC10_NOM',

        'BLOC10_ZONE',

        'BLOC10_REQUETE',

    ],

    'SAVE_V17_STATUT'                => [

        'ANNEE_ID',

        'INTERVENANT_ID',

        'STATUT_CODE',

    ],

    'TEST_INTERVENANT'               => [

        'INTERVENANT_ID',

        'STATUT_CODE',

        'STATUT_DOSSIER_CODE',

    ],

];



//@formatter:on