Commit 3fb6d5b0 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge branch 'master' into alc-tags

# Conflicts:
#	composer.lock
#	module/Enseignement/src/Entity/Db/VolumeHoraire.php
#	module/Enseignement/src/View/Helper/EnseignementsViewHelper.php
#	module/Referentiel/src/View/Helper/ReferentielsViewHelper.php
parents 3808d27c b88a2af2
Loading
Loading
Loading
Loading
+410 −335

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Changes for module/Application/src/Controller/AgrementController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ class AgrementController extends AbstractController
        if ($request->isPost()) {
            $form->setData($request->getPost());
            if ($form->isValid()) {
                $dateDecision = $form->get('dateDecision')->normalizeDate($form->get('dateDecision')->getValue());
                $dateDecision = \DateTime::createFromFormat('Y-m-d', $form->get('dateDecision')->getValue());
                $agreer       = $this->params()->fromPost('agreer', []);

                foreach ($agreer as $a => $val) {
+1 −1
Changes for module/Application/src/Form/Agrement/Saisie.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class AgreementRetourFormHydrator implements HydratorInterface
     */
    public function hydrate(array $data, $object)
    {
        $object->setDateDecision(DateTimeFromString::run($data['dateDecision'] ?? null);
        $object->setDateDecision(DateTimeFromString::run($data['dateDecision'] ?? null));
    }


+1 −2
Changes for module/Application/src/Form/Chargens/DuplicationScenarioForm.php: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Application\Form\Chargens;

use Application\Entity\Db\Scenario;
use Application\Form\AbstractForm;
use Application\Service\Traits\ScenarioServiceAwareTrait;
use UnicaenApp\Util;
@@ -56,8 +57,6 @@ class DuplicationScenarioForm extends AbstractForm
            'attributes' => [
                'id'    => 'scenario',
                'title' => "Scénario ...",
                'class'            => 'selectpicker',
                'data-live-search' => "true",
            ],
            'type'       => 'Select',
        ]);
+1 −1
Changes for module/Application/src/Form/TypeIntervention/TypeInterventionStatutSaisieForm.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ class TypeInterventionStatutSaisieForm extends AbstractForm
        $this->add([
            'name'    => 'taux-hetd-service',
            'options' => [
                'label' => "Taux HETD service",
                'label' => "Taux HETD pour les heures de service",
            ],
            'type'    => 'text',
        ]);
Loading