From 5849908c920a0ec75dc3ca1a1b999b5da52c48e7 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Metivier <jean-philippe.metivier@unicaen.fr> Date: Thu, 28 Nov 2024 14:45:16 +0100 Subject: [PATCH] module/Formation --- .../src/Formation/Controller/PlanDeFormationController.php | 2 +- module/Formation/src/Formation/Form/Session/SessionForm.php | 4 +--- .../Formation/src/Formation/Form/Session/SessionHydrator.php | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/module/Formation/src/Formation/Controller/PlanDeFormationController.php b/module/Formation/src/Formation/Controller/PlanDeFormationController.php index 2c9a71ce..3cb64d21 100644 --- a/module/Formation/src/Formation/Controller/PlanDeFormationController.php +++ b/module/Formation/src/Formation/Controller/PlanDeFormationController.php @@ -451,7 +451,7 @@ class PlanDeFormationController extends AbstractActionController } $description = $line[$descriptionColumn]; - $objectif = $line[$descriptionColumn]; + $objectif = $line[$objectifColumn]; $programme = $line[$programmeColumn]; $modalite = trim($line[$modaliteColumn]); $prerequis = $line[$prerequisColumn]; diff --git a/module/Formation/src/Formation/Form/Session/SessionForm.php b/module/Formation/src/Formation/Form/Session/SessionForm.php index ed718cba..d950daf9 100644 --- a/module/Formation/src/Formation/Form/Session/SessionForm.php +++ b/module/Formation/src/Formation/Form/Session/SessionForm.php @@ -4,7 +4,7 @@ namespace Formation\Form\Session; use Formation\Entity\Db\Session; use Laminas\Form\Element\Button; -use Laminas\Form\Element\DateTime; +use Laminas\Form\Element\Date; use Laminas\Form\Element\Number; use Laminas\Form\Element\Select; use Laminas\Form\Element\Text; @@ -12,7 +12,6 @@ use Laminas\Form\Element\Textarea; use Laminas\Form\Form; use Laminas\InputFilter\Factory; use Laminas\Validator\Regex; -use UnicaenApp\Form\Element\Date; class SessionForm extends Form { @@ -64,7 +63,6 @@ class SessionForm extends Form 'options' => [ 'label' => "Date de clĂ´ture des inscriptions :", 'label_options' => [ 'disable_html_escape' => true, ], - 'format' => 'd/m/Y', ], 'attributes' => [ 'id' => 'date_cloture_inscription', diff --git a/module/Formation/src/Formation/Form/Session/SessionHydrator.php b/module/Formation/src/Formation/Form/Session/SessionHydrator.php index 2e57970b..17244e2a 100644 --- a/module/Formation/src/Formation/Form/Session/SessionHydrator.php +++ b/module/Formation/src/Formation/Form/Session/SessionHydrator.php @@ -12,7 +12,7 @@ class SessionHydrator implements HydratorInterface public function extract(object $object) : array { /** @var Session $object */ - $dateClotureInscription = ($object AND $object->getDateClotureInscription()) ? $object->getDateClotureInscription()->format('d/m/Y') : null; + $dateClotureInscription = ($object AND $object->getDateClotureInscription()) ? $object->getDateClotureInscription()->format('Y-m-d') : null; /** @var Session $object */ $data = [ 'description' => ($object AND $object->getComplement()) ?: null, @@ -43,7 +43,7 @@ class SessionHydrator implements HydratorInterface $coutVacation = (isset($data['cout_vacation']) and trim($data['cout_vacation']) !== "") ? trim($data['cout_vacation']) : null; $recetteTtc = (isset($data['recette_ttc']) and trim($data['recette_ttc']) !== "") ? trim($data['recette_ttc']) : null; - $dateClotureInscription = (isset($data['date_cloture_inscription']) AND $data['date_cloture_inscription'] !== "") ? DateTime::createFromFormat('d/m/Y H:i:s', $data['date_cloture_inscription'] . " 23:59:59") : null; + $dateClotureInscription = (isset($data['date_cloture_inscription']) AND $data['date_cloture_inscription'] !== "") ? DateTime::createFromFormat('Y-m-d H:i:s', $data['date_cloture_inscription'] . " 23:59:59") : null; /** @var Session $object */ $object->setComplement($description); -- GitLab