Merge branch 'date_abandon' into release-1.4.0

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

@@ -82,6 +82,8 @@ class ExportController extends AbstractController
 
             //Dates
             'Date de première inscription'          => function (These $these) { return $these->getDatePremiereInscription(); },
+            "Date d'abandon"                        => function (These $these) { return $these->getDateAbandon(); },
+            'Date de transfert'                     => function (These $these) { return $these->getDateTransfert(); },
             '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(); },

module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.These.dcm.xml

@@ -16,6 +16,8 @@
         <field name="datePrevisionSoutenance" type="datetime" column="DATE_PREV_SOUTENANCE" nullable="true"/>
         <field name="dateSoutenance" type="datetime" column="DATE_SOUTENANCE" nullable="true"/>
         <field name="dateFinConfidentialite" type="datetime" column="DATE_FIN_CONFID" nullable="true"/>
+        <field name="dateAbandon" type="datetime" column="DATE_ABANDON" nullable="true"/>
+        <field name="dateTransfert" type="datetime" column="DATE_TRANSFERT" nullable="true"/>
         <field name="codeUniteRecherche" type="string" column="COD_UNIT_RECH" length="50" nullable="true"/>
         <field name="libelleUniteRecherche" type="string" column="LIB_UNIT_RECH" length="200" nullable="true"/>
         <field name="correctionAutorisee" type="string" column="CORREC_AUTORISEE" nullable="true"/>

module/Application/src/Application/Entity/Db/These.php

@@ -125,6 +125,16 @@ class These implements HistoriqueAwareInterface, ResourceInterface
      */
     protected $dateFinConfidentialite;
 
+    /**
+     * @var DateTime|null
+     */
+    protected $dateAbandon;
+
+    /**
+     * @var DateTime|null
+     */
+    protected $dateTransfert;
+
     /**
      * @var string
      */
@@ -451,6 +461,60 @@ class These implements HistoriqueAwareInterface, ResourceInterface
         return $this;
     }
 
+    /**
+     * @return DateTime|null
+     */
+    public function getDateAbandon()
+    {
+        return $this->dateAbandon;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDateAbandonToString(): string
+    {
+        return Util::formattedDate($this->getDateAbandon());
+    }
+
+    /**
+     * @param DateTime|null $dateAbandon
+     * @return These
+     */
+    public function setDateAbandon(DateTime $dateAbandon = null): These
+    {
+        $this->dateAbandon = $dateAbandon;
+
+        return $this;
+    }
+
+    /**
+     * @return DateTime|null
+     */
+    public function getDateTransfert()
+    {
+        return $this->dateTransfert;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDateTransfertToString(): string
+    {
+        return Util::formattedDate($this->getDateTransfert());
+    }
+
+    /**
+     * @param DateTime|null $dateTransfert
+     * @return These
+     */
+    public function setDateTransfert(DateTime $dateTransfert = null): These
+    {
+        $this->dateTransfert = $dateTransfert;
+
+        return $this;
+    }
+
     /**
      * @return string
      */

module/Application/view/application/these/identite.phtml

@@ -323,6 +323,16 @@ $financementFormatter->setDisplayAs(FinancementFormatter::DISPLAY_AS_LINE);
             <dt>Années universitaires<br>d'inscription</dt>
             <dd><?php echo $these->getAnneesUnivInscriptionToString('<br>') ?: "(Non renseignée)" ?></dd>
 
+            <?php if ($these->getDateAbandon()): ?>
+            <dt>Date d'abandon</dt>
+            <dd><?php echo $these->getDateAbandonToString() ?></dd>
+            <?php endif ?>
+
+            <?php if ($these->getDateTransfert()): ?>
+            <dt>Date de transfert
+            <dd><?php echo $these->getDateTransfertToString() ?></dd>
+            <?php endif ?>
+
             <?php if ($these->getSoutenanceAutorisee()): ?>
                 <dt>Soutenance autorisée</dt>
                 <dd><?php echo $these->getSoutenanceAutorisee() === 'O' ? "Oui" : "Non" ?></dd>

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

@@ -17,6 +17,8 @@
         <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="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/Model/TmpThese.php

@@ -62,6 +62,16 @@ class TmpThese
      */
     private $dateSoutenance;
 
+    /**
+     * @var \DateTime
+     */
+    private $dateAbandon;
+
+    /**
+     * @var \DateTime
+     */
+    private $dateTransfert;
+
     /**
      * @var string
      */