Commit ac9feaff authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE into missions

# Conflicts:
#	data/ddl/package/OSE_WORKFLOW/body.sql
#	public/css/app.css.map
parents 144e1fd1 222b0b89
Loading
Loading
Loading
Loading
+1
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@
* Le plafond relatif aux charges / services saisis est maintenant opérationnel
* Lors de la saisie d'enseignement, les elements pedagogique sur lesquels il est impossible de saisir des heures seront surlignés en rouge
* Il est de nouveau possible de saisir des taux de charge TTC et des taux de charge patronale a virgule
* Modification du filtre des status séléctionnables dans les données personnelles (#48151)

## Notes de mise à jour

+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