diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91205b31fb67a0b1b1e1e2b90a09d033a64116d4..52a199b248aa65dc95443426569b093234ff1410 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
Journal des modifications
=========================
+1.3.2 (24/01/2020)
+------------------
+
+- Thèses : ajout des dates d'abandon et de transfert.
+- Les dates d'insertion des données dans les tables `SYGAL_*` sont désormais retournées par le web service ;
+ cela permettra côté SyGAL de détecter un problème dans le CRONage du script de remplissage de ces tables).
+
1.3.1 (17/01/2020)
------------------
diff --git a/config/autoload/version.global.php b/config/autoload/version.global.php
index d25ed5df7d6d5ab73e824a5de0126f7b465092b5..58d8269cf64eac97f543c8849b01a3f3111d4fff 100644
--- a/config/autoload/version.global.php
+++ b/config/autoload/version.global.php
@@ -2,9 +2,9 @@
return [
'unicaen-app' => [
'app_infos' => [
- 'version' => '1.3.0',
- 'date' => '20/11/2019',
+ 'version' => '1.3.2',
+ 'date' => '24/01/2020',
],
],
- 'comment' => 'Fichier généré le 20/11/2019 à 09:43:55 avec /home/gauthierb/workspace/sygal-import-ws/bump-version',
+ 'comment' => 'Fichier généré le 24/01/2020 à 11:44:25 avec /home/gauthierb/workspace/sygal-import-ws/bump-version',
];
diff --git a/dist/SQL/01-tables.sql b/dist/SQL/01-tables.sql
index f673b15f4f4592f7295cf6cf11a91ca070523fac..65254dd96a2f88183a0c1cf892bed91ae21532e5 100644
--- a/dist/SQL/01-tables.sql
+++ b/dist/SQL/01-tables.sql
@@ -26,7 +26,7 @@ create table SYGAL_ACTEUR
LIB_CPS VARCHAR2(40),
TEM_HAB_RCH_PER VARCHAR2(1) not null,
TEM_RAP_RECU VARCHAR2(1),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -36,7 +36,7 @@ create table SYGAL_DOCTORANT
ID NUMBER(8),
INDIVIDU_ID NUMBER(8),
INE VARCHAR2(12),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -45,7 +45,7 @@ create table SYGAL_ECOLE_DOCT
SOURCE_ID VARCHAR2(50 char),
STRUCTURE_ID VARCHAR2(4),
ID VARCHAR2(4),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -55,7 +55,7 @@ create table SYGAL_ETABLISSEMENT
STRUCTURE_ID VARCHAR2(8),
ID VARCHAR2(8),
CODE VARCHAR2(8),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -70,7 +70,7 @@ create table SYGAL_FINANCEMENT
QUOTITE_FINANCEMENT NUMBER(3),
DATE_DEBUT_FINANCEMENT DATE,
DATE_FIN_FINANCEMENT DATE,
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -90,7 +90,7 @@ create table SYGAL_INDIVIDU
DATE_NAI_IND DATE,
COD_PAY_NAT VARCHAR2(3),
LIB_NAT VARCHAR2(40),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -101,7 +101,7 @@ create table SYGAL_ORIGINE_FINANCEMENT
COD_OFI CHAR(2),
LIC_OFI VARCHAR2(10),
LIB_OFI VARCHAR2(40),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -111,7 +111,7 @@ create table SYGAL_ROLE
ID CHAR,
LIB_ROJ VARCHAR2(21),
LIC_ROJ VARCHAR2(10),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -124,7 +124,7 @@ create table SYGAL_STRUCTURE
LIBELLE VARCHAR2(100),
CODE_PAYS VARCHAR2(3),
LIBELLE_PAYS VARCHAR2(40),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -134,7 +134,7 @@ create table SYGAL_THESE_ANNEE_UNIV
ID VARCHAR2(45),
THESE_ID NUMBER(8) not null,
ANNEE_UNIV VARCHAR2(4) not null,
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -149,7 +149,7 @@ create table SYGAL_TITRE_ACCES
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
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -158,7 +158,7 @@ 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
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -171,7 +171,7 @@ create table SYGAL_VARIABLE
PAR_VAP VARCHAR2(100),
DATE_DEB_VALIDITE DATE,
DATE_FIN_VALIDITE DATE,
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
@@ -200,7 +200,7 @@ create table SYGAL_THESE
ETA_RPD_THS VARCHAR2(1),
CORRECTION_POSSIBLE VARCHAR2(11),
COD_ANU_PRM_IAE VARCHAR2(20),
- INSERTED_ON DATE default sysdate not null
+ SOURCE_INSERT_DATE DATE default sysdate not null
)
/
diff --git a/dist/SQL/apogee/01-vues-apogee-communes.sql b/dist/SQL/apogee/01-vues-apogee-communes.sql
index f1d4ed4619703c3850b554e24c54c236c144f080..aefccf01f03d22f295de984e9a81c357714cfbb0 100644
--- a/dist/SQL/apogee/01-vues-apogee-communes.sql
+++ b/dist/SQL/apogee/01-vues-apogee-communes.sql
@@ -201,104 +201,105 @@ select distinct
and cod_etu is not null
/
-create view V_SYGAL_THESE as
- with inscription_administrative as (
+create or replace view V_SYGAL_THESE as
+with inscription_administrative as (
select distinct
- ths.cod_ind,
- iae.cod_dip,
- iae.cod_vrs_vdi
+ ths.cod_ind,
+ iae.cod_dip,
+ iae.cod_vrs_vdi
from these_hdr_sout ths
- join ins_adm_etp iae on iae.cod_ind = ths.cod_ind and ( iae.cod_dip, iae.cod_vrs_vdi ) in ( ( ths.cod_dip, ths.cod_vrs_vdi ), ( ths.cod_dip_anc, ths.cod_vrs_vdi_anc ) )
- join diplome dip on dip.cod_dip = iae.cod_dip
- join typ_diplome tpd on tpd.cod_tpd_etb = dip.cod_tpd_etb
+ join ins_adm_etp iae on iae.cod_ind = ths.cod_ind and ( iae.cod_dip, iae.cod_vrs_vdi ) in ( ( ths.cod_dip, ths.cod_vrs_vdi ), ( ths.cod_dip_anc, ths.cod_vrs_vdi_anc ) )
+ join diplome dip on dip.cod_dip = iae.cod_dip
+ join typ_diplome tpd on tpd.cod_tpd_etb = dip.cod_tpd_etb
where ths.cod_ths_trv = '1' -- Exclusion des travaux
and iae.eta_iae = 'E' -- Inscription administrative non annulee
and iae.eta_pmt_iae = 'P' -- Inscription administrative payee
and dip.cod_tpd_etb in ( '39', '40' )
and tpd.eta_ths_hdr_drt = 'T' -- Inscription en these
and tpd.tem_sante = 'N' -- Exclusion des theses d exercice
- ),
- hierarchie_structures as (
- select
- cod_cmp_inf,
- cod_cmp_sup
- from cmp_cmp
- where connect_by_isleaf = 1
- connect by prior cod_cmp_sup = cod_cmp_inf
- ),
- ancienne_these as (
- select distinct
- cod_ind,
- cod_dip_anc,
- cod_vrs_vdi_anc,
- 'A' eta_ths
- from these_hdr_sout
- where cod_ths_trv = '1'
- and cod_dip_anc is not null
- )
+),
+ hierarchie_structures as (
+ select
+ cod_cmp_inf,
+ cod_cmp_sup
+ from cmp_cmp
+ where connect_by_isleaf = 1
+ connect by prior cod_cmp_sup = cod_cmp_inf
+ ),
+ ancienne_these as (
+ select distinct
+ cod_ind,
+ cod_dip_anc,
+ cod_vrs_vdi_anc,
+ 'A' eta_ths
+ from these_hdr_sout
+ where cod_ths_trv = '1'
+ and cod_dip_anc is not null
+ )
- select
- 'apogee' as source_id, -- Id de la source
+select
+ 'apogee' as source_id, -- Id de la source
- ---------- Enregistrement de la these --------
- ths.cod_ths as id, -- Identifiant de la these
- case when ths.eta_ths = 'S' and nvl ( ths.dat_sou_ths, sysdate + 1 ) > sysdate
+ ---------- Enregistrement de la these --------
+ ths.cod_ths as id, -- Identifiant de la these
+ case when ths.eta_ths = 'S' and nvl ( ths.dat_sou_ths, sysdate + 1 ) > sysdate
then 'E' else ths.eta_ths end eta_ths, -- Etat de la these (E=En cours, A=Abandonnee, S=Soutenue, U=Transferee)
- ind.cod_etu as doctorant_id, -- Identifiant du doctorant
- ths.cod_dis, -- Code discipline
- dis.lib_int1_dis, -- Libellé discipline
- ths.lib_ths, -- Titre de la these
- ths.cod_lng, -- Code langue etrangere du titre
- ths.dat_deb_ths, -- Date de 1ere inscription
- null as cod_anu_prm_iae, -- DEPRECATED (cf. V_SYGAL_THESE_ANNEE_UNIV)
+ ind.cod_etu as doctorant_id, -- Identifiant du doctorant
+ ths.cod_dis, -- Code discipline
+ dis.lib_int1_dis, -- Libellé discipline
+ ths.lib_ths, -- Titre de la these
+ ths.cod_lng, -- Code langue etrangere du titre
+ ths.dat_deb_ths, -- Date de 1ere inscription
+ ths.dat_abandon, -- Date d'abandon
+ ths.dat_transfert_dep, -- Date de transfert
- edo.cod_nat_edo as ecole_doct_id, -- Identifiant de l'ecole doctorale
- ths.cod_eqr as unite_rech_id, -- Identifiant de l'unité de recherche principale
+ edo.cod_nat_edo as ecole_doct_id, -- Identifiant de l'ecole doctorale
+ ths.cod_eqr as unite_rech_id, -- Identifiant de l'unité de recherche principale
- ----------- Cotutelle ----------
- pay.lib_pay, -- Denomination pays de cotutelle
- nvl ( etb.lib_web_etb, etb.lib_etb ) lib_etb_cot, -- Denomination etablissement de cotutelle
- ths.tem_avenant, -- Avenant a la convention de cotutelle (O/N)
+ ----------- Cotutelle ----------
+ pay.lib_pay, -- Denomination pays de cotutelle
+ nvl ( etb.lib_web_etb, etb.lib_etb ) lib_etb_cot, -- Denomination etablissement de cotutelle
+ ths.tem_avenant, -- Avenant a la convention de cotutelle (O/N)
- ------- Organisation de la soutenance ------
- ths.dat_prev_sou, -- Date previsionnelle de soutenance
- ths.tem_sou_aut_ths, -- Soutenance autorisee (O/N/null)
- ths.dat_aut_sou_ths, -- Date d autorisation de soutenance
- ths.dat_sou_ths, -- Date de soutenance de la these
+ ------- Organisation de la soutenance ------
+ ths.dat_prev_sou, -- Date previsionnelle de soutenance
+ ths.tem_sou_aut_ths, -- Soutenance autorisee (O/N/null)
+ ths.dat_aut_sou_ths, -- Date d autorisation de soutenance
+ ths.dat_sou_ths, -- Date de soutenance de la these
- ---------- Confidentialite --------
- ths.dat_fin_cfd_ths, -- Date de fin de confidentialite de la these
+ ---------- Confidentialite --------
+ ths.dat_fin_cfd_ths, -- Date de fin de confidentialite de la these
- ---------- Jury et resultats --------
- tre.cod_neg_tre, -- Resultat positif (1) ou non (0)
- ths.eta_rpd_ths, -- Reproduction de la these ( O=Oui / C=Oui avec corrections / N=Non )
- decode(ths.eta_rpd_ths,
- 'N', 'obligatoire',
- 'C', 'facultative',
- null) as correction_possible -- Témoin de corrections attendues
+ ---------- Jury et resultats --------
+ tre.cod_neg_tre, -- Resultat positif (1) ou non (0)
+ ths.eta_rpd_ths, -- Reproduction de la these ( O=Oui / C=Oui avec corrections / N=Non )
+ decode(ths.eta_rpd_ths,
+ 'N', 'obligatoire',
+ 'C', 'facultative',
+ null) as correction_possible -- Témoin de corrections attendues
- from inscription_administrative iae
- join individu ind on ind.cod_ind = iae.cod_ind
- join version_diplome vdi on vdi.cod_dip = iae.cod_dip and vdi.cod_vrs_vdi = iae.cod_vrs_vdi
- 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
- left join ancienne_these anc on anc.cod_ind = ths.cod_ind and anc.cod_dip_anc = ths.cod_dip and anc.cod_vrs_vdi_anc = ths.cod_vrs_vdi and anc.eta_ths = ths.eta_ths
- left join annee_uni ans on ans.cod_anu = ths.daa_fin_ths
- left join ecole_doctorale edo on edo.cod_edo = ths.cod_edo
- left join secteur_rch ser on ser.cod_ser = ths.cod_ser
- left join equipe_rch eqr on eqr.cod_eqr = ths.cod_eqr
- left join resultat_vdi rvi on rvi.cod_ind = iae.cod_ind and rvi.cod_dip = iae.cod_dip and rvi.cod_vrs_vdi = iae.cod_vrs_vdi and rvi.cod_ses = '0' and rvi.cod_adm = '1' and rvi.cod_tre is not null
- left join annee_uni anr on anr.cod_anu = rvi.cod_anu
- left join typ_resultat tre on tre.cod_tre = rvi.cod_tre
- left join mention men on men.cod_men = rvi.cod_men
- left join hierarchie_structures ccm on ccm.cod_cmp_inf = ths.cod_cmp
- left join composante cmp on cmp.cod_cmp = nvl ( ccm.cod_cmp_sup, ths.cod_cmp )
- left join diplome_sise dis on dis.cod_dis = ths.cod_dis
- left join etablissement etb on etb.cod_etb = ths.cod_etb
- left join pays pay on pay.cod_pay = ths.cod_pay
- left join etablissement sou on sou.cod_etb = ths.cod_etb_sou
- left join etablissement ori on ori.cod_etb = ths.cod_etb_origine
- left join langue lng on lng.cod_lng = ths.cod_lng
- where
+from inscription_administrative iae
+ join individu ind on ind.cod_ind = iae.cod_ind
+ join version_diplome vdi on vdi.cod_dip = iae.cod_dip and vdi.cod_vrs_vdi = iae.cod_vrs_vdi
+ 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
+ left join ancienne_these anc on anc.cod_ind = ths.cod_ind and anc.cod_dip_anc = ths.cod_dip and anc.cod_vrs_vdi_anc = ths.cod_vrs_vdi and anc.eta_ths = ths.eta_ths
+ left join annee_uni ans on ans.cod_anu = ths.daa_fin_ths
+ left join ecole_doctorale edo on edo.cod_edo = ths.cod_edo
+ left join secteur_rch ser on ser.cod_ser = ths.cod_ser
+ left join equipe_rch eqr on eqr.cod_eqr = ths.cod_eqr
+ left join resultat_vdi rvi on rvi.cod_ind = iae.cod_ind and rvi.cod_dip = iae.cod_dip and rvi.cod_vrs_vdi = iae.cod_vrs_vdi and rvi.cod_ses = '0' and rvi.cod_adm = '1' and rvi.cod_tre is not null
+ left join annee_uni anr on anr.cod_anu = rvi.cod_anu
+ left join typ_resultat tre on tre.cod_tre = rvi.cod_tre
+ left join mention men on men.cod_men = rvi.cod_men
+ left join hierarchie_structures ccm on ccm.cod_cmp_inf = ths.cod_cmp
+ left join composante cmp on cmp.cod_cmp = nvl ( ccm.cod_cmp_sup, ths.cod_cmp )
+ left join diplome_sise dis on dis.cod_dis = ths.cod_dis
+ left join etablissement etb on etb.cod_etb = ths.cod_etb
+ left join pays pay on pay.cod_pay = ths.cod_pay
+ left join etablissement sou on sou.cod_etb = ths.cod_etb_sou
+ left join etablissement ori on ori.cod_etb = ths.cod_etb_origine
+ left join langue lng on lng.cod_lng = ths.cod_lng
+where
ths.cod_ths_trv = '1' and -- Exclusion des travaux
anc.cod_dip_anc is null
/
diff --git a/doc/apigility.md b/doc/apigility.md
new file mode 100644
index 0000000000000000000000000000000000000000..46121ddb2db45650bb3140efe901e9c0f36176f8
--- /dev/null
+++ b/doc/apigility.md
@@ -0,0 +1,40 @@
+Utiliser l'interface d'admin Apigility
+======================================
+
+Ouvrir l'interface d'admin
+--------------------------
+
+- Lancer si besoin le web service dans Docker :
+ `docker-compose up sygal-import-ws`
+
+- Passer en mode développement :
+ `docker-compose exec sygal-import-ws vendor/bin/zf-development-mode enable`
+
+- Ouvrir l'interface d'admin dans un navigateur, exemple :
+ `https://localhost:8443`
+
+ NB: le numéro de port dépend de la config `docker-compose.yml`, faites un `docker ps` pour le connaître.
+
+- Autoriser l'interface d'admin à écrire dans les fichiers de config
+ du web service :
+ `docker-compose exec sygal-import-ws chown -R www-data:www-data module/ImportData/config`
+
+Modification de l'API
+---------------------
+
+- Le cas échéant, faire les modifications nécessaires sur l'API.
+
+Fermer l'interface d'admin
+--------------------------
+
+- Rétablir les autorisations d'accès au fichiers :
+ `sudo chown -R ${USER}:${USER} module/ImportData/config`
+
+- Ne pas oublier de désactiver le mode développement :
+ `docker-compose exec sygal-import-ws vendor/bin/zf-development-mode disable`
+
+Test
+----
+
+- Interroger l'API pour vérifier les modifs, exemple :
+`curl --insecure --header "Accept: application/json" --header "Authorization: Basic c3lnYWwtYXBwOmF6ZXJ0eQ==" https://localhost:8443/doctorant`
diff --git a/doc/developpement.md b/doc/developpement.md
index 2bc63b2ee6e860ab720ff72cb3b63f829a3c8905..70a1f392bbe35b4bd5840836574e85781e4221de 100644
--- a/doc/developpement.md
+++ b/doc/developpement.md
@@ -8,52 +8,35 @@ Ajouter un champ dans un service
Exemple : ajouter l'INE des doctorants.
-Marche à suivre :
+### Marche à suivre
-- Dans la base de données :
+- Dans la base de données source (ex: Apogée) :
- - Modifier dans la base de données source (ex: Apogée) la vue `SYGAL_DOCTORANT` pour ajouter la
- colonne.
+ - Modifier la vue `V_SYGAL_DOCTORANT` pour ajouter la nouvelle colonne.
+
+ - Modifier la vue `SYGAL_DOCTORANT` pour ajouter la nouvelle colonne, exemple :
+ `alter table SYGAL_DOCTORANT add INE VARCHAR(20);`
- Dans les sources PHP :
- Mettre à jour le mapping Doctorant dans le fichier
`module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Doctorant.dcm.xml`
- - Mettre à jour l'entité Doctorant dans le fichier
+ - Ajouter la nouvelle propriété `$ine` ainsi que son getter associé `getIne()` dans la classe d'entité
`module/ImportData/src/V1/Entity/Db/Doctorant.php`
- NB: pas besoin d'accesseurs, les colonnes étant découvertes automatiquement
- via le mapping.
+ NB: pas besoin de setter puisqu'il s'agit d'une vue en base de données.
-- Via l'interface graphique d'admin Apigility
-
- - Lancer le web service dans Docker :
- `docker-compose up sygal-import-ws`
-
- - Passer en mode développement :
- `docker-compose exec sygal-import-ws vendor/bin/zf-development-mode enable`
-
- - Ouvrir l'interface d'admin dans un navigateur :
- `https://localhost:8443`
-
- NB: le numéro de port dépend de la config `docker-compose.yml`.
-
- - Autoriser l'interface d'admin à écrire dans les fichiers de config
- du web service :
- `sudo chown -R www-data:ww-data module/ImportData/config`
-
- - Sélectionner le service "Doctorant" et aller dans l'onglet "Fields"
- pour ajouter le champ `ine`.
-
- - Rétablir les autorisations d'accès au fichiers :
- `sudo chown -R gauthierb:gauthierb module/ImportData/config`
-
- - Ne pas oublier de désactiver le mode développement :
- `docker-compose exec sygal-import-ws vendor/bin/zf-development-mode disable`
+### Tests
- En ligne de commande :
-
+
+ - Lancer si besoin le web service dans Docker :
+ `docker-compose up sygal-import-ws`
+
+ - Lancer le script PHP de remplissage des tables `SYGAL_*` à partir des vues `V_SYGAL_*` :
+ `docker-compose exec sygal-import-ws php public/index.php update-service-tables --services=these --verbose`
+
- Vérifier que le nouveau champ figure dans la réponse du web service, ex :
`curl --insecure --header "Accept: application/json" --header "Authorization: Basic c3lnYWwtYXBwOmF6ZXJ0eQ==" https://localhost:8443/doctorant`
diff --git a/doc/release-notes/v1.3.2.md b/doc/release-notes/v1.3.2.md
new file mode 100644
index 0000000000000000000000000000000000000000..b7044ebd618ee665d978160a59f51f25bbef0ad8
--- /dev/null
+++ b/doc/release-notes/v1.3.2.md
@@ -0,0 +1,198 @@
+Version 1.3.2
+=============
+
+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.2 && bash install.sh
+```
+
+Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
+ - php7.0-fpm : `service php7.0-fpm reload`
+ - apache2-mod-php7.0 : `service apache2 reload`
+
+
+Base de données
+---------------
+
+### Dates d'abandon et de transfert des thèses
+
+Il faut corriger la vue `V_SYGAL_THESE` ainsi que la table `SYGAL_THESE` pour inclure ces 2 dates.
+
+#### Apogée
+
+- Voici le nouveau script de la vue `V_SYGAL_THESE` :
+
+```sql
+create or replace view V_SYGAL_THESE as
+with inscription_administrative as (
+ select distinct
+ ths.cod_ind,
+ iae.cod_dip,
+ iae.cod_vrs_vdi
+ from these_hdr_sout ths
+ join ins_adm_etp iae on iae.cod_ind = ths.cod_ind and ( iae.cod_dip, iae.cod_vrs_vdi ) in ( ( ths.cod_dip, ths.cod_vrs_vdi ), ( ths.cod_dip_anc, ths.cod_vrs_vdi_anc ) )
+ join diplome dip on dip.cod_dip = iae.cod_dip
+ join typ_diplome tpd on tpd.cod_tpd_etb = dip.cod_tpd_etb
+ where ths.cod_ths_trv = '1' -- Exclusion des travaux
+ and iae.eta_iae = 'E' -- Inscription administrative non annulee
+ and iae.eta_pmt_iae = 'P' -- Inscription administrative payee
+ and dip.cod_tpd_etb in ( '39', '40' )
+ and tpd.eta_ths_hdr_drt = 'T' -- Inscription en these
+ and tpd.tem_sante = 'N' -- Exclusion des theses d exercice
+ ),
+ hierarchie_structures as (
+ select
+ cod_cmp_inf,
+ cod_cmp_sup
+ from cmp_cmp
+ where connect_by_isleaf = 1
+ connect by prior cod_cmp_sup = cod_cmp_inf
+ ),
+ ancienne_these as (
+ select distinct
+ cod_ind,
+ cod_dip_anc,
+ cod_vrs_vdi_anc,
+ 'A' eta_ths
+ from these_hdr_sout
+ where cod_ths_trv = '1'
+ and cod_dip_anc is not null
+ )
+
+ select
+ 'apogee' as source_id, -- Id de la source
+
+ ---------- Enregistrement de la these --------
+ ths.cod_ths as id, -- Identifiant de la these
+ case when ths.eta_ths = 'S' and nvl ( ths.dat_sou_ths, sysdate + 1 ) > sysdate
+ then 'E' else ths.eta_ths end eta_ths, -- Etat de la these (E=En cours, A=Abandonnee, S=Soutenue, U=Transferee)
+ ind.cod_etu as doctorant_id, -- Identifiant du doctorant
+ ths.cod_dis, -- Code discipline
+ dis.lib_int1_dis, -- Libellé discipline
+ ths.lib_ths, -- Titre de la these
+ ths.cod_lng, -- Code langue etrangere du titre
+ ths.dat_deb_ths, -- Date de 1ere inscription
+ ths.dat_abandon, -- Date d'abandon
+ ths.dat_transfert_dep, -- Date de transfert
+
+ edo.cod_nat_edo as ecole_doct_id, -- Identifiant de l'ecole doctorale
+ ths.cod_eqr as unite_rech_id, -- Identifiant de l'unité de recherche principale
+
+ ----------- Cotutelle ----------
+ pay.lib_pay, -- Denomination pays de cotutelle
+ nvl ( etb.lib_web_etb, etb.lib_etb ) lib_etb_cot, -- Denomination etablissement de cotutelle
+ ths.tem_avenant, -- Avenant a la convention de cotutelle (O/N)
+
+ ------- Organisation de la soutenance ------
+ ths.dat_prev_sou, -- Date previsionnelle de soutenance
+ ths.tem_sou_aut_ths, -- Soutenance autorisee (O/N/null)
+ ths.dat_aut_sou_ths, -- Date d autorisation de soutenance
+ ths.dat_sou_ths, -- Date de soutenance de la these
+
+ ---------- Confidentialite --------
+ ths.dat_fin_cfd_ths, -- Date de fin de confidentialite de la these
+
+ ---------- Jury et resultats --------
+ tre.cod_neg_tre, -- Resultat positif (1) ou non (0)
+ ths.eta_rpd_ths, -- Reproduction de la these ( O=Oui / C=Oui avec corrections / N=Non )
+ decode(ths.eta_rpd_ths,
+ 'N', 'obligatoire',
+ 'C', 'facultative',
+ null) as correction_possible -- Témoin de corrections attendues
+
+ from inscription_administrative iae
+ join individu ind on ind.cod_ind = iae.cod_ind
+ join version_diplome vdi on vdi.cod_dip = iae.cod_dip and vdi.cod_vrs_vdi = iae.cod_vrs_vdi
+ 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
+ left join ancienne_these anc on anc.cod_ind = ths.cod_ind and anc.cod_dip_anc = ths.cod_dip and anc.cod_vrs_vdi_anc = ths.cod_vrs_vdi and anc.eta_ths = ths.eta_ths
+ left join annee_uni ans on ans.cod_anu = ths.daa_fin_ths
+ left join ecole_doctorale edo on edo.cod_edo = ths.cod_edo
+ left join secteur_rch ser on ser.cod_ser = ths.cod_ser
+ left join equipe_rch eqr on eqr.cod_eqr = ths.cod_eqr
+ left join resultat_vdi rvi on rvi.cod_ind = iae.cod_ind and rvi.cod_dip = iae.cod_dip and rvi.cod_vrs_vdi = iae.cod_vrs_vdi and rvi.cod_ses = '0' and rvi.cod_adm = '1' and rvi.cod_tre is not null
+ left join annee_uni anr on anr.cod_anu = rvi.cod_anu
+ left join typ_resultat tre on tre.cod_tre = rvi.cod_tre
+ left join mention men on men.cod_men = rvi.cod_men
+ left join hierarchie_structures ccm on ccm.cod_cmp_inf = ths.cod_cmp
+ left join composante cmp on cmp.cod_cmp = nvl ( ccm.cod_cmp_sup, ths.cod_cmp )
+ left join diplome_sise dis on dis.cod_dis = ths.cod_dis
+ left join etablissement etb on etb.cod_etb = ths.cod_etb
+ left join pays pay on pay.cod_pay = ths.cod_pay
+ left join etablissement sou on sou.cod_etb = ths.cod_etb_sou
+ left join etablissement ori on ori.cod_etb = ths.cod_etb_origine
+ left join langue lng on lng.cod_lng = ths.cod_lng
+ where
+ ths.cod_ths_trv = '1' and -- Exclusion des travaux
+ anc.cod_dip_anc is null
+/
+```
+
+- Et voici de quoi mettre à jour la table `SYGAL_THESE` :
+
+```sql
+alter table SYGAL_THESE add DAT_ABANDON DATE
+/
+alter table SYGAL_THESE add DAT_TRANSFERT_DEP DATE
+/
+```
+
+#### Physalis
+
+- Concernant la vue `V_SYGAL_THESE`, les colonnes à ajouter doivent se nommer `DAT_ABANDON` et `DAT_TRANSFERT_DEP`.
+
+- Et voici de quoi mettre à jour la table `SYGAL_THESE` :
+
+```sql
+alter table SYGAL_THESE add DAT_ABANDON DATE
+/
+alter table SYGAL_THESE add DAT_TRANSFERT_DEP DATE
+/
+```
+
+### Renommage de colonne dans les tables `SYGAL_*`
+
+#### Apogée
+
+```sql
+ALTER TABLE SYGAL_ACTEUR RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_DOCTORANT RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_ECOLE_DOCT RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_ETABLISSEMENT RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_FINANCEMENT RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_INDIVIDU RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_ORIGINE_FINANCEMENT RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_ROLE RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_STRUCTURE RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_THESE RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_THESE_ANNEE_UNIV RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_TITRE_ACCES RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_UNITE_RECH RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+ALTER TABLE SYGAL_VARIABLE RENAME COLUMN INSERTED_ON TO SOURCE_INSERT_DATE ;
+```
+
+#### Physalis
+
+Idem.
+
+
+Serveur
+-------
+
+- Lancer le script de mise à jour de la table `SYGAL_THESE` à partir de la vue `V_SYGAL_THESE`.
+ Exemple :
+
+```bash
+APP_DIR=/var/www/sygal-import-ws
+/usr/bin/php ${APP_DIR}/public/index.php update-service-tables
+```
+
+- Vérifiez que le contenu de la table `SYGAL_THESE` a bien été mis à jour à l'instant.
+ Exemple :
+
+```sql
+select inserted_on from SYGAL_THESE where rownum = 1;
+```
diff --git a/module/Application/src/Service/TableService.php b/module/Application/src/Service/TableService.php
index 9890446c25fccea9715fd46686c315f1f097787b..65d9cf273eda82919a1bd3627b1731b41c7139c5 100644
--- a/module/Application/src/Service/TableService.php
+++ b/module/Application/src/Service/TableService.php
@@ -22,6 +22,15 @@ class TableService
*/
private $servicesToEntityClassesConfig;
+ /**
+ * Liste des colonnes à exclure lors de la mise à jour des tables sources.
+ *
+ * @var array
+ */
+ private $excludedColumnNames = [
+ 'SOURCE_INSERT_DATE',
+ ];
+
/**
* @param EntityManager $entityManager
*/
@@ -110,6 +119,9 @@ class TableService
$tableName = $metadata->getTableName();
$columnNames = $metadata->getColumnNames();
+ // exclusion éventuelle de certaines colonnes
+ $columnNames = array_diff($columnNames, $this->excludedColumnNames);
+
$sqlParts[] = sprintf($deleteTemplate, $tableName);
$sqlParts[] = sprintf($updateTemplate, $tableName, $cols = implode(', ', $columnNames), $cols, $tableName);
}
diff --git a/module/ImportData/src/V1/Entity/Db/Acteur.php b/module/ImportData/src/V1/Entity/Db/Acteur.php
index 1fe30fd78c109d287ffe73080616220c250f73a1..0261371d07143d073b8c71e9e36fc433dbb1a247 100644
--- a/module/ImportData/src/V1/Entity/Db/Acteur.php
+++ b/module/ImportData/src/V1/Entity/Db/Acteur.php
@@ -22,6 +22,8 @@ class Acteur
protected $temoinHDR;
protected $temoinRapport;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -30,14 +32,6 @@ class Acteur
return $this->id;
}
- /**
- * @param mixed $id
- */
- public function setId($id)
- {
- $this->id = $id;
- }
-
/**
* @return mixed
*/
@@ -46,14 +40,6 @@ class Acteur
return $this->sourceId;
}
- /**
- * @param mixed $sourceId
- */
- public function setSourceId($sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return mixed
*/
@@ -62,14 +48,6 @@ class Acteur
return $this->theseId;
}
- /**
- * @param mixed $theseId
- */
- public function setTheseId($theseId)
- {
- $this->theseId = $theseId;
- }
-
/**
* @return mixed
*/
@@ -78,14 +56,6 @@ class Acteur
return $this->roleId;
}
- /**
- * @param mixed $roleId
- */
- public function setRoleId($roleId)
- {
- $this->roleId = $roleId;
- }
-
/**
* @return mixed
*/
@@ -94,14 +64,6 @@ class Acteur
return $this->individuId;
}
- /**
- * @param mixed $individuId
- */
- public function setIndividuId($individuId)
- {
- $this->individuId = $individuId;
- }
-
/**
* @return mixed
*/
@@ -111,17 +73,10 @@ class Acteur
}
/**
- * @param mixed $acteurEtablissementId
- * @return Acteur
- */
- public function setActeurEtablissementId($acteurEtablissementId)
- {
- $this->acteurEtablissementId = $acteurEtablissementId;
-
- return $this;
- }
-
- /**
+ * return $this;
+ * }
+ *
+ * /**
* @return mixed
*/
public function getCodeRoleJury()
@@ -129,14 +84,6 @@ class Acteur
return $this->codeRoleJury;
}
- /**
- * @param mixed $codeRoleJury
- */
- public function setCodeRoleJury($codeRoleJury)
- {
- $this->codeRoleJury = $codeRoleJury;
- }
-
/**
* @return mixed
*/
@@ -145,14 +92,6 @@ class Acteur
return $this->libRoleJury;
}
- /**
- * @param mixed $libRoleJury
- */
- public function setLibRoleJury($libRoleJury)
- {
- $this->libRoleJury = $libRoleJury;
- }
-
/**
* @return mixed
*/
@@ -161,14 +100,6 @@ class Acteur
return $this->codeQualite;
}
- /**
- * @param mixed $codeQualite
- */
- public function setCodeQualite($codeQualite)
- {
- $this->codeQualite = $codeQualite;
- }
-
/**
* @return mixed
*/
@@ -177,14 +108,6 @@ class Acteur
return $this->libQualite;
}
- /**
- * @param mixed $libQualite
- */
- public function setLibQualite($libQualite)
- {
- $this->libQualite = $libQualite;
- }
-
/**
* @return mixed
*/
@@ -193,14 +116,6 @@ class Acteur
return $this->temoinHDR;
}
- /**
- * @param mixed $temoinHDR
- */
- public function setTemoinHDR($temoinHDR)
- {
- $this->temoinHDR = $temoinHDR;
- }
-
/**
* @return mixed
*/
@@ -210,10 +125,10 @@ class Acteur
}
/**
- * @param mixed $temoinRapport
+ * @return mixed
*/
- public function setTemoinRapport($temoinRapport)
+ public function getSourceInsertDate()
{
- $this->temoinRapport = $temoinRapport;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Doctorant.php b/module/ImportData/src/V1/Entity/Db/Doctorant.php
index 8a663f28e1cfa45fab1ff9a69df0e6b18985b19f..a12181a4ac4c0a2ee662da38c58c31baa4c6f8b5 100644
--- a/module/ImportData/src/V1/Entity/Db/Doctorant.php
+++ b/module/ImportData/src/V1/Entity/Db/Doctorant.php
@@ -17,6 +17,8 @@ class Doctorant
protected $sourceId;
protected $individuId;
+ private $sourceInsertDate;
+
/**
* @var string
*/
@@ -30,14 +32,6 @@ class Doctorant
return $this->id;
}
- /**
- * @param int $id
- */
- public function setId($id)
- {
- $this->id = $id;
- }
-
/**
* @return mixed
*/
@@ -46,14 +40,6 @@ class Doctorant
return $this->sourceId;
}
- /**
- * @param mixed $sourceId
- */
- public function setSourceId($sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return mixed
*/
@@ -63,18 +49,18 @@ class Doctorant
}
/**
- * @param mixed $individuId
+ * @return string
*/
- public function setIndividuId($individuId)
+ public function getIne()
{
- $this->individuId = $individuId;
+ return $this->ine;
}
/**
- * @return string
+ * @return mixed
*/
- public function getIne()
+ public function getSourceInsertDate()
{
- return $this->ine;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/EcoleDoctorale.php b/module/ImportData/src/V1/Entity/Db/EcoleDoctorale.php
index f03a6f4bd359380ee8118f62794d5eb30b075dc9..b3782f6a55c5df95535113571ba75a1ee9bc718b 100644
--- a/module/ImportData/src/V1/Entity/Db/EcoleDoctorale.php
+++ b/module/ImportData/src/V1/Entity/Db/EcoleDoctorale.php
@@ -24,6 +24,8 @@ class EcoleDoctorale
*/
private $structureId;
+ private $sourceInsertDate;
+
/**
* @return string
*/
@@ -32,14 +34,6 @@ class EcoleDoctorale
return $this->id;
}
- /**
- * @param string $id
- */
- public function setId(string $id)
- {
- $this->id = $id;
- }
-
/**
* @return string
*/
@@ -48,14 +42,6 @@ class EcoleDoctorale
return $this->sourceId;
}
- /**
- * @param string $sourceId
- */
- public function setSourceId(string $sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return string
*/
@@ -65,10 +51,10 @@ class EcoleDoctorale
}
/**
- * @param string $structureId
+ * @return mixed
*/
- public function setStructureId(string $structureId)
+ public function getSourceInsertDate()
{
- $this->structureId = $structureId;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Etablissement.php b/module/ImportData/src/V1/Entity/Db/Etablissement.php
index bace80d57eaf15cc2623cded9ef048849732af68..7d5e7f8c7c4549b05014ba472cad44be33aff8ce 100644
--- a/module/ImportData/src/V1/Entity/Db/Etablissement.php
+++ b/module/ImportData/src/V1/Entity/Db/Etablissement.php
@@ -24,6 +24,8 @@ class Etablissement
*/
private $structureId;
+ private $sourceInsertDate;
+
/**
* @var string
*/
@@ -37,14 +39,6 @@ class Etablissement
return $this->id;
}
- /**
- * @param string $id
- */
- public function setId(string $id)
- {
- $this->id = $id;
- }
-
/**
* @return string
*/
@@ -53,14 +47,6 @@ class Etablissement
return $this->sourceId;
}
- /**
- * @param string $sourceId
- */
- public function setSourceId(string $sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return string
*/
@@ -69,14 +55,6 @@ class Etablissement
return $this->structureId;
}
- /**
- * @param string $structureId
- */
- public function setStructureId(string $structureId)
- {
- $this->structureId = $structureId;
- }
-
/**
* @return string
*/
@@ -86,10 +64,10 @@ class Etablissement
}
/**
- * @param string $code
+ * @return mixed
*/
- public function setCode(string $code)
+ public function getSourceInsertDate()
{
- $this->code = $code;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Financement.php b/module/ImportData/src/V1/Entity/Db/Financement.php
index d0758a569d5917ba41b273ba78efe1bb06497e61..f4444f1664f55680852bb7b6061fbb37273eda3f 100644
--- a/module/ImportData/src/V1/Entity/Db/Financement.php
+++ b/module/ImportData/src/V1/Entity/Db/Financement.php
@@ -19,6 +19,8 @@ class Financement
protected $dateDebutFinancement;
protected $dateFinFinancement;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -90,4 +92,12 @@ class Financement
{
return $this->dateFinFinancement;
}
+
+ /**
+ * @return mixed
+ */
+ public function getSourceInsertDate()
+ {
+ return $this->sourceInsertDate;
+ }
}
diff --git a/module/ImportData/src/V1/Entity/Db/Individu.php b/module/ImportData/src/V1/Entity/Db/Individu.php
index 394411b2e513863191a85de2855165a5e7960978..a937f91a8ff84a3cd2da8ed4baf6ad53ba7a785b 100644
--- a/module/ImportData/src/V1/Entity/Db/Individu.php
+++ b/module/ImportData/src/V1/Entity/Db/Individu.php
@@ -24,6 +24,8 @@ class Individu
protected $dateNaissance;
protected $nationalite;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -32,14 +34,6 @@ class Individu
return $this->id;
}
- /**
- * @param mixed $id
- */
- public function setId($id)
- {
- $this->id = $id;
- }
-
/**
* @return mixed
*/
@@ -48,14 +42,6 @@ class Individu
return $this->sourceId;
}
- /**
- * @param mixed $sourceId
- */
- public function setSourceId($sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return string
*/
@@ -64,14 +50,6 @@ class Individu
return $this->supannId;
}
- /**
- * @param string $supannId
- */
- public function setSupannId($supannId)
- {
- $this->supannId = $supannId;
- }
-
/**
* @return mixed
*/
@@ -80,14 +58,6 @@ class Individu
return $this->type;
}
- /**
- * @param mixed $type
- */
- public function setType($type)
- {
- $this->type = $type;
- }
-
/**
* @return mixed
*/
@@ -96,14 +66,6 @@ class Individu
return $this->civilite;
}
- /**
- * @param mixed $civilite
- */
- public function setCivilite($civilite)
- {
- $this->civilite = $civilite;
- }
-
/**
* @return mixed
*/
@@ -112,14 +74,6 @@ class Individu
return $this->nomUsuel;
}
- /**
- * @param mixed $nomUsuel
- */
- public function setNomUsuel($nomUsuel)
- {
- $this->nomUsuel = $nomUsuel;
- }
-
/**
* @return mixed
*/
@@ -128,14 +82,6 @@ class Individu
return $this->nomPatronymique;
}
- /**
- * @param mixed $nomPatronymique
- */
- public function setNomPatronymique($nomPatronymique)
- {
- $this->nomPatronymique = $nomPatronymique;
- }
-
/**
* @return mixed
*/
@@ -144,14 +90,6 @@ class Individu
return $this->prenom1;
}
- /**
- * @param mixed $prenom1
- */
- public function setPrenom1($prenom1)
- {
- $this->prenom1 = $prenom1;
- }
-
/**
* @return mixed
*/
@@ -160,14 +98,6 @@ class Individu
return $this->prenom2;
}
- /**
- * @param mixed $prenom2
- */
- public function setPrenom2($prenom2)
- {
- $this->prenom2 = $prenom2;
- }
-
/**
* @return mixed
*/
@@ -176,14 +106,6 @@ class Individu
return $this->prenom3;
}
- /**
- * @param mixed $prenom3
- */
- public function setPrenom3($prenom3)
- {
- $this->prenom3 = $prenom3;
- }
-
/**
* @return mixed
*/
@@ -192,14 +114,6 @@ class Individu
return $this->email;
}
- /**
- * @param mixed $email
- */
- public function setEmail($email)
- {
- $this->email = $email;
- }
-
/**
* @return mixed
*/
@@ -208,14 +122,6 @@ class Individu
return $this->dateNaissance;
}
- /**
- * @param mixed $dateNaissance
- */
- public function setDateNaissance($dateNaissance)
- {
- $this->dateNaissance = $dateNaissance;
- }
-
/**
* @return mixed
*/
@@ -225,10 +131,10 @@ class Individu
}
/**
- * @param mixed $nationalite
+ * @return mixed
*/
- public function setNationalite($nationalite)
+ public function getSourceInsertDate()
{
- $this->nationalite = $nationalite;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Acteur.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Acteur.dcm.xml
index fd1f7493ba317b4b49af6d8c11446c6f453ccdaa..ac2e7e551e1fe2dacc103f888f29433ef1ee4947 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Acteur.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Acteur.dcm.xml
@@ -15,5 +15,7 @@
<field name="libQualite" type="string" column="LIB_CPS" length="40" nullable="true"/>
<field name="temoinHDR" type="string" column="TEM_HAB_RCH_PER" length="1" nullable="true"/>
<field name="temoinRapport" type="string" column="TEM_RAP_RECU" length="1" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Doctorant.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Doctorant.dcm.xml
index 3bd02468fd7acccd59cc346af4b438701953af21..0610a5f58e19c7dfafad5b51969116b3b95f2207 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Doctorant.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Doctorant.dcm.xml
@@ -7,5 +7,7 @@
<field name="sourceId" type="string" length="6" column="SOURCE_ID" nullable="true"/>
<field name="individuId" type="string" column="INDIVIDU_ID" nullable="true"/>
<field name="ine" type="string" length="64" column="INE" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
\ No newline at end of file
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.EcoleDoctorale.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.EcoleDoctorale.dcm.xml
index 224bafd2cc7b268b5d6682530c41dfc84b6e987d..d74295df93670b3ab39a5ceafef08ccb5780a073 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.EcoleDoctorale.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.EcoleDoctorale.dcm.xml
@@ -6,5 +6,7 @@
<id name="id" type="string" column="ID" />
<field name="sourceId" type="string" length="64" column="SOURCE_ID" nullable="true"/>
<field name="structureId" type="string" length="64" column="STRUCTURE_ID" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Etablissement.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Etablissement.dcm.xml
index 0f86389dd4598583c33bed263b26cbd492819877..ac897efb04e3621cb66ef0d556f5ae89b9b62787 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Etablissement.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Etablissement.dcm.xml
@@ -7,5 +7,7 @@
<field name="sourceId" type="string" length="64" column="SOURCE_ID" nullable="true"/>
<field name="structureId" type="string" length="64" column="STRUCTURE_ID" nullable="true"/>
<field name="code" type="string" length="64" column="CODE" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Financement.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Financement.dcm.xml
index 8a40e2de28e6060a89cdbffe856a33e6a5f84479..9b2230ea069f6849bb3380100c5c967c8b001683 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Financement.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Financement.dcm.xml
@@ -12,5 +12,7 @@
<field name="quotiteFinancement" type="integer" column="QUOTITE_FINANCEMENT" nullable="true"/>
<field name="dateDebutFinancement" type="datetime" column="DATE_DEBUT_FINANCEMENT" nullable="true"/>
<field name="dateFinFinancement" type="datetime" column="DATE_FIN_FINANCEMENT" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Individu.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Individu.dcm.xml
index 60d4298f5ce370568fefc1b6a58c9475f8617373..708f36b39aea8a2844f31e836f2532a75467a463 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Individu.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Individu.dcm.xml
@@ -16,5 +16,7 @@
<field name="email" column="EMAIL"/>
<field name="dateNaissance" type="datetime" column="DATE_NAI_IND"/>
<field name="nationalite" column="LIB_NAT"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.OrigineFinancement.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.OrigineFinancement.dcm.xml
index a418b2be7fde23040a08a9e55abdf3be730d2148..b626dcae23db49592479ad4795451b91177bd52e 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.OrigineFinancement.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.OrigineFinancement.dcm.xml
@@ -9,5 +9,6 @@
<field name="licOfi" length="10" column="LIC_OFI"/>
<field name="libOfi" length="50" column="LIB_OFI"/>
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
\ No newline at end of file
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Role.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Role.dcm.xml
index 0611b05be6b869bcd2487f830a1cf2cd4ddb145b..3456f7ed300d2330407ce77ec459977ae2fff6a3 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Role.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Role.dcm.xml
@@ -8,5 +8,6 @@
<field name="libLongRole" type="string" length="40" column="LIB_ROJ" nullable="true"/>
<field name="libCourtRole" type="string" length="10" column="LIC_ROJ" nullable="true"/>
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
\ No newline at end of file
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Source.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Source.dcm.xml
index 99ed1acc73d3dde7746971b092870447f958e21b..8a74b0b0d9a29ab0e69bc959f9fd8dd74e56abbb 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Source.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Source.dcm.xml
@@ -7,5 +7,7 @@
<field name="code" type="string" length="6" column="CODE" nullable="true"/>
<field name="libelle" type="string" length="6" column="LIBELLE" nullable="true"/>
<field name="importable" type="integer" column="IMPORTABLE" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
\ No newline at end of file
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Structure.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Structure.dcm.xml
index 7a584d3c019536f50e2a0ca0d0fa4e92842ef4ae..dfa4a193f2e95ec9a25ebc81abb12801068af77c 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Structure.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Structure.dcm.xml
@@ -10,5 +10,7 @@
<field name="libelle" type="string" length="200" column="LIBELLE" nullable="true"/>
<field name="codePays" type="string" length="64" column="CODE_PAYS" nullable="true"/>
<field name="libellePays" type="string" length="200" column="LIBELLE_PAYS" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.These.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.These.dcm.xml
index e2035a13f867d18b0608144e56dd38eb9adefcdb..e34e81f5b6d5c9f41fb2ad29c464318de06ba9c9 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.These.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.These.dcm.xml
@@ -25,5 +25,9 @@
<field name="resultat" type="string" column="COD_NEG_TRE" length="1" nullable="true"/>
<field name="etatReporduction" type="string" column="ETA_RPD_THS" length="1" nullable="true"/>
<field name="correctionAutorisee" type="string" column="CORRECTION_POSSIBLE" length="1" nullable="true"/>
+ <field name="dateAbandon" type="datetime" column="DAT_ABANDON" nullable="true"/>
+ <field name="dateTransfert" type="datetime" column="DAT_TRANSFERT_DEP" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TheseAnneeUniv.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TheseAnneeUniv.dcm.xml
index 887b7d2a10a5d248447e08cbd2632374694e0456..a46c97604f717638311324b7973c20864d1e8fad 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TheseAnneeUniv.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TheseAnneeUniv.dcm.xml
@@ -7,5 +7,7 @@
<field name="sourceId" column="SOURCE_ID"/>
<field name="theseId" column="THESE_ID"/>
<field name="anneeUniv" column="ANNEE_UNIV"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TitreAcces.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TitreAcces.dcm.xml
index d79687a538d7b5316781a737a23b6377da4e5388..20e03540c276e5722b8cbd1a6763d1ef06de1bb4 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TitreAcces.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.TitreAcces.dcm.xml
@@ -12,5 +12,7 @@
<field name="libelleEtabTitreAcces" column="LIBELLE_ETB_TITRE_ACCES" nullable="true"/>
<field name="codeDeptTitreAcces" column="CODE_DEPT_TITRE_ACCES" nullable="true"/>
<field name="codePaysTitreAcces" column="CODE_PAYS_TITRE_ACCES" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.UniteRecherche.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.UniteRecherche.dcm.xml
index cd69b51f50e04c8d273d8cd785cd2c48d812b099..74244f02c4fb471b16a94b22312636aa49127a36 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.UniteRecherche.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.UniteRecherche.dcm.xml
@@ -6,5 +6,7 @@
<id name="id" type="string" column="ID" />
<field name="sourceId" type="string" length="64" column="SOURCE_ID" nullable="true"/>
<field name="structureId" type="string" length="64" column="STRUCTURE_ID" nullable="true"/>
+
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
diff --git a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Variable.dcm.xml b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Variable.dcm.xml
index f8e2f7c36172abbf045249db79d088970a129fe5..da63970bd03724a9abfd951f4853c40238985667 100644
--- a/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Variable.dcm.xml
+++ b/module/ImportData/src/V1/Entity/Db/Mapping/ImportData.V1.Entity.Db.Variable.dcm.xml
@@ -11,5 +11,6 @@
<field name="dateDebValidite" type="date" column="DATE_DEB_VALIDITE" nullable="true"/>
<field name="dateFinValidite" type="date" column="DATE_FIN_VALIDITE" nullable="true"/>
+ <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
</entity>
</doctrine-mapping>
\ No newline at end of file
diff --git a/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php b/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php
index 006b82a9dd3f6d4bf64ad40b7ff3d1360aa66fb6..267e0d8a4b15ae0d69dd760a473a97b8e4692b88 100644
--- a/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php
+++ b/module/ImportData/src/V1/Entity/Db/OrigineFinancement.php
@@ -15,6 +15,8 @@ class OrigineFinancement
protected $licOfi;
protected $libOfi;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -54,4 +56,12 @@ class OrigineFinancement
{
return $this->libOfi;
}
+
+ /**
+ * @return mixed
+ */
+ public function getSourceInsertDate()
+ {
+ return $this->sourceInsertDate;
+ }
}
diff --git a/module/ImportData/src/V1/Entity/Db/Role.php b/module/ImportData/src/V1/Entity/Db/Role.php
index 5724a50d48d7aa1a3b1f83821c8129b5936b38f8..e841149a09a3d60b701ef05adf1600325dcc746c 100644
--- a/module/ImportData/src/V1/Entity/Db/Role.php
+++ b/module/ImportData/src/V1/Entity/Db/Role.php
@@ -14,6 +14,8 @@ class Role
protected $libLongRole;
protected $libCourtRole;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -22,14 +24,6 @@ class Role
return $this->id;
}
- /**
- * @param mixed $id
- */
- public function setId($id)
- {
- $this->id = $id;
- }
-
/**
* @return mixed
*/
@@ -38,14 +32,6 @@ class Role
return $this->sourceId;
}
- /**
- * @param mixed $sourceId
- */
- public function setSourceId($sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return mixed
*/
@@ -54,14 +40,6 @@ class Role
return $this->libLongRole;
}
- /**
- * @param mixed $libLongRole
- */
- public function setLibLongRole($libLongRole)
- {
- $this->libLongRole = $libLongRole;
- }
-
/**
* @return mixed
*/
@@ -71,10 +49,10 @@ class Role
}
/**
- * @param mixed $libCourtRole
+ * @return mixed
*/
- public function setLibCourtRole($libCourtRole)
+ public function getSourceInsertDate()
{
- $this->libCourtRole = $libCourtRole;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Source.php b/module/ImportData/src/V1/Entity/Db/Source.php
index 6e5603960bd80be8a4fc60ac78557d12282669f5..cf36c30cec65d09dcfb4b7adfca00faa8a4fcf8f 100644
--- a/module/ImportData/src/V1/Entity/Db/Source.php
+++ b/module/ImportData/src/V1/Entity/Db/Source.php
@@ -18,6 +18,8 @@ class Source
protected $libelle;
protected $importable;
+ private $sourceInsertDate;
+
/**
* @return int
*/
@@ -26,14 +28,6 @@ class Source
return $this->id;
}
- /**
- * @param int $id
- */
- public function setId($id)
- {
- $this->id = $id;
- }
-
/**
* @return mixed
*/
@@ -42,14 +36,6 @@ class Source
return $this->libelle;
}
- /**
- * @param mixed $libelle
- */
- public function setLibelle($libelle)
- {
- $this->libelle = $libelle;
- }
-
/**
* @return mixed
*/
@@ -58,14 +44,6 @@ class Source
return $this->importable;
}
- /**
- * @param mixed $importable
- */
- public function setImportable($importable)
- {
- $this->importable = $importable;
- }
-
/**
* @return mixed
*/
@@ -75,10 +53,10 @@ class Source
}
/**
- * @param mixed $code
+ * @return mixed
*/
- public function setCode($code)
+ public function getSourceInsertDate()
{
- $this->code = $code;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Structure.php b/module/ImportData/src/V1/Entity/Db/Structure.php
index f3106231b81ca88b3ada430b1b9c69146023975f..fb71382ee9f8da621e9e4475d2654d0fa6e411cb 100644
--- a/module/ImportData/src/V1/Entity/Db/Structure.php
+++ b/module/ImportData/src/V1/Entity/Db/Structure.php
@@ -44,20 +44,8 @@ class Structure
*/
private $libellePays;
+ private $sourceInsertDate;
- /**
- * Set id
- *
- * @param string $id
- *
- * @return Structure
- */
- public function setId($id)
- {
- $this->id = $id;
-
- return $this;
- }
/**
* Get id
@@ -69,20 +57,6 @@ class Structure
return $this->id;
}
- /**
- * Set sourceId
- *
- * @param string $sourceId
- *
- * @return Structure
- */
- public function setSourceId($sourceId)
- {
- $this->sourceId = $sourceId;
-
- return $this;
- }
-
/**
* Get sourceId
*
@@ -93,20 +67,6 @@ class Structure
return $this->sourceId;
}
- /**
- * Set typeStructureId
- *
- * @param string $typeStructureId
- *
- * @return Structure
- */
- public function setTypeStructureId($typeStructureId)
- {
- $this->typeStructureId = $typeStructureId;
-
- return $this;
- }
-
/**
* Get typeStructureId
*
@@ -117,20 +77,6 @@ class Structure
return $this->typeStructureId;
}
- /**
- * Set sigle
- *
- * @param string $sigle
- *
- * @return Structure
- */
- public function setSigle($sigle)
- {
- $this->sigle = $sigle;
-
- return $this;
- }
-
/**
* Get sigle
*
@@ -141,20 +87,6 @@ class Structure
return $this->sigle;
}
- /**
- * Set libelle
- *
- * @param string $libelle
- *
- * @return Structure
- */
- public function setLibelle($libelle)
- {
- $this->libelle = $libelle;
-
- return $this;
- }
-
/**
* Get libelle
*
@@ -165,20 +97,6 @@ class Structure
return $this->libelle;
}
- /**
- * Set codePays
- *
- * @param string $codePays
- *
- * @return Structure
- */
- public function setCodePays($codePays)
- {
- $this->codePays = $codePays;
-
- return $this;
- }
-
/**
* Get codePays
*
@@ -190,26 +108,20 @@ class Structure
}
/**
- * Set libellePays
- *
- * @param string $libellePays
+ * Get libellePays
*
- * @return Structure
+ * @return string
*/
- public function setLibellePays($libellePays)
+ public function getLibellePays()
{
- $this->libellePays = $libellePays;
-
- return $this;
+ return $this->libellePays;
}
/**
- * Get libellePays
- *
- * @return string
+ * @return mixed
*/
- public function getLibellePays()
+ public function getSourceInsertDate()
{
- return $this->libellePays;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/These.php b/module/ImportData/src/V1/Entity/Db/These.php
index 9c9d064b022e6b8f9b0f15f763fac584494ecd24..090dabe2fc8918374a12476a89c2176e4a640a97 100644
--- a/module/ImportData/src/V1/Entity/Db/These.php
+++ b/module/ImportData/src/V1/Entity/Db/These.php
@@ -9,28 +9,32 @@ namespace ImportData\V1\Entity\Db;
*/
class These
{
- protected $id;
- protected $sourceId;
- protected $etatThese;
- protected $doctorantId;
- protected $codeDiscipline;
- protected $libDiscipline;
- protected $title;
- protected $codeLNG;
- protected $datePremiereInsc;
- protected $uniteRechId;
- protected $ecoleDoctId;
- protected $libPaysCotut;
- protected $libEtabCotut;
- protected $temAvenant;
- protected $dateSoutenancePrev;
- protected $temSoutenanceAutorisee;
- protected $dateSoutenanceAutorisee;
- protected $dateSoutenance;
- protected $dateConfidFin;
- protected $resultat;
- protected $etatReporduction;
- protected $correctionAutorisee;
+ private $id;
+ private $sourceId;
+ private $etatThese;
+ private $doctorantId;
+ private $codeDiscipline;
+ private $libDiscipline;
+ private $title;
+ private $codeLNG;
+ private $datePremiereInsc;
+ private $uniteRechId;
+ private $ecoleDoctId;
+ private $libPaysCotut;
+ private $libEtabCotut;
+ private $temAvenant;
+ private $dateSoutenancePrev;
+ private $temSoutenanceAutorisee;
+ private $dateSoutenanceAutorisee;
+ private $dateSoutenance;
+ private $dateConfidFin;
+ private $resultat;
+ private $etatReporduction;
+ private $correctionAutorisee;
+ private $dateAbandon;
+ private $dateTransfert;
+
+ private $sourceInsertDate;
/**
* @return mixed
@@ -207,4 +211,28 @@ class These
{
return $this->correctionAutorisee;
}
+
+ /**
+ * @return mixed
+ */
+ public function getDateAbandon()
+ {
+ return $this->dateAbandon;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getDateTransfert()
+ {
+ return $this->dateTransfert;
+ }
+
+ /**
+ * @return mixed
+ */
+ public function getSourceInsertDate()
+ {
+ return $this->sourceInsertDate;
+ }
}
diff --git a/module/ImportData/src/V1/Entity/Db/TheseAnneeUniv.php b/module/ImportData/src/V1/Entity/Db/TheseAnneeUniv.php
index e7565c0b691aea4f2569905ccbefe4cfc3e23c86..9f5f2660ac8c2f3ece9496b0ba34973879c4f3b6 100644
--- a/module/ImportData/src/V1/Entity/Db/TheseAnneeUniv.php
+++ b/module/ImportData/src/V1/Entity/Db/TheseAnneeUniv.php
@@ -14,6 +14,8 @@ class TheseAnneeUniv
protected $theseId;
protected $anneeUniv;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -46,4 +48,11 @@ class TheseAnneeUniv
return $this->anneeUniv;
}
+ /**
+ * @return mixed
+ */
+ public function getSourceInsertDate()
+ {
+ return $this->sourceInsertDate;
+ }
}
diff --git a/module/ImportData/src/V1/Entity/Db/TitreAcces.php b/module/ImportData/src/V1/Entity/Db/TitreAcces.php
index 80267af7fd60ab49088e88a1e513f39d54df41be..e19f954c1814d6e6915d192862da8b1051c94b56 100644
--- a/module/ImportData/src/V1/Entity/Db/TitreAcces.php
+++ b/module/ImportData/src/V1/Entity/Db/TitreAcces.php
@@ -19,6 +19,8 @@ class TitreAcces
protected $codeDeptTitreAcces;
protected $codePaysTitreAcces;
+ private $sourceInsertDate;
+
/**
* @return mixed
*/
@@ -90,4 +92,12 @@ class TitreAcces
{
return $this->codePaysTitreAcces;
}
+
+ /**
+ * @return mixed
+ */
+ public function getSourceInsertDate()
+ {
+ return $this->sourceInsertDate;
+ }
}
diff --git a/module/ImportData/src/V1/Entity/Db/UniteRecherche.php b/module/ImportData/src/V1/Entity/Db/UniteRecherche.php
index b63265e93aa1f6d7fd3e431f741e693e52e59b5a..df01b5731253cc43088e762f94f6da0ed225fca0 100644
--- a/module/ImportData/src/V1/Entity/Db/UniteRecherche.php
+++ b/module/ImportData/src/V1/Entity/Db/UniteRecherche.php
@@ -24,6 +24,8 @@ class UniteRecherche
*/
private $structureId;
+ private $sourceInsertDate;
+
/**
* @return string
*/
@@ -32,14 +34,6 @@ class UniteRecherche
return $this->id;
}
- /**
- * @param string $id
- */
- public function setId(string $id)
- {
- $this->id = $id;
- }
-
/**
* @return string
*/
@@ -48,14 +42,6 @@ class UniteRecherche
return $this->sourceId;
}
- /**
- * @param string $sourceId
- */
- public function setSourceId(string $sourceId)
- {
- $this->sourceId = $sourceId;
- }
-
/**
* @return string
*/
@@ -65,10 +51,10 @@ class UniteRecherche
}
/**
- * @param string $structureId
+ * @return mixed
*/
- public function setStructureId(string $structureId)
+ public function getSourceInsertDate()
{
- $this->structureId = $structureId;
+ return $this->sourceInsertDate;
}
}
diff --git a/module/ImportData/src/V1/Entity/Db/Variable.php b/module/ImportData/src/V1/Entity/Db/Variable.php
index 4c5ec8098257c36f55437456cfcc41228e2db883..aa299d84354d68558ff84544d256caf52b377b13 100644
--- a/module/ImportData/src/V1/Entity/Db/Variable.php
+++ b/module/ImportData/src/V1/Entity/Db/Variable.php
@@ -20,6 +20,8 @@ class Variable
protected $dateDebValidite;
protected $dateFinValidite;
+ private $sourceInsertDate;
+
/**
* @return int
*/
@@ -28,14 +30,6 @@ class Variable
return $this->id;
}
- /**
- * @param int $id
- */
- public function setId($id)
- {
- $this->id = $id;
- }
-
/**
* @return mixed
*/
@@ -44,14 +38,6 @@ class Variable
return $this->libEtablissement;
}
- /**
- * @param mixed $libEtablissement
- */
- public function setLibEtablissement($libEtablissement)
- {
- $this->libEtablissement = $libEtablissement;
- }
-
/**
* @return mixed
*/
@@ -60,14 +46,6 @@ class Variable
return $this->libResponsable;
}
- /**
- * @param mixed $libResponsable
- */
- public function setLibResponsable($libResponsable)
- {
- $this->libResponsable = $libResponsable;
- }
-
/**
* @return mixed
*/
@@ -76,14 +54,6 @@ class Variable
return $this->libTitre;
}
- /**
- * @param mixed $libTitre
- */
- public function setLibTitre($libTitre)
- {
- $this->libTitre = $libTitre;
- }
-
/**
* @return mixed
*/
@@ -92,14 +62,6 @@ class Variable
return $this->dateDebValidite;
}
- /**
- * @param mixed $dateDebValidite
- */
- public function setDateDebValidite($dateDebValidite)
- {
- $this->dateDebValidite = $dateDebValidite;
- }
-
/**
* @return mixed
*/
@@ -108,14 +70,6 @@ class Variable
return $this->dateFinValidite;
}
- /**
- * @param mixed $dateFinValidite
- */
- public function setDateFinValidite($dateFinValidite)
- {
- $this->dateFinValidite = $dateFinValidite;
- }
-
/**
* @return mixed
*/
@@ -125,10 +79,10 @@ class Variable
}
/**
- * @param mixed $sourceId
+ * @return mixed
*/
- public function setSourceId($sourceId)
+ public function getSourceInsertDate()
{
- $this->sourceId = $sourceId;
+ return $this->sourceInsertDate;
}
}