Skip to content
Snippets Groups Projects
Commit fdff1429 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.3.3' into develop

parents 977792c1 ecb35483
No related branches found
No related tags found
No related merge requests found
Pipeline #7004 passed
......@@ -70,6 +70,8 @@ create table SYGAL_FINANCEMENT
QUOTITE_FINANCEMENT NUMBER(3),
DATE_DEBUT_FINANCEMENT DATE,
DATE_FIN_FINANCEMENT DATE,
CODE_TYPE_FINANCEMENT varchar2(8),
LIBELLE_TYPE_FINANCEMENT varchar2(100),
SOURCE_INSERT_DATE DATE default sysdate not null
)
/
......
......@@ -668,6 +668,8 @@ with inscription_admin as (
'apogee' as source_id,
tfi.cod_ths as these_id,
min ( nvl ( tfi.cod_anu, iae.cod_anu_prm_iae ) ) as annee_id, -- Identifiant de l annee universitaire (ex. 2018 pour 2018/2019)
min ( tfi.cod_afi ) keep ( dense_rank first order by tfi.cod_ths, tfi.cod_ofi, tfi.quotite_tfi ) as code_type_financement,
min ( afi.lib_afi ) keep ( dense_rank first order by tfi.cod_ths, tfi.cod_ofi, tfi.quotite_tfi ) as libelle_type_financement,
tfi.cod_ofi as origine_financement_id,
listagg ( tfi.compl_tfi, ' / ' ) within group ( order by tfi.cod_ths, tfi.cod_ofi, tfi.quotite_tfi, nvl ( tfi.cod_anu, iae.cod_anu_prm_iae ), tfi.cod_seq_tfi ) as complement_financement,
tfi.quotite_tfi as quotite_financement,
......@@ -677,6 +679,7 @@ with inscription_admin as (
join these_hdr_sout ths on ths.cod_ind = iae.cod_ind and ths.cod_dip = iae.cod_dip and ths.cod_vrs_vdi = iae.cod_vrs_vdi
join ths_financement tfi on tfi.cod_ths = ths.cod_ths
join origine_financement ofi on ofi.cod_ofi = tfi.cod_ofi
left join aide_financiere afi on afi.cod_afi = tfi.cod_afi
where ths.cod_ths_trv = '1' -- Exclusion des travaux
and ofi.tem_en_sve_ofi = 'O' -- Exclusion des anciens codes des origines de financements
group by
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment