diff --git a/module/Formation/src/Formation/Controller/PlanDeFormationController.php b/module/Formation/src/Formation/Controller/PlanDeFormationController.php index 2c9a71ced66dde87951ac06d15f3c8aa2b743426..3cb64d218ddb88e06baed0d5080769fc8d248ffe 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 ed718cbad0fafc49e7b82810cacb0b531ebb75c6..d950daf951d59fe2acdc1569a51bf25ba9076022 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 2e57970ba462d18ef3f73a13a24f40667050f664..17244e2ad7421020eb8746fa5862790836cdbb92 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);