Commit ef11a3ca authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.3.5'

parents 0f460c81 db902889

CHANGELOG.md

+7 −0
Original line number Diff line number Diff line 
Journal des modifications

=========================



1.3.5

-----



- Prise en compte du témoin "corrections effectuées" de chaque thèse.

- Mise à jour de la vue Apogée `V_SYGAL_INDIVIDU` : inclusion des co-encadrants (i.e. individus rattachés à une composante fictive 'COE').

- Mise à jour de la vue Apogée `V_SYGAL_THESE` : renommage du témoin "corrections effectuées".



1.3.4 (06/07/2020)

------------------

config/autoload/version.global.php

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
return [

    'unicaen-app' => [

        'app_infos' => [

            'version' => '1.3.4',

            'date' => '06/07/2020',

            'version' => '1.3.5',

            'date' => '09/12/2020',

        ],

    ],

    'comment' => 'Fichier généré le 06/07/2020 à 14:42:53 avec /app/bump-version',

    'comment' => 'Fichier généré le 09/12/2020 à 08:24:41 avec sygal-import-ws/bump-version',

];

dist/SQL/01-tables.sql

+1 −0
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ create table SYGAL_THESE 
    COD_NEG_TRE VARCHAR2(1),

    ETA_RPD_THS VARCHAR2(1),

    CORRECTION_POSSIBLE VARCHAR2(11),

    CORRECTION_EFFECTUEE VARCHAR2(11),

    COD_ANU_PRM_IAE VARCHAR2(20),

    DAT_ABANDON DATE,

    DAT_TRANSFERT_DEP DATE,

dist/SQL/apogee/01-vues-apogee-communes.sql

+97 −84
Original line number Diff line number Diff line
@@ -97,7 +97,8 @@ select distinct 
  and ind.cod_etu is not null         -- oui, oui, ça arrive

union

-- acteurs

  select "SOURCE_ID","TYPE","ID","SUPANN_ID","CIV","LIB_NOM_PAT_IND","LIB_NOM_USU_IND","LIB_PR1_IND","LIB_PR2_IND","LIB_PR3_IND","EMAIL","DATE_NAI_IND","COD_PAY_NAT","LIB_NAT" from (

select "SOURCE_ID","TYPE","ID","SUPANN_ID","CIV","LIB_NOM_PAT_IND","LIB_NOM_USU_IND","LIB_PR1_IND","LIB_PR2_IND","LIB_PR3_IND","EMAIL","DATE_NAI_IND","COD_PAY_NAT","LIB_NAT"

from (

         with acteur as (

             select

                 ths.cod_ths,
@@ -151,6 +152,17 @@ select distinct 
                 null             as tem_rap_recu,

                 case when tjp.cod_roj in ( 'P', 'B', 'A' ) then tjp.cod_roj else null end as cod_roj_compl

             from ths_jur_per tjp

             union

             select

                 null             as cod_ths,

                 'B'              as cod_roj,

                 pic.cod_per,

                 null             as cod_etb,

                 null             as cod_cps,

                 null             as tem_rap_recu,

                 null             as cod_roj_compl

             from per_intervenir_cmp pic

             where pic.cod_cmp = 'COE' -- composante fictive associee aux co-encadrants

         )

         select distinct

             'apogee'                                                                                                as source_id,
@@ -276,7 +288,8 @@ select 
    decode(ths.eta_rpd_ths,

           'N', 'obligatoire',

           'C', 'facultative',

           null) as correction_possible                    -- Témoin de corrections attendues

           null) as correction_possible,              -- Témoin de corrections attendues

    ths.tem_cor_ths as correction_effectuee           -- Témoin de corrections effectuees



from inscription_administrative iae

         join individu                   ind on ind.cod_ind = iae.cod_ind

dist/SQL/physalis/01-vues-physalis-communes.sql

+2 −0
Original line number Diff line number Diff line
@@ -620,6 +620,7 @@ WHERE A_COT.ASS_CODE = 'D_LAB_THESE' 
        ecole_doct_id,

        COD_NEG_TRE,

        CORRECTION_POSSIBLE,

        CORRECTION_EFFECTUEE,

        DAT_AUT_SOU_THS,

        LIB_ETB_COT,

        LIB_PAY,
@@ -662,6 +663,7 @@ FROM 
        etab_cot1.c_structure AS ecole_doct_id,

        '' AS COD_NEG_TRE,

     null AS CORRECTION_POSSIBLE,

     null AS CORRECTION_EFFECTUEE,

        th.DATE_PREV_SOUTENANCE AS DAT_AUT_SOU_THS,

        cot.NOM_ETABLISSEMENT_COTUTELLE as LIB_ETB_COT,

        cot.PAYS_COTUTELLE AS LIB_PAY,