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

Rétablissement de la possibilité d'importer les origines de financement

parent 3070ea24
No related branches found
No related tags found
No related merge requests found
Pipeline #9342 passed
Stage: test
Show whitespace changes
Inline Side-by-side
README.md
+ 1
− 0
View file @ d086780f
...@@ -63,6 +63,7 @@ Chaque vue en base de données peut être interrogée via un service dédié : ...@@ -63,6 +63,7 @@ Chaque vue en base de données peut être interrogée via un service dédié :
* `/these-annee-univ` * `/these-annee-univ`
* `/role` * `/role`
* `/acteur` * `/acteur`
* `/origine-financement`
* `/financement` * `/financement`
* `/titre-acces` * `/titre-acces`
* `/variable` * `/variable`
......
dist/SQL/apogee/01-vues-apogee-communes.sql
+ 0
− 39
View file @ d086780f
...@@ -701,45 +701,6 @@ group by ...@@ -701,45 +701,6 @@ group by
tfi.quotite_tfi tfi.quotite_tfi
/ /
create view V_SYGAL_ORIGINE_FINANCEMENT as
with tmp(ID, SOURCE_ID, COD_OFI, LIC_OFI, LIB_OFI) as (
select '10', 'apogee', '10', 'SALARIE', 'Etudiant salarié' from dual union all
select '11', 'apogee', '11', 'SANS FIN', 'Sans financement' from dual union all
select '13', 'apogee', '13', 'DOT EPSCP', 'Dotation des EPSCP' from dual union all
select '14', 'apogee', '14', 'DOT EPST', 'Dotation des EPST' from dual union all
select '15', 'apogee', '15', 'POLYTECH', 'Programmes Spé. Normaliens, Polytechnici' from dual union all
select '16', 'apogee', '16', 'HANDICAP', 'Programme Spécifique Handicap' from dual union all
select '17', 'apogee', '17', 'DEFENSE', 'Ministère de la Défense (dont DGA)' from dual union all
select '18', 'apogee', '18', 'AGRICULTUR', 'Ministère de l''Agriculture' from dual union all
select '19', 'apogee', '19', 'AFF ETRANG', 'Ministère des Affaires Etrangères' from dual union all
select '20', 'apogee', '20', 'SANTE', 'Ministère de la Santé' from dual union all
select '21', 'apogee', '21', 'AUTRES MIN', 'Autres Ministères' from dual union all
select '22', 'apogee', '22', 'DOT EPIC', 'Dotation des EPIC' from dual union all
select '23', 'apogee', '23', 'DOT EPA', 'Dotation des EPA' from dual union all
select '24', 'apogee', '24', 'NORMANDIE', 'Région Normandie' from dual union all
select '25', 'apogee', '25', 'AUT COLLEC', 'Autre Collectivité Territoriale' from dual union all
select '26', 'apogee', '26', 'ANR', 'ANR' from dual union all
select '27', 'apogee', '27', 'IDEX', 'IDEX' from dual union all
select '28', 'apogee', '28', 'PIA', 'Autres dispositifs du PIA (dont LABEX)' from dual union all
select '29', 'apogee', '29', 'AUT AFFPR', 'Autres Finan. Pub. d''Agences Françaises' from dual union all
select '30', 'apogee', '30', 'FI PUB PRV', 'Financements Mixtes Public Privé' from dual union all
select '31', 'apogee', '31', 'CIFRE', 'Conventions CIFRE' from dual union all
select '32', 'apogee', '32', 'PART RECH', 'Partenariat de Recherche' from dual union all
select '33', 'apogee', '33', 'MECENAT', 'Mécénat y compris Fondations et Asso.' from dual union all
select '34', 'apogee', '34', 'ERC', 'ERC' from dual union all
select '35', 'apogee', '35', 'MARIE CURI', 'Actions Marie Sklodowska Curie' from dual union all
select '36', 'apogee', '36', 'ERASMUS', 'ERASMUS' from dual union all
select '37', 'apogee', '37', 'AUT PRO EU', 'Autre Programme Européen' from dual union all
select '38', 'apogee', '38', 'GOUV EUROP', 'Gouvernement Etranger Européen' from dual union all
select '39', 'apogee', '39', 'GOUV NON E', 'Gouvernement Etranger Hors Europe' from dual union all
select '40', 'apogee', '40', 'AUT FI ETR', 'Autres Financements Etrangers' from dual union all
select '41', 'apogee', '41', 'ENT ETR', 'Entreprise Etrangère' from dual union all
select '42', 'apogee', '42', 'ORG FC', 'Financements Organismes FC' from dual union all
select '43', 'apogee', '43', 'ORG INTER', 'Organismes Internationaux' from dual
)
select * from tmp
/
create view V_SYGAL_TITRE_ACCES as create view V_SYGAL_TITRE_ACCES as
with inscription_administrative as ( with inscription_administrative as (
select select
......
dist/SQL/apogee/02-vues-apogee-etab.sql
+ 43
− 4
View file @ d086780f
...@@ -12,10 +12,7 @@ ...@@ -12,10 +12,7 @@
-- --
-- --
-- Vue fournissant les "variables d'environnement" requis par SyGAL : -- Vue fournissant les "variables d'environnement" requises.
-- - Adresse mail de l'assistance utilisateur
-- - Adresse mail de contact de la BU
-- - Adresse mail de contact du bureau des doctorats
-- --
create view V_SYGAL_VARIABLE_MANU as create view V_SYGAL_VARIABLE_MANU as
select select
...@@ -65,3 +62,45 @@ create view V_SYGAL_ROLE_TR as ...@@ -65,3 +62,45 @@ create view V_SYGAL_ROLE_TR as
) )
select * from tmp select * from tmp
/ /
--
-- Vues des seules origines de financement à prendre en compte (éventuellement renommées).
--
create view V_SYGAL_ORIGINE_FINANCEMENT as
with tmp(ID, SOURCE_ID, COD_OFI, LIC_OFI, LIB_OFI) as (
select '10', 'apogee', '10', 'SALARIE', 'Etudiant salarié' from dual union all
select '11', 'apogee', '11', 'SANS FIN', 'Sans financement' from dual union all
select '13', 'apogee', '13', 'DOT EPSCP', 'Dotation des EPSCP' from dual union all
select '14', 'apogee', '14', 'DOT EPST', 'Dotation des EPST' from dual union all
select '15', 'apogee', '15', 'POLYTECH', 'Programmes Spé. Normaliens, Polytechnici' from dual union all
select '16', 'apogee', '16', 'HANDICAP', 'Programme Spécifique Handicap' from dual union all
select '17', 'apogee', '17', 'DEFENSE', 'Ministère de la Défense (dont DGA)' from dual union all
select '18', 'apogee', '18', 'AGRICULTUR', 'Ministère de l''Agriculture' from dual union all
select '19', 'apogee', '19', 'AFF ETRANG', 'Ministère des Affaires Etrangères' from dual union all
select '20', 'apogee', '20', 'SANTE', 'Ministère de la Santé' from dual union all
select '21', 'apogee', '21', 'AUTRES MIN', 'Autres Ministères' from dual union all
select '22', 'apogee', '22', 'DOT EPIC', 'Dotation des EPIC' from dual union all
select '23', 'apogee', '23', 'DOT EPA', 'Dotation des EPA' from dual union all
select '24', 'apogee', '24', 'NORMANDIE', 'Région Normandie' from dual union all
select '25', 'apogee', '25', 'AUT COLLEC', 'Autre Collectivité Territoriale' from dual union all
select '26', 'apogee', '26', 'ANR', 'ANR' from dual union all
select '27', 'apogee', '27', 'IDEX', 'IDEX' from dual union all
select '28', 'apogee', '28', 'PIA', 'Autres dispositifs du PIA (dont LABEX)' from dual union all
select '29', 'apogee', '29', 'AUT AFFPR', 'Autres Finan. Pub. d''Agences Françaises' from dual union all
select '30', 'apogee', '30', 'FI PUB PRV', 'Financements Mixtes Public Privé' from dual union all
select '31', 'apogee', '31', 'CIFRE', 'Conventions CIFRE' from dual union all
select '32', 'apogee', '32', 'PART RECH', 'Partenariat de Recherche' from dual union all
select '33', 'apogee', '33', 'MECENAT', 'Mécénat y compris Fondations et Asso.' from dual union all
select '34', 'apogee', '34', 'ERC', 'ERC' from dual union all
select '35', 'apogee', '35', 'MARIE CURI', 'Actions Marie Sklodowska Curie' from dual union all
select '36', 'apogee', '36', 'ERASMUS', 'ERASMUS' from dual union all
select '37', 'apogee', '37', 'AUT PRO EU', 'Autre Programme Européen' from dual union all
select '38', 'apogee', '38', 'GOUV EUROP', 'Gouvernement Etranger Européen' from dual union all
select '39', 'apogee', '39', 'GOUV NON E', 'Gouvernement Etranger Hors Europe' from dual union all
select '40', 'apogee', '40', 'AUT FI ETR', 'Autres Financements Etrangers' from dual union all
select '41', 'apogee', '41', 'ENT ETR', 'Entreprise Etrangère' from dual union all
select '42', 'apogee', '42', 'ORG FC', 'Financements Organismes FC' from dual union all
select '43', 'apogee', '43', 'ORG INTER', 'Organismes Internationaux' from dual
)
select * from tmp
/
dist/SQL/physalis/01-vues-physalis-communes.sql
+ 0
− 41
View file @ d086780f
...@@ -406,47 +406,6 @@ CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_MV_EMAIL" ("LA ...@@ -406,47 +406,6 @@ CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_MV_EMAIL" ("LA
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_ORIGINE_FINANCEMENT" ("ID", "SOURCE_ID", "COD_OFI", "LIC_OFI", "LIB_OFI") AS
with tmp(ID, SOURCE_ID, COD_OFI, LIC_OFI, LIB_OFI) as (
select '10', 'physalis', '10', 'SALARIE', 'Etudiant salarié' from dual union all
select '11', 'physalis', '11', 'SANS FIN', 'Sans financement' from dual union all
select '13', 'physalis', '13', 'DOT EPSCP', 'Dotation des EPSCP' from dual union all
select '14', 'physalis', '14', 'DOT EPST', 'Dotation des EPST' from dual union all
select '15', 'physalis', '15', 'POLYTECH', 'Programmes Spé. Normaliens, Polytechnici' from dual union all
select '16', 'physalis', '16', 'HANDICAP', 'Programme Spécifique Handicap' from dual union all
select '17', 'physalis', '17', 'DEFENSE', 'Ministère de la Défense (dont DGA)' from dual union all
select '18', 'physalis', '18', 'AGRICULTUR', 'Ministère de l''Agriculture' from dual union all
select '19', 'physalis', '19', 'AFF ETRANG', 'Ministère des Affaires Etrangères' from dual union all
select '20', 'physalis', '20', 'SANTE', 'Ministère de la Santé' from dual union all
select '21', 'physalis', '21', 'AUTRES MIN', 'Autres Ministères' from dual union all
select '22', 'physalis', '22', 'DOT EPIC', 'Dotation des EPIC' from dual union all
select '23', 'physalis', '23', 'DOT EPA', 'Dotation des EPA' from dual union all
select '24', 'physalis', '24', 'NORMANDIE', 'Région Normandie' from dual union all
select '25', 'physalis', '25', 'AUT COLLEC', 'Autre Collectivité Territoriale' from dual union all
select '26', 'physalis', '26', 'ANR', 'ANR' from dual union all
select '27', 'physalis', '27', 'IDEX', 'IDEX' from dual union all
select '28', 'physalis', '28', 'PIA', 'Autres dispositifs du PIA (dont LABEX)' from dual union all
select '29', 'physalis', '29', 'AUT AFFPR', 'Autres Finan. Pub. d''Agences Françaises' from dual union all
select '30', 'physalis', '30', 'FI PUB PRV', 'Financements Mixtes Public Privé' from dual union all
select '31', 'physalis', '31', 'CIFRE', 'Conventions CIFRE' from dual union all
select '32', 'physalis', '32', 'PART RECH', 'Partenariat de Recherche' from dual union all
select '33', 'physalis', '33', 'MECENAT', 'Mécénat y compris Fondations et Asso.' from dual union all
select '34', 'physalis', '34', 'ERC', 'ERC' from dual union all
select '35', 'physalis', '35', 'MARIE CURI', 'Actions Marie Sklodowska Curie' from dual union all
select '36', 'physalis', '36', 'ERASMUS', 'ERASMUS' from dual union all
select '37', 'physalis', '37', 'AUT PRO EU', 'Autre Programme Européen' from dual union all
select '38', 'physalis', '38', 'GOUV EUROP', 'Gouvernement Etranger Européen' from dual union all
select '39', 'physalis', '39', 'GOUV NON E', 'Gouvernement Etranger Hors Europe' from dual union all
select '40', 'physalis', '40', 'AUT FI ETR', 'Autres Financements Etrangers' from dual union all
select '41', 'physalis', '41', 'ENT ETR', 'Entreprise Etrangère' from dual union all
select '42', 'physalis', '42', 'ORG FC', 'Financements Organismes FC' from dual union all
select '43', 'physalis', '43', 'ORG INTER', 'Organismes Internationaux' from dual
)
select "ID","SOURCE_ID","COD_OFI","LIC_OFI","LIB_OFI" from tmp
;
--------------------------------------------------------------------------------
CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_PHYSALIS_FINANCEMENT" ("ID_PHYSALIS", "ID_SYGAL") AS CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_PHYSALIS_FINANCEMENT" ("ID_PHYSALIS", "ID_SYGAL") AS
select RECHERCHE.TYPE_FINANCEMENT.ID_TYPE_FINANCEMENT as id_physalis , select RECHERCHE.TYPE_FINANCEMENT.ID_TYPE_FINANCEMENT as id_physalis ,
CASE RECHERCHE.TYPE_FINANCEMENT.ID_TYPE_FINANCEMENT CASE RECHERCHE.TYPE_FINANCEMENT.ID_TYPE_FINANCEMENT
......
dist/SQL/physalis/02-vues-physalis-etab.sql
+ 47
− 0
View file @ d086780f
...@@ -11,6 +11,9 @@ ...@@ -11,6 +11,9 @@
-- ATTENTION: script à personnaliser! -- ATTENTION: script à personnaliser!
-- --
--
-- Vue fournissant les "variables d'environnement" requises.
--
CREATE OR REPLACE VIEW V_SYGAL_VARIABLE AS CREATE OR REPLACE VIEW V_SYGAL_VARIABLE AS
select select
'physalis' as source_id, 'physalis' as source_id,
...@@ -96,3 +99,47 @@ select ...@@ -96,3 +99,47 @@ select
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual from dual
; ;
--------------------------------------------------------------------------------
--
-- Vues des seules origines de financement à prendre en compte (éventuellement renommées).
--
CREATE OR REPLACE FORCE EDITIONABLE VIEW "API_SCOLARITE"."V_SYGAL_ORIGINE_FINANCEMENT" ("ID", "SOURCE_ID", "COD_OFI", "LIC_OFI", "LIB_OFI") AS
with tmp(ID, SOURCE_ID, COD_OFI, LIC_OFI, LIB_OFI) as (
select '10', 'physalis', '10', 'SALARIE', 'Etudiant salarié' from dual union all
select '11', 'physalis', '11', 'SANS FIN', 'Sans financement' from dual union all
select '13', 'physalis', '13', 'DOT EPSCP', 'Dotation des EPSCP' from dual union all
select '14', 'physalis', '14', 'DOT EPST', 'Dotation des EPST' from dual union all
select '15', 'physalis', '15', 'POLYTECH', 'Programmes Spé. Normaliens, Polytechnici' from dual union all
select '16', 'physalis', '16', 'HANDICAP', 'Programme Spécifique Handicap' from dual union all
select '17', 'physalis', '17', 'DEFENSE', 'Ministère de la Défense (dont DGA)' from dual union all
select '18', 'physalis', '18', 'AGRICULTUR', 'Ministère de l''Agriculture' from dual union all
select '19', 'physalis', '19', 'AFF ETRANG', 'Ministère des Affaires Etrangères' from dual union all
select '20', 'physalis', '20', 'SANTE', 'Ministère de la Santé' from dual union all
select '21', 'physalis', '21', 'AUTRES MIN', 'Autres Ministères' from dual union all
select '22', 'physalis', '22', 'DOT EPIC', 'Dotation des EPIC' from dual union all
select '23', 'physalis', '23', 'DOT EPA', 'Dotation des EPA' from dual union all
select '24', 'physalis', '24', 'NORMANDIE', 'Région Normandie' from dual union all
select '25', 'physalis', '25', 'AUT COLLEC', 'Autre Collectivité Territoriale' from dual union all
select '26', 'physalis', '26', 'ANR', 'ANR' from dual union all
select '27', 'physalis', '27', 'IDEX', 'IDEX' from dual union all
select '28', 'physalis', '28', 'PIA', 'Autres dispositifs du PIA (dont LABEX)' from dual union all
select '29', 'physalis', '29', 'AUT AFFPR', 'Autres Finan. Pub. d''Agences Françaises' from dual union all
select '30', 'physalis', '30', 'FI PUB PRV', 'Financements Mixtes Public Privé' from dual union all
select '31', 'physalis', '31', 'CIFRE', 'Conventions CIFRE' from dual union all
select '32', 'physalis', '32', 'PART RECH', 'Partenariat de Recherche' from dual union all
select '33', 'physalis', '33', 'MECENAT', 'Mécénat y compris Fondations et Asso.' from dual union all
select '34', 'physalis', '34', 'ERC', 'ERC' from dual union all
select '35', 'physalis', '35', 'MARIE CURI', 'Actions Marie Sklodowska Curie' from dual union all
select '36', 'physalis', '36', 'ERASMUS', 'ERASMUS' from dual union all
select '37', 'physalis', '37', 'AUT PRO EU', 'Autre Programme Européen' from dual union all
select '38', 'physalis', '38', 'GOUV EUROP', 'Gouvernement Etranger Européen' from dual union all
select '39', 'physalis', '39', 'GOUV NON E', 'Gouvernement Etranger Hors Europe' from dual union all
select '40', 'physalis', '40', 'AUT FI ETR', 'Autres Financements Etrangers' from dual union all
select '41', 'physalis', '41', 'ENT ETR', 'Entreprise Etrangère' from dual union all
select '42', 'physalis', '42', 'ORG FC', 'Financements Organismes FC' from dual union all
select '43', 'physalis', '43', 'ORG INTER', 'Organismes Internationaux' from dual
)
select "ID","SOURCE_ID","COD_OFI","LIC_OFI","LIB_OFI" from tmp
;
\ No newline at end of file
module/Application/config/module.config.php
+ 2
− 1
View file @ d086780f
...@@ -12,6 +12,7 @@ use ImportData\V1\Entity\Db\EcoleDoctorale; ...@@ -12,6 +12,7 @@ use ImportData\V1\Entity\Db\EcoleDoctorale;
use ImportData\V1\Entity\Db\Etablissement; use ImportData\V1\Entity\Db\Etablissement;
use ImportData\V1\Entity\Db\Financement; use ImportData\V1\Entity\Db\Financement;
use ImportData\V1\Entity\Db\Individu; use ImportData\V1\Entity\Db\Individu;
use ImportData\V1\Entity\Db\OrigineFinancement;
use ImportData\V1\Entity\Db\Role; use ImportData\V1\Entity\Db\Role;
use ImportData\V1\Entity\Db\Structure; use ImportData\V1\Entity\Db\Structure;
use ImportData\V1\Entity\Db\These; use ImportData\V1\Entity\Db\These;
...@@ -47,7 +48,7 @@ return [ ...@@ -47,7 +48,7 @@ return [
'role' => Role::class, 'role' => Role::class,
'acteur' => Acteur::class, 'acteur' => Acteur::class,
'variable' => Variable::class, 'variable' => Variable::class,
//'origine-financement' => n'est plus importé. 'origine-financement' => OrigineFinancement::class,
'financement' => Financement::class, 'financement' => Financement::class,
'titre-acces' => TitreAcces::class, 'titre-acces' => TitreAcces::class,
], ],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment