Skip to content
Snippets Groups Projects
Commit d947bf6a authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Possibilité d'importer les dates d'abandon et de de transfert des thèses

parent a95e08c2
No related branches found
No related tags found
No related merge requests found
...@@ -81,6 +81,8 @@ class ExportController extends AbstractController ...@@ -81,6 +81,8 @@ class ExportController extends AbstractController
}, },
//Dates //Dates
'Date de première inscription' => function (These $these) { return $these->getDatePremiereInscription(); }, '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 prévisionnel de soutenance' => function (These $these) { return $these->getDatePrevisionSoutenance(); },
'Date de soutenance' => function (These $these) { return $these->getDateSoutenance(); }, 'Date de soutenance' => function (These $these) { return $these->getDateSoutenance(); },
'Date de fin de confientialité' => function (These $these) { return $these->getDateFinConfidentialite(); }, 'Date de fin de confientialité' => function (These $these) { return $these->getDateFinConfidentialite(); },
......
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<field name="datePrevisionSoutenance" type="datetime" column="DATE_PREV_SOUTENANCE" nullable="true"/> <field name="datePrevisionSoutenance" type="datetime" column="DATE_PREV_SOUTENANCE" nullable="true"/>
<field name="dateSoutenance" type="datetime" column="DATE_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="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="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="libelleUniteRecherche" type="string" column="LIB_UNIT_RECH" length="200" nullable="true"/>
<field name="correctionAutorisee" type="string" column="CORREC_AUTORISEE" nullable="true"/> <field name="correctionAutorisee" type="string" column="CORREC_AUTORISEE" nullable="true"/>
......
...@@ -125,6 +125,16 @@ class These implements HistoriqueAwareInterface, ResourceInterface ...@@ -125,6 +125,16 @@ class These implements HistoriqueAwareInterface, ResourceInterface
*/ */
protected $dateFinConfidentialite; protected $dateFinConfidentialite;
/**
* @var DateTime|null
*/
protected $dateAbandon;
/**
* @var DateTime|null
*/
protected $dateTransfert;
/** /**
* @var string * @var string
*/ */
...@@ -451,6 +461,60 @@ class These implements HistoriqueAwareInterface, ResourceInterface ...@@ -451,6 +461,60 @@ class These implements HistoriqueAwareInterface, ResourceInterface
return $this; 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 * @return string
*/ */
......
...@@ -323,6 +323,16 @@ $financementFormatter->setDisplayAs(FinancementFormatter::DISPLAY_AS_LINE); ...@@ -323,6 +323,16 @@ $financementFormatter->setDisplayAs(FinancementFormatter::DISPLAY_AS_LINE);
<dt>Années universitaires<br>d'inscription</dt> <dt>Années universitaires<br>d'inscription</dt>
<dd><?php echo $these->getAnneesUnivInscriptionToString('<br>') ?: "(Non renseignée)" ?></dd> <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()): ?> <?php if ($these->getSoutenanceAutorisee()): ?>
<dt>Soutenance autorisée</dt> <dt>Soutenance autorisée</dt>
<dd><?php echo $these->getSoutenanceAutorisee() === 'O' ? "Oui" : "Non" ?></dd> <dd><?php echo $these->getSoutenanceAutorisee() === 'O' ? "Oui" : "Non" ?></dd>
......
...@@ -17,6 +17,8 @@ ...@@ -17,6 +17,8 @@
<field name="datePremiereInsc" type="date" column="DAT_DEB_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="dateSoutenancePrev" type="date" column="DAT_PREV_SOU" nullable="true"/>
<field name="dateSoutenance" type="date" column="DAT_SOU_THS" 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="etatThese" type="string" column="ETA_THS" length="20" nullable="true"/>
<field name="libDiscipline" type="string" column="LIB_INT1_DIS" length="200" nullable="true"/> <field name="libDiscipline" type="string" column="LIB_INT1_DIS" length="200" nullable="true"/>
......
...@@ -62,6 +62,16 @@ class TmpThese ...@@ -62,6 +62,16 @@ class TmpThese
*/ */
private $dateSoutenance; private $dateSoutenance;
/**
* @var \DateTime
*/
private $dateAbandon;
/**
* @var \DateTime
*/
private $dateTransfert;
/** /**
* @var string * @var string
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment