diff --git a/module/Oscar/src/Oscar/Controller/ProjectGrantController.php b/module/Oscar/src/Oscar/Controller/ProjectGrantController.php index fe67d99bf0d337985ea264b656c9b2daaa097151..4c8c7cc7ca2f0b479d7d6a0bd533a0e7f68fec20 100644 --- a/module/Oscar/src/Oscar/Controller/ProjectGrantController.php +++ b/module/Oscar/src/Oscar/Controller/ProjectGrantController.php @@ -1165,6 +1165,7 @@ class ProjectGrantController extends AbstractOscarController implements UseNotif /** Export les données en CSV. */ public function csvAction() { + /** @var Request $request */ $request = $this->getRequest(); diff --git a/module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php b/module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php index 1636f12111857eaea4e8ce8560dcb67c4de44cfa..5af9852a72e7d9d910d3ec847e6fbf5e1deaed39 100644 --- a/module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php +++ b/module/Oscar/src/Oscar/Strategy/Activity/ExportDatas.php @@ -33,16 +33,22 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic { use UseOscarConfigurationServiceTrait, UseProjectGrantServiceTrait, UseEntityManagerTrait, UseOscarUserContextServiceTrait; + private ?string $rewriteDateFormat = null; /** * ExportDatas constructor. */ - public function __construct( ProjectGrantService $pgs, OscarUserContext $ouc) + public function __construct( ProjectGrantService $pgs, OscarUserContext $ouc, ?string $rewriteDateFormat = null) { $this->setProjectGrantService($pgs); $this->setOscarConfigurationService($pgs->getOscarConfigurationService()); $this->setEntityManager($pgs->getEntityManager()); $this->setOscarUserContextService($ouc); + if( $rewriteDateFormat === null ){ + $this->rewriteDateFormat = $this->getOscarConfigurationService()->getExportDateFormat(); + } else { + $this->rewriteDateFormat = $rewriteDateFormat; + } } public function output( $paramID, $fields = null, $perimeter = null ){ @@ -51,7 +57,7 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic $separator = $this->getOscarConfigurationService()->getExportSeparator(); // Format des dates - $dateFormat = 'Y-m-d'; // $this->getOscarConfigurationService()->getExportDateFormat(); + $dateFormat = $this->rewriteDateFormat; $parameters = []; @@ -227,9 +233,7 @@ class ExportDatas implements UseOscarConfigurationService, UseProjectGrantServic $jalonKey = $mil->getType()->getLabel(); - $jalonsCurrent[$jalonKey][] = $mil->getDateStart() ? - $mil->getDateStart()->format($dateFormat) : - ''; + $jalonsCurrent[$jalonKey][] = $mil->getDateStartStr($dateFormat); if( array_key_exists($jalonKey, $jalonsFaitCurrent) ){ // Calcule de l'état du jalon