diff --git a/module/Application/src/Application/Controller/ExportController.php b/module/Application/src/Application/Controller/ExportController.php index b35a7932bd3f20be5e68dd817a7692d7af9a5da1..f245687d253db299c3e7225184ecd81c15cb17bd 100644 --- a/module/Application/src/Application/Controller/ExportController.php +++ b/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(); }, diff --git a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.These.dcm.xml b/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.These.dcm.xml index 683409d7a9c7a56f6bb72c45edfcf91e334bacc1..364a890adda6beeb46337b1c0dd3f467915a4236 100644 --- a/module/Application/src/Application/Entity/Db/Mapping/Application.Entity.Db.These.dcm.xml +++ b/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"/> diff --git a/module/Application/src/Application/Entity/Db/These.php b/module/Application/src/Application/Entity/Db/These.php index a5cf586a49a1e0d32ffa851515a7bdcb9031874d..132ee4d5e4bef8343ae04a23bd9d9412dfab6572 100644 --- a/module/Application/src/Application/Entity/Db/These.php +++ b/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 */ diff --git a/module/Application/view/application/these/identite.phtml b/module/Application/view/application/these/identite.phtml index c35ed6290483cfcb1b79f6ea45ba30699770d830..d41a49dc1b0283b60badaf058cb4a8309aef7de7 100644 --- a/module/Application/view/application/these/identite.phtml +++ b/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> diff --git a/module/Import/src/Import/Model/Mapping/Import.Model.TmpThese.dcm.xml b/module/Import/src/Import/Model/Mapping/Import.Model.TmpThese.dcm.xml index 07c1eca8fcc0365a1c177d32a86b6ed03e853fb6..7a38f90e4442c1b876c4ae3926a871e55a23eb7d 100644 --- a/module/Import/src/Import/Model/Mapping/Import.Model.TmpThese.dcm.xml +++ b/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"/> diff --git a/module/Import/src/Import/Model/TmpThese.php b/module/Import/src/Import/Model/TmpThese.php index 86833dcf0e93da41627825f8cf589a83dd16cd18..3acc2544a98cd4b1f115cbea00dc74626a2ede87 100644 --- a/module/Import/src/Import/Model/TmpThese.php +++ b/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 */