Skip to content
GitLab
Commit c478ba54 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.3.1'

parents ddb051ee 3a9d154d
Pipeline #6133 passed with stage
in 16 seconds
Expand all Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ c478ba54
Journal des modifications
=========================
1.3.1 (?????????/01/2020)
------------------
- Le tribunal local compétent n'étant plus mentionné sur la convention de diffusion de la thèse, il n'est plus nécessaire
que chaque établissement le fournisse.
- Chaque établissement doit corriger l'adresse d'assistance et vérifier la véracité des adresses de contacts
"BU" et "Maison des doctorats".
1.3.0 (20/11/2019)
------------------
......@@ -11,6 +19,34 @@ Journal des modifications
Le contenu de ces tables est mis à jour par un script PHP à CRONer.
UNIVROUEN : assistance-sygal-univ-rouen@normandie-univ.fr :
------------------------------------
lynda.letetu@univ-rouen.fr
catherine.godard@univ-rouen.fr
marie.landry@univ-rouen.fr
coleen.boust@univ-rouen.fr
marion.ghislain@univ-rouen.fr
sandra.tamion@univ-rouen.fr
claire.leboeuf@univ-rouen.fr
philippe.aubry@univ-rouen.fr
mathieu.maubois@univ-rouen.fr
camille.henaux@univ-rouen.fr
UNIVLEHAVRE : assistance-sygal-univ-lehavre@normandie-univ.fr
------------------------------------
isabelle.thomas@univ-lehavre.fr
sandrine.conin@univ-lehavre.fr
christine.lebodo@univ-lehavre.fr
sophie.mandeville@univ-lehavre.fr
INSARouen : assistance-sygal-insa-rouen@normandie-univ.fr
------------------------------------
marie.briandy@insa-rouen.fr
rachel.maeght@insa-rouen.fr
julien.marchand@insa-rouen.fr
Groupe UNICAEN, derrière assistance-sygal-unicaen@normandie-univ.fr
v1.2.6 (12/11/2019)
-------------------
......
data/sql/physalis/01-vues-physalis-communes.sql deleted 100644 → 0
View file @ ddb051ee
--
--
-- SyGAL
-- =====
--
-- Web Service d'import de données
-- -------------------------------
--
-- Vues communes à tous les établissements ayant Physalis.
--
create view V_SYGAL_SOURCE as
select
'physalis' as id,
'physalis' as code,
'Physalis' as libelle,
1 as importable
from dual
/
/*
create view SYGAL_INDIVIDU as
...
*/
/*
create view SYGAL_DOCTORANT as
...
*/
/*
create view SYGAL_THESE as
...
*/
/*
create view SYGAL_STRUCTURE as
...
*/
/*
create view SYGAL_ECOLE_DOCT as
...
*/
/*
create view SYGAL_UNITE_RECH as
...
*/
/*
create view SYGAL_ETABLISSEMENT as
...
*/
/*
create view SYGAL_ACTEUR as
...
*/
/*
create view SYGAL_FINANCEMENT as
...
*/
create view SYGAL_ROLE(source_id, COD_ROJ, LIC_ROJ, LIB_ROJ) as
select 'physalis', 'A', 'Absent', 'Membre absent' from dual union
select 'physalis', 'B', 'Co-encadr', 'Co-encadrant' from dual union
select 'physalis', 'C', 'Chef Labo', 'Chef de laboratoire' from dual union
select 'physalis', 'D', 'Directeur', 'Directeur de thèse' from dual union
select 'physalis', 'K', 'Co-direct', 'Co-directeur de thèse' from dual union
select 'physalis', 'M', 'Membre', 'Membre du jury' from dual union
select 'physalis', 'P', 'Président', 'Président du jury' from dual union
select 'physalis', 'R', 'Rapporteur', 'Rapporteur du jury' from dual
/
create view SYGAL_ORIGINE_FINANCEMENT 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
/
data/sql/physalis/02-vues-physalis-etab.sql deleted 100644 → 0
View file @ ddb051ee
--
--
-- SyGAL
-- =====
--
-- Web Service d'import de données
-- -------------------------------
--
-- Vues Physalis propre à votre établissement, à personnaliser.
--
create or replace view SYGAL_VARIABLE_MANU as
select
'physalis' as source_id,
'EMAIL_ASSISTANCE' as id,
'EMAIL_ASSISTANCE' as cod_vap,
'Adresse mail de l''assistance utilisateur' as lib_vap,
'assistance-sygal@univ.fr' as par_vap, -----------------------------> à personnaliser
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'EMAIL_BU' as id,
'EMAIL_BU' as cod_vap,
'Adresse mail de contact de la BU' as lib_vap,
'bu@univ.fr' as par_vap, ------------------------------------------> à personnaliser
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'EMAIL_BDD' as id,
'EMAIL_BDD' as cod_vap,
'Adresse mail de contact du bureau des doctorats' as lib_vap,
'bdd@univ.fr' as par_vap, -----------------------------------------> à personnaliser
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
/
create view V_SYGAL_VARIABLE as
with tmp(cod_vap, lib_vap, par_vap) as (
select 'ETB_ART_ETB_LIB', 'Article du nom de l''etb de référence', 'L''' from dual union
select 'ETB_LIB', 'Nom de l''établissement de référence', 'Université de Caen Normandie' from dual union
select 'ETB_LIB_NOM_RESP', 'Nom du responsable de l''établissement', 'M. Pierre Denise' from dual union
select 'ETB_LIB_TIT_RESP', 'Titre du responsable de l''établissement', 'Le Président de l''université' from dual union
select 'EMAIL_ASSISTANCE', 'Adresse mail de l''assistance utilisateur', 'assistance-sygal@unicaen.fr' from dual union
select 'EMAIL_BU', 'Adresse mail de contact de la BU', 'scd.theses@unicaen.fr' from dual union
select 'EMAIL_BDD', 'Adresse mail de contact du bureau des doctorats', 'recherche.doctorat@unicaen.fr' from dual union
select 'TRIBUNAL_COMPETENT', 'Tribunal compétent', 'Le Tribunal Administratif de Caen' from dual
)
select
'physalis' as source_id, -- Id de la source
cod_vap as id,
cod_vap,
lib_vap,
par_vap,
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from tmp
-- + variables définies manuellement :
union all
select
source_id,
id,
cod_vap,
lib_vap,
par_vap,
DATE_DEB_VALIDITE,
DATE_FIN_VALIDITE
from
V_SYGAL_VARIABLE_MANU
/
dist/SQL/01-tables.sql 0 → 100644
View file @ c478ba54
--
--
-- SyGAL
-- =====
--
-- Web Service d'import de données
-- -------------------------------
--
-- Tables à créer par chaque établissement.
--
create table SYGAL_ACTEUR
(
ID VARCHAR2(104),
SOURCE_ID VARCHAR2(50 char),
THESE_ID NUMBER(8),
ROLE_ID CHAR,
COD_ROJ_COMPL VARCHAR2(1 char),
LIB_ROJ_COMPL VARCHAR2(21),
COD_PER NUMBER(8),
INDIVIDU_ID VARCHAR2(4000),
ACTEUR_ETABLISSEMENT_ID VARCHAR2(8),
COD_PAY_ETB VARCHAR2(3),
LIB_PAY_ETB VARCHAR2(40),
COD_CPS VARCHAR2(10),
LIB_CPS VARCHAR2(40),
TEM_HAB_RCH_PER VARCHAR2(1) not null,
TEM_RAP_RECU VARCHAR2(1),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_DOCTORANT
(
SOURCE_ID VARCHAR2(50 char),
ID NUMBER(8),
INDIVIDU_ID NUMBER(8),
INE VARCHAR2(12),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_ECOLE_DOCT
(
SOURCE_ID VARCHAR2(50 char),
STRUCTURE_ID VARCHAR2(4),
ID VARCHAR2(4),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_ETABLISSEMENT
(
SOURCE_ID VARCHAR2(50 char),
STRUCTURE_ID VARCHAR2(8),
ID VARCHAR2(8),
CODE VARCHAR2(8),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_FINANCEMENT
(
ID NUMBER,
SOURCE_ID VARCHAR2(50 char),
THESE_ID NUMBER(8) not null,
ANNEE_ID VARCHAR2(4),
ORIGINE_FINANCEMENT_ID VARCHAR2(2),
COMPLEMENT_FINANCEMENT VARCHAR2(4000),
QUOTITE_FINANCEMENT NUMBER(3),
DATE_DEBUT_FINANCEMENT DATE,
DATE_FIN_FINANCEMENT DATE,
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_INDIVIDU
(
SOURCE_ID VARCHAR2(50 char),
TYPE VARCHAR2(9),
ID VARCHAR2(4000),
SUPANN_ID VARCHAR2(4000),
CIV VARCHAR2(5),
LIB_NOM_PAT_IND VARCHAR2(40),
LIB_NOM_USU_IND VARCHAR2(40),
LIB_PR1_IND VARCHAR2(20),
LIB_PR2_IND VARCHAR2(20),
LIB_PR3_IND VARCHAR2(20),
EMAIL VARCHAR2(4000),
DATE_NAI_IND DATE,
COD_PAY_NAT VARCHAR2(3),
LIB_NAT VARCHAR2(40),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_ORIGINE_FINANCEMENT
(
ID CHAR(2),
SOURCE_ID VARCHAR2(50 char),
COD_OFI CHAR(2),
LIC_OFI VARCHAR2(10),
LIB_OFI VARCHAR2(40),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_ROLE
(
SOURCE_ID VARCHAR2(50 char),
ID CHAR,
LIB_ROJ VARCHAR2(21),
LIC_ROJ VARCHAR2(10),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_STRUCTURE
(
SOURCE_ID VARCHAR2(50 char),
TYPE_STRUCTURE_ID VARCHAR2(15),
ID VARCHAR2(10),
SIGLE VARCHAR2(25),
LIBELLE VARCHAR2(100),
CODE_PAYS VARCHAR2(3),
LIBELLE_PAYS VARCHAR2(40),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_THESE_ANNEE_UNIV
(
SOURCE_ID VARCHAR2(50 char),
ID VARCHAR2(45),
THESE_ID NUMBER(8) not null,
ANNEE_UNIV VARCHAR2(4) not null,
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_TITRE_ACCES
(
SOURCE_ID VARCHAR2(50 char),
ID NUMBER(8) not null,
THESE_ID NUMBER(8) not null,
TITRE_ACCES_INTERNE_EXTERNE VARCHAR2(1),
LIBELLE_TITRE_ACCES VARCHAR2(120),
TYPE_ETB_TITRE_ACCES VARCHAR2(40),
LIBELLE_ETB_TITRE_ACCES VARCHAR2(100),
CODE_DEPT_TITRE_ACCES VARCHAR2(100),
CODE_PAYS_TITRE_ACCES VARCHAR2(3),
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_UNITE_RECH
(
SOURCE_ID VARCHAR2(50 char),
STRUCTURE_ID VARCHAR2(10) not null,
ID VARCHAR2(10) not null,
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_VARIABLE
(
SOURCE_ID VARCHAR2(50 char),
ID VARCHAR2(20),
COD_VAP VARCHAR2(20),
LIB_VAP VARCHAR2(47),
PAR_VAP VARCHAR2(100),
DATE_DEB_VALIDITE DATE,
DATE_FIN_VALIDITE DATE,
INSERTED_ON DATE default sysdate not null
)
/
create table SYGAL_THESE
(
SOURCE_ID VARCHAR2(50 char),
ID NUMBER(8) not null,
ETA_THS VARCHAR2(1),
DOCTORANT_ID NUMBER(8),
COD_DIS NUMBER(7),
LIB_INT1_DIS VARCHAR2(200),
LIB_THS VARCHAR2(800),
COD_LNG VARCHAR2(4),
DAT_DEB_THS DATE,
ECOLE_DOCT_ID VARCHAR2(4),
UNITE_RECH_ID VARCHAR2(10),
LIB_PAY VARCHAR2(40),
LIB_ETB_COT VARCHAR2(120),
TEM_AVENANT VARCHAR2(1),
DAT_PREV_SOU DATE,
TEM_SOU_AUT_THS VARCHAR2(1),
DAT_AUT_SOU_THS DATE,
DAT_SOU_THS DATE,
DAT_FIN_CFD_THS DATE,
COD_NEG_TRE VARCHAR2(1),
ETA_RPD_THS VARCHAR2(1),
CORRECTION_POSSIBLE VARCHAR2(11),
COD_ANU_PRM_IAE VARCHAR2(20),
INSERTED_ON DATE default sysdate not null
)
/
data/sql/apogee/02-vues-apogee-etab.sql → dist/SQL/apogee/02-vues-apogee-etab.sql
View file @ c478ba54
......@@ -6,7 +6,9 @@
-- Web Service d'import de données
-- -------------------------------
--
-- Vues Apogée propre à votre établissement, à personnaliser.
-- Vues Apogée propre à votre établissement.
--
-- ATTENTION: script à personnaliser!
--
--
......@@ -30,7 +32,7 @@ create view V_SYGAL_VARIABLE_MANU as
'apogee' as source_id,
'EMAIL_BU' as id,
'EMAIL_BU' as cod_vap,
'Adresse mail de contact de la BU' as lib_vap,
'Adresse mail de contact pour les aspects BU' as lib_vap,
'bu@univ.fr' as par_vap, ------------------------------------------> à personnaliser
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
......@@ -40,8 +42,8 @@ create view V_SYGAL_VARIABLE_MANU as
'apogee' as source_id,
'EMAIL_BDD' as id,
'EMAIL_BDD' as cod_vap,
'Adresse mail de contact du bureau des doctorats' as lib_vap,
'bdd@univ.fr' as par_vap, -----------------------------------------> à personnaliser
'Adresse mail de contact pour les aspects Doctorat' as lib_vap,
'doctorat@univ.fr' as par_vap, -----------------------------------------> à personnaliser
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
......
dist/SQL/physalis/01-vues-physalis-communes.sql 0 → 100644
View file @ c478ba54
This diff is collapsed.
dist/SQL/physalis/02-vues-physalis-etab.sql 0 → 100644
View file @ c478ba54
--
--
-- SyGAL
-- =====
--
-- Web Service d'import de données
-- -------------------------------
--
-- Vues Physalis propre à votre établissement.
--
-- ATTENTION: script à personnaliser!
--
CREATE OR REPLACE VIEW V_SYGAL_VARIABLE AS
select
'physalis' as source_id,
'ETB_LIB' as id,
'ETB_LIB' as cod_vap,
'Nom de l''établissement de référence' as lib_vap,
------------ CORRIGEZ, SVP -----------
'L''Étable ISSEMENT' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'ETB_LIB_NOM_RESP' as id,
'ETB_LIB_NOM_RESP' as cod_vap,
'Nom du responsable de l''établissement' as lib_vap,
------------ CORRIGEZ, SVP -----------
'M. Alain Térieur' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'ETB_LIB_TIT_RESP' as id,
'ETB_LIB_TIT_RESP' as cod_vap,
'Titre du responsable de l''établissement' as lib_vap,
------------ CORRIGEZ, SVP -----------
'Directeur' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'ETB_ART_ETB_LIB' as id,
'ETB_ART_ETB_LIB' as cod_vap,
'Article du nom de l''etb de référence' as lib_vap,
------------ CORRIGEZ, SVP -----------
'Le' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'EMAIL_ASSISTANCE' as id,
'EMAIL_ASSISTANCE' as cod_vap,
'Adresse mail de l''assistance utilisateur' as lib_vap,
------------ CORRIGEZ, SVP -----------
'assistance-sygal@etable-issement.fr' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'EMAIL_BU' as id,
'EMAIL_BU' as cod_vap,
'Adresse mail de contact de la BU' as lib_vap,
------------ CORRIGEZ, SVP -----------
'bu@etable-issement.fr' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
union all
select
'physalis' as source_id,
'EMAIL_BDD' as id,
'EMAIL_BDD' as cod_vap,
'Adresse mail de contact de la Maison des doctorats' as lib_vap,
------------ CORRIGEZ, SVP -----------
'doctorat@etable-issement.fr' as par_vap,
--------------------------------------
to_date('2017-01-01', 'YYYY-MM-DD') as DATE_DEB_VALIDITE,
to_date('9999-12-31', 'YYYY-MM-DD') as DATE_FIN_VALIDITE
from dual
;
dist/cron/sygal-import-ws-cron 0 → 100644
View file @ c478ba54
#
# Web service d'import pour SyGAL.
#
APP_DIR=/var/www/sygal-import-ws
LOG_FILE=/tmp/sygal-import-ws.log
##### Mise à jour des tables sources des services #####
*/5 * * * * root /usr/bin/php ${APP_DIR}/public/index.php update-service-tables 1> ${LOG_FILE} 2>&1
## (toutes les 5 minutes)
doc/release-notes/v1.3.1.md 0 → 100644
View file @ c478ba54
Version 1.3.1
=============
Sources PHP
-----------
Sur le serveur, placez-vous dans le répertoire du web service (sans doute `/var/www/sygal-import-ws`)
puis lancez les commandes suivantes pour installer la nouvelle version :
```bash
git fetch && git fetch --tags && git checkout --force 1.3.1 && bash install.sh
```
Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
- php7.0-fpm : `service php7.0-fpm reload`