Merge branch 'release-1.4.1'

CHANGELOG.md

 Journal des modifications
 =========================
 
+1.4.1 (24/01/2020)
+------------------
+
+- Les dates d'insertion des données dans les tables `SYGAL_*` de chaque établissement 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.4.0 (23/01/2020)
 ------------------
 

config/autoload/version.global.php

@@ -2,9 +2,9 @@
 return [
     'unicaen-app' => [
         'app_infos' => [
-            'version' => '1.4.0',
-            'date' => '15/01/2020',
+            'version' => '1.4.1',
+            'date' => '24/01/2020',
         ],
     ],
-    'comment' => 'Fichier généré le 15/01/2020 à 09:22:35 avec /home/gauthierb/workspace/sygal/bump-version',
+    'comment' => 'Fichier généré le 24/01/2020 à 12:14:35 avec /home/gauthierb/workspace/sygal/bump-version',
 ];

doc/release-notes/v1.4.1.md

+# Version 1.4.1
+
+## 1. Sur le serveur d'application
+  
+- Placez-vous dans le répertoire de l'application puis lancez la commande suivante 
+pour installer la nouvelle version :
+
+```bash
+git fetch --tags && git checkout --force 1.4.1 && \
+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`
+
+## 2. Dans la base de données
+
+Il faut ajouter une colonne `SOURCE_INSERT_DATE` dans chacune des tables `TMP_*` pour importer les dates d'insertion 
+des données dans les tables `SYGAL_*` des établissements : 
+
+```sql
+alter table TMP_ACTEUR              add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_DOCTORANT           add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_ECOLE_DOCT          add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_ETABLISSEMENT       add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_FINANCEMENT         add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_INDIVIDU            add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_ORIGINE_FINANCEMENT add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_ROLE                add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_STRUCTURE           add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_THESE               add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_THESE_ANNEE_UNIV    add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_TITRE_ACCES         add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_UNITE_RECH          add SOURCE_INSERT_DATE DATE default sysdate ;
+alter table TMP_VARIABLE            add SOURCE_INSERT_DATE DATE default sysdate ;
+
+alter table TMP_ACTEUR              modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_DOCTORANT           modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_ECOLE_DOCT          modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_ETABLISSEMENT       modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_FINANCEMENT         modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_INDIVIDU            modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_ORIGINE_FINANCEMENT modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_ROLE                modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_STRUCTURE           modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_THESE               modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_THESE_ANNEE_UNIV    modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_TITRE_ACCES         modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_UNITE_RECH          modify SOURCE_INSERT_DATE NOT NULL ;
+alter table TMP_VARIABLE            modify SOURCE_INSERT_DATE NOT NULL ;
+```

module/Application/src/Application/Controller/ExportController.php

@@ -87,8 +87,8 @@ class ExportController extends AbstractController
             'Date de prévisionnel de soutenance'    => function (These $these) { return $these->getDatePrevisionSoutenance(); },
             'Date de soutenance'                    => function (These $these) { return $these->getDateSoutenance(); },
             'Date de fin de confientialité'         => function (These $these) { return $these->getDateFinConfidentialite(); },
-            'Date de dépôt version initiale'        => function (These $these) { $file = $these->hasVersionInitiale(); if ($file) return $file->getFichier()->getHistoCreation()->format('d/m/Y'); },
-            'Date de dépôt version corigée'         => function (These $these) { $file = $these->hasVersionCorrigee(); if ($file) return $file->getFichier()->getHistoCreation()->format('d/m/Y'); },
+            'Date de dépôt version initiale'        => function (These $these) { $file = $these->hasVersionInitiale(); if ($file) return $file->getFichier()->getHistoCreation()->format('d/m/Y'); return "";},
+            'Date de dépôt version corigée'         => function (These $these) { $file = $these->hasVersionCorrigee(); if ($file) return $file->getFichier()->getHistoCreation()->format('d/m/Y'); return "";},
             'Durée en mois de la thèse'             => function (These $these) { if ($these->getDatePremiereInscription() !== null AND $these->getDateSoutenance() !== null)
                 return number_format(($these->getDateSoutenance())->diff($these->getDatePremiereInscription())->format('%a')/30.5, 2);
             else return "";

module/Import/src/Import/Model/Mapping/Import.Model.TmpActeur.dcm.xml

@@ -18,5 +18,6 @@
         <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="sourceCode"                type="string"   column="SOURCE_CODE"                length="64"     nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpDoctorant.dcm.xml

@@ -10,5 +10,6 @@
         <field name="individuId"        type="string" column="INDIVIDU_ID" length="64" nullable="true"/>
         <field name="ine"               type="string" column="INE" length="64" nullable="true"/>
         <field name="sourceCode"        type="string" column="SOURCE_CODE"      length="64"     nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpEcoleDoctorale.dcm.xml

@@ -8,5 +8,6 @@
         <field name="sourceId"          type="string"   column="SOURCE_ID"           length="64"    nullable="true"/>
         <field name="sourceCode"        type="string"   column="SOURCE_CODE"         length="64"    nullable="true"/>
         <field name="structureId"       type="string"   column="STRUCTURE_ID"        length="64"    nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>

module/Import/src/Import/Model/Mapping/Import.Model.TmpEtablissement.dcm.xml

@@ -8,5 +8,6 @@
         <field name="sourceId"          type="string"   column="SOURCE_ID"           length="64"    nullable="true"/>
         <field name="sourceCode"        type="string"   column="SOURCE_CODE"         length="64"    nullable="true"/>
         <field name="structureId"       type="string"   column="STRUCTURE_ID"        length="64"    nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>

module/Import/src/Import/Model/Mapping/Import.Model.TmpFinancement.dcm.xml

@@ -14,5 +14,6 @@
         <field name="quotiteFinancement" column="QUOTITE_FINANCEMENT" nullable="true"/>
         <field name="dateDebutFinancement" type="date" column="DATE_DEBUT_FINANCEMENT" nullable="true"/>
         <field name="dateFinFinancement" type="date" column="DATE_FIN_FINANCEMENT" nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>

module/Import/src/Import/Model/Mapping/Import.Model.TmpIndividu.dcm.xml

@@ -18,5 +18,6 @@
         <field name="dateNaissance" type="date" column="DAT_NAI_PER" nullable="true"/>
         <field name="nationalite" column="LIB_NAT" nullable="true"/>
         <field name="sourceCode" column="SOURCE_CODE" nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpOrigineFinancement.dcm.xml

@@ -10,6 +10,6 @@
         <field name="codOfi" length="8" column="COD_OFI"/>
         <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

module/Import/src/Import/Model/Mapping/Import.Model.TmpRole.dcm.xml

@@ -10,5 +10,6 @@
         <field name="libLongRole"       type="string"   column="LIB_ROJ"            length="200"    nullable="true"/>
         <field name="libCourtRole"      type="string"   column="LIC_ROJ"            length="50"     nullable="true"/>
         <field name="sourceCode"        type="string" column="SOURCE_CODE"      length="64"     nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpSource.dcm.xml

@@ -10,5 +10,6 @@
         <field name="libelle"           type="string"   column="LIBELLE" length="128" nullable="true"/>
         <field name="importable"        type="integer"  column="IMPORTABLE" nullable="true"/>
         <field name="sourceCode"        type="string" column="SOURCE_CODE"      length="64"     nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpStructure.dcm.xml

@@ -12,6 +12,6 @@
         <field name="libelle"           type="string"   column="LIBELLE"             length="128"   nullable="true"/>
         <field name="codePays"          type="string"   column="CODE_PAYS"           length="128"   nullable="true"/>
         <field name="libellePays"       type="string"   column="LIBELLE_PAYS"        length="128"   nullable="true"/>
-
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>

module/Import/src/Import/Model/Mapping/Import.Model.TmpThese.dcm.xml

@@ -30,5 +30,6 @@
         <field name="temAvenant"                type="string" column="TEM_AVENANT_COTUT" length="1" nullable="true"/>
         <field name="temSoutenanceAutorisee"    type="string" column="TEM_SOU_AUT_THS" length="1" nullable="true"/>
         <field name="sourceCode"                type="string" column="SOURCE_CODE"      length="64"     nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpTheseAnneeUniv.dcm.xml

@@ -12,5 +12,7 @@
         <field name="theseId" column="THESE_ID" nullable="true"/>
 
         <field name="anneeUniv" column="ANNEE_UNIV" nullable="true"/>
+
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpTitreAcces.dcm.xml

@@ -14,5 +14,6 @@
         <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>
\ No newline at end of file

module/Import/src/Import/Model/Mapping/Import.Model.TmpUniteRecherche.dcm.xml

@@ -8,5 +8,6 @@
         <field name="sourceId"          type="string"   column="SOURCE_ID"           length="64"    nullable="true"/>
         <field name="sourceCode"        type="string"   column="SOURCE_CODE"         length="64"    nullable="true"/>
         <field name="structureId"       type="string"   column="STRUCTURE_ID"        length="64"    nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>

module/Import/src/Import/Model/Mapping/Import.Model.TmpVariable.dcm.xml

@@ -12,5 +12,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="sourceCode"            type="string" column="SOURCE_CODE"      length="64"     nullable="true"/>
+        <field name="sourceInsertDate" type="datetime" column="SOURCE_INSERT_DATE"/>
     </entity>
 </doctrine-mapping>
\ No newline at end of file

module/Import/src/Import/Model/TmpActeur.php

@@ -77,6 +77,11 @@ class TmpActeur
      */
     private $id;
 
+    /**
+     * @var \DateTime
+     */
+    private $sourceInsertDate;
+
     /**
      * @return string
      */