Commit eb647fcd authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'hotfix_refresh_these' into release_3.0.2

parents 77eb1f3d 23951791

CHANGELOG.md

+5 −1
Changes for CHANGELOG.md: 5 added lines, 1 removed line.
Original line number Diff line number Diff line 
Journal des modifications

=========================



3.0.2

3.0.3

-----

- Ajout d'une valeur d'état aux soutenances "Validée par l'établissement" post validation d'une soutenance par la présidence de l'établissement

- [FIX] Plus de demande de justificatif pour la confidentialité si la demande est faite en amont de la soutenance

- [FIX] La notif de validation de la version corrigée par le Président du jury faisait mention à tort du Directeur de thèse.



3.0.2

-----

- [FIX] Correction du plantage lors du réimport ponctuel d'une thèse.



3.0.1

-----

- Renommage de l'application en ESUP-SyGAL.

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

+7 −7
Changes for module/Import/src/Import/Model/Mapping/Import.Model.TmpThese.dcm.xml: 7 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
        <field name="uniteRechId"               type="string" column="UNITE_RECH_ID" length="64" nullable="true"/>

        <field name="title"                     type="string" column="LIB_THS" length="2048" nullable="true"/>



        <field name="dateSoutenanceAutorisee"   type="date" column="DAT_AUT_SOU_THS" nullable="true"/>

        <field name="dateConfidFin"             type="date" column="DAT_FIN_CFD_THS" nullable="true"/>

        <field name="datePremiereInsc"          type="date" column="DAT_DEB_THS" nullable="true"/>

        <field name="dateSoutenancePrev"        type="date" column="DAT_PREV_SOU" nullable="true"/>

        <field name="dateSoutenance"            type="date" column="DAT_SOU_THS" nullable="true"/>

        <field name="dateAbandon"               type="date" column="DAT_ABANDON" nullable="true"/>

        <field name="dateTransfert"             type="date" column="DAT_TRANSFERT_DEP" nullable="true"/>

        <field name="dateSoutenanceAutorisee"   type="datetime" column="DAT_AUT_SOU_THS" nullable="true"/>

        <field name="dateConfidFin"             type="datetime" column="DAT_FIN_CFD_THS" nullable="true"/>

        <field name="datePremiereInsc"          type="datetime" column="DAT_DEB_THS" nullable="true"/>

        <field name="dateSoutenancePrev"        type="datetime" column="DAT_PREV_SOU" nullable="true"/>

        <field name="dateSoutenance"            type="datetime" column="DAT_SOU_THS" 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="etatThese"                 type="string" column="ETA_THS" length="20" nullable="true"/>

        <field name="libDiscipline"             type="string" column="LIB_INT1_DIS" length="200" nullable="true"/>

module/Import/src/Import/Service/ImportService.php

+8 −7
Changes for module/Import/src/Import/Service/ImportService.php: 8 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -279,25 +279,26 @@ class ImportService 
         */

        $quotifier = function($v) { return "'$v'"; };

        $sqlFilterIndividu = sprintf("SOURCE_CODE IN (%s)", implode(', ', array_map($quotifier, $sourceCodeIndividus)));

        $this->synchroService->addService('these',

        $serviceNameSuffix = '-' . $these->getEtablissement()->getCode();

        $this->synchroService->addService('these' . $serviceNameSuffix,

            ['sql_filter' => "SOURCE_CODE = '$sourceCodeThese'"]

        );

        $this->synchroService->addService('doctorant',

        $this->synchroService->addService('doctorant' . $serviceNameSuffix,

            ['sql_filter' => "SOURCE_CODE = '$sourceCodeDoctorant'"]

        );

        $this->synchroService->addService('individu',

        $this->synchroService->addService('individu' . $serviceNameSuffix,

            ['sql_filter' => "SOURCE_CODE = '$sourceCodeIndividu'"]

        );

        $this->synchroService->addService('acteur',

        $this->synchroService->addService('acteur' . $serviceNameSuffix,

            ['sql_filter' => "THESE_ID = '$theseId'"]

        );

        $this->synchroService->addService('individu',

        $this->synchroService->addService('individu' . $serviceNameSuffix,

            ['sql_filter' => $sqlFilterIndividu]

        );

        $this->synchroService->addService('ecole-doctorale',

        $this->synchroService->addService('ecole-doctorale' . $serviceNameSuffix,

            ['sql_filter' => "SOURCE_CODE = '$sourceCodeEcoleDoct'"]

        );

        $this->synchroService->addService('unite-recherche',

        $this->synchroService->addService('unite-recherche' . $serviceNameSuffix,

            ['sql_filter' => "SOURCE_CODE = '$sourceCodeUniteRech'"]

        );

        $this->synchroService->synchronize();