Plus de formulaire à l'intérieur de la saisie de nouveaux enseignements en calendaire

module/Application/src/Application/Controller/ServiceController.php

@@ -343,6 +343,7 @@ class ServiceController extends AbstractController
         }
         $service       = $this->getServiceService();
         $form          = $this->getFormServiceSaisie();
+        $form->setTypeVolumeHoraire($typeVolumeHoraire);
         $element       = $this->context()->elementPedagogiqueFromPost('element');
         $etablissement = $this->context()->etablissementFromPost();
 
@@ -464,6 +465,7 @@ class ServiceController extends AbstractController
         }
         $service = $this->getServiceService();
         $form    = $this->getFormServiceSaisie();
+        $form->setTypeVolumeHoraire($typeVolumeHoraire);
 
         $intervenant = $this->getServiceLocalContext()->getIntervenant();
 

module/Application/src/Application/Controller/VolumeHoraireController.php

@@ -29,10 +29,12 @@ class VolumeHoraireController extends AbstractController
     use WorkflowServiceAwareTrait;
     use PlafondProcessusAwareTrait;
 
+
+
     public function listeAction()
     {
         $this->em()->getFilters()->enable('historique')->init([
-            \Application\Entity\Db\VolumeHoraire::class
+            \Application\Entity\Db\VolumeHoraire::class,
         ]);
         $service = $this->getEvent()->getParam('service');
         /* @var $service Service */
@@ -44,15 +46,18 @@ class VolumeHoraireController extends AbstractController
         $readOnly = 1 == (int)$this->params()->fromQuery('read-only', 0);
 
         $volumeHoraireListe = $service->getVolumeHoraireListe()->setTypeVolumehoraire($typeVolumeHoraire);
-        $semestriel = $this->getServiceContext()->isModaliteServicesSemestriel();
+        $semestriel         = $this->getServiceContext()->isModaliteServicesSemestriel($typeVolumeHoraire);
+
         return compact('volumeHoraireListe', 'readOnly', 'semestriel');
     }
 
+
+
     public function saisieAction()
     {
         $this->em()->getFilters()->enable('historique')->init([
             \Application\Entity\Db\VolumeHoraire::class,
-            \Application\Entity\Db\MotifNonPaiement::class
+            \Application\Entity\Db\MotifNonPaiement::class,
         ]);
 
         $service           = $this->context()->serviceFromRoute();
@@ -80,7 +85,6 @@ class VolumeHoraireController extends AbstractController
         }
 
 
-
         /* @var $service \Application\Entity\Db\Service */
         $service->setTypeVolumeHoraire($typeVolumehoraire);
         $volumeHoraireList = $service->getVolumeHoraireListe($periode, $typeIntervention);
@@ -124,6 +128,7 @@ class VolumeHoraireController extends AbstractController
         if ($terminal) {
             return $this->popoverInnerViewModel($viewModel, "Saisie d'heures d'enseignement", false);
         }
+
         return $viewModel;
     }
 
@@ -132,7 +137,7 @@ class VolumeHoraireController extends AbstractController
     private function updateTableauxBord(Intervenant $intervenant)
     {
         $this->getServiceWorkflow()->calculerTableauxBord([
-            'formule','validation_enseignement','service','service_saisie','piece_jointe_fournie'
+            'formule', 'validation_enseignement', 'service', 'service_saisie', 'piece_jointe_fournie',
         ], $intervenant);
     }
 

module/Application/src/Application/Form/Service/Saisie.php

@@ -4,6 +4,7 @@ namespace Application\Form\Service;
 
 use Application\Entity\Db\Periode;
 use Application\Entity\Db\Service;
+use Application\Entity\Db\Traits\TypeVolumeHoraireAwareTrait;
 use Application\Form\AbstractForm;
 use Application\Form\Service\Traits\SaisieFieldsetAwareTrait;
 use Application\Form\VolumeHoraire\Traits\SaisieMultipleFieldsetAwareTrait;
@@ -20,6 +21,7 @@ use Zend\Stdlib\Hydrator\HydratorInterface;
  */
 class Saisie extends AbstractForm
 {
+    use TypeVolumeHoraireAwareTrait;
     use PeriodeServiceAwareTrait;
     use SaisieFieldsetAwareTrait;
     use SaisieMultipleFieldsetAwareTrait;

module/Application/src/Application/Service/ContextService.php

@@ -187,7 +187,7 @@ class ContextService extends AbstractService
      */
     public function isModaliteServicesSemestriel($typeVolumeHoraire = TypeVolumeHoraire::CODE_PREVU): bool
     {
-        return $this->getModaliteServices() == Parametre::SERVICES_MODALITE_SEMESTRIEL;
+        return $this->getModaliteServices($typeVolumeHoraire) == Parametre::SERVICES_MODALITE_SEMESTRIEL;
     }
 
 

module/Application/src/Application/View/Helper/Service/Liste.php

@@ -296,7 +296,7 @@ class Liste extends AbstractViewHelper
     {
         $ligneView = $this->getView()->serviceLigne($this, $service);
 
-        if ($this->getServiceContext()->isModaliteServicesSemestriel()){
+        if ($this->getServiceContext()->isModaliteServicesSemestriel($this->getTypeVolumeHoraire())){
             $volumeHoraireListe = $this->getView()->volumeHoraireListe($service->getVolumeHoraireListe());
             /* @var $volumeHoraireListe \Application\View\Helper\VolumeHoraire\Liste */
         }else{

module/Application/src/Application/View/Helper/Service/SaisieForm.php

@@ -2,7 +2,6 @@
 
 namespace Application\View\Helper\Service;
 
-use Application\Entity\Db\Parametre;
 use Application\Entity\Db\Periode;
 use Application\Entity\Db\Service;
 use Application\Entity\Db\TypeVolumeHoraire;
@@ -130,7 +129,7 @@ class SaisieForm extends AbstractViewHelper
 
     public function renderVolumesHoraires()
     {
-        if (!$this->getServiceContext()->isModaliteServicesSemestriel()){
+        if (!$this->getServiceContext()->isModaliteServicesSemestriel($this->form->getTypeVolumeHoraire())){
             return null;
         }
         $res = '';

module/Application/view/application/service/volumes-horaires-refresh.phtml

 <?php
 
+/**
+ * @var $this \Application\View\Renderer\PhpRenderer
+ */
+
 echo $this->serviceSaisieForm( $form )->renderVolumesHoraires();
\ No newline at end of file