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

Merge branch 'sygal-import-ws-1.2.2' into develop

parents de2f73d3 c744ae20
Loading
Loading
Loading
Loading
+1 −0
Changes for module/Import/src/Import/Model/Mapping/Import.Model.TmpThese.dcm.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@
        <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="anneeUnivPremiereInsc"     type="integer" column="ANNEE_UNIV_1ERE_INSC"/>
        <field name="dateSoutenancePrev"        type="date" column="DAT_PREV_SOU" nullable="true"/>
        <field name="dateSoutenance"            type="date" column="DAT_SOU_THS" nullable="true"/>

+16 −0
Changes for module/Import/src/Import/Model/Mapping/Import.Model.TmpTheseAnneeUniv.dcm.xml: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                  xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
    <entity name="Import\Model\TmpTheseAnneeUniv" table="TMP_THESE_ANNEE_UNIV">
        <id name="id" type="string" column="ID"/>

        <field name="sourceId" column="SOURCE_ID" nullable="true"/>
        <field name="sourceCode" column="SOURCE_CODE" nullable="true"/>
        <field name="etablissementId" column="ETABLISSEMENT_ID" nullable="true"/>

        <field name="theseId" column="THESE_ID" nullable="true"/>

        <field name="anneeUniv" column="ANNEE_UNIV" nullable="true"/>
    </entity>
</doctrine-mapping>
 No newline at end of file
+5 −0
Changes for module/Import/src/Import/Model/TmpThese.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ class TmpThese
     */
    private $datePremiereInsc;

    /**
     * @var \DateTime
     */
    private $anneeUnivPremiereInsc;

    /**
     * @var \DateTime
     */
+40 −0
Changes for module/Import/src/Import/Model/TmpTheseAnneeUniv.php: 40 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace Import\Model;

/**
 * TmpTheseAnneeUniv
 */
class TmpTheseAnneeUniv
{
    /**
     * @var string
     */
    private $id;

    /**
     * @var string
     */
    private $sourceId;

    /**
     * @var string
     */
    private $sourceCode;

    /**
     * @var string
     */
    private $etablissementId;

    /**
     * @var string
     */
    private $theseId;

    /**
     * @var string
     */
    private $anneeUniv;
}
+1 −0
Changes for module/Import/src/Import/Service/ImportService.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ class ImportService
        'individu',
        'doctorant',
        'these',
        'these-annee-univ',
        'role',
        'acteur',
        'variable',