diff --git a/module/Application/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php b/module/Application/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php index b8cb23742e105d1b4cc5c2faef85f9f175abc281..0cd71a35722c44b205965a689e0b8ae73e2cb889 100755 --- a/module/Application/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php +++ b/module/Application/src/Application/Controller/OffreFormation/ElementPedagogiqueController.php @@ -232,7 +232,8 @@ class ElementPedagogiqueController extends AbstractController $saisie = $this->params()->fromPost('vhes'); - $tis = $element->getTypesInterventionPossibles(); + $tis = $element->getTypesInterventionPossibles(); + $vhes = []; foreach ($tis as $typeIntervention) { if (!isset($existsVhes[$typeIntervention->getId()])) { $vhe = $this->getServiceVolumeHoraireEns()->newEntity($element, $typeIntervention); diff --git a/module/Application/src/Application/Service/ElementPedagogiqueService.php b/module/Application/src/Application/Service/ElementPedagogiqueService.php index ac76d8783f9b460dd02127134c968011893e24a9..2c47310072bcd93fc0ca27f4ecc0f268fe6b6e63 100755 --- a/module/Application/src/Application/Service/ElementPedagogiqueService.php +++ b/module/Application/src/Application/Service/ElementPedagogiqueService.php @@ -434,7 +434,7 @@ where rang = 1 DECLARE element_id NUMERIC; BEGIN - unicaen_import.synchronisation('ELEMENT_PEDAGOGIQUE', 'WHERE code =''' || " . $c->quote($code) . " || ''' AND annee_id = ' || " . $annee . "); + unicaen_import.synchronisation('ELEMENT_PEDAGOGIQUE', 'WHERE code =''' || " . $c->quote($code) . " || ''' AND import_action <> ''delete'' AND annee_id = ' || " . $annee . "); BEGIN SELECT id INTO element_id FROM element_pedagogique ep WHERE code = " . $c->quote($code) . " AND ep.annee_id = " . $annee . " AND histo_destruction IS NULL;