Commit 8805bdb1 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Bug Rouen

parent 0bd8f583

module/Enseignement/src/Controller/EnseignementController.php

+5 −2
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ class EnseignementController extends AbstractController 
            $title = "Ajout d'enseignement";

        }



        $saved = null;



        $form->get('service')->setIntervenant($intervenant);

        $form->get('service')->removeUnusedElements();

        $hDeb    = $service->getVolumeHoraireListe()->getHeures();
@@ -186,7 +188,8 @@ class EnseignementController extends AbstractController 
                    $form->saveToContext();

                    $this->getProcessusPlafond()->beginTransaction();

                    try {

                        $this->getServiceService()->save($service);

                        $service = $this->getServiceService()->save($service);

                        $saved = $service;

                        $form->get('service')->get('id')->setValue($service->getId()); // transmet le nouvel ID

                        $hFin = $service->getVolumeHoraireListe()->getHeures();

                        $this->updateTableauxBord($service->getIntervenant());
@@ -205,7 +208,7 @@ class EnseignementController extends AbstractController 


        $vm = new ViewModel();

        $vm->setTemplate('enseignement/saisie');

        $vm->setVariables(compact('form', 'title'));

        $vm->setVariables(compact('form', 'title', 'saved'));



        return $vm;

    }

module/Enseignement/src/View/Helper/EnseignementSaisieFormViewHelper.php

+3 −3
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ class EnseignementSaisieFormViewHelper extends AbstractHtmlElement 
    public function renderVolumesHoraires()

    {

        $intervenant = $this->getServiceLocalContext()->getIntervenant();

        if (!$this->getServiceContext()->isModaliteServicesSemestriel($intervenant)) {

            return null;

        }

//        if (!$this->getServiceContext()->isModaliteServicesSemestriel($intervenant)) {

//            return null;

//        }



        $res = '';

        if ($this->isEnseignementChoisi()) {

module/Enseignement/view/enseignement/saisie.phtml

+9 −0
Original line number Diff line number Diff line
@@ -2,10 +2,19 @@ 


/**

 * @var $this \Application\View\Renderer\PhpRenderer

 * @var $saved \Enseignement\Entity\Db\Service|null

 */



echo $this->enseignementSaisieForm($form)->render();



echo $this->formErrors($form);



if ($saved && $saved->getId()){

    ?>

    <script>

        $("body").trigger('enseignement-after-saisie', <?= $saved->getId() ?>);

    </script>

    <?php

}



echo $this->messenger()->addCurrentMessagesFromFlashMessenger();
 
 No newline at end of file

public/js/service.js

+4 −3
Original line number Diff line number Diff line
@@ -282,10 +282,11 @@ $.widget("ose.enseignements", { 
                    serviceId = data[i].value;

                }

            }

            // if (serviceId) {

            that.onAfterSaisie(serviceId);

            // }

            //that.onAfterSaisie(serviceId);

        });



        $("body").on('enseignement-after-saisie', function(event, serviceId){

            that.onAfterSaisie(serviceId);

        });



        /* this.element.find('a.volume-horaire').tooltip({