Commit d1d3ff20 authored by Laurent Lécluse's avatar Laurent Lécluse
Browse files

Merge branch 'cherry-pick-91e9b74d' into 'master'

Correction bug : on ne sync plus un EP de force si c'est pour le détruire

See merge request !61
parents b1d49e85 61a11bfe
...@@ -232,7 +232,8 @@ class ElementPedagogiqueController extends AbstractController ...@@ -232,7 +232,8 @@ class ElementPedagogiqueController extends AbstractController
$saisie = $this->params()->fromPost('vhes'); $saisie = $this->params()->fromPost('vhes');
$tis = $element->getTypesInterventionPossibles(); $tis = $element->getTypesInterventionPossibles();
$vhes = [];
foreach ($tis as $typeIntervention) { foreach ($tis as $typeIntervention) {
if (!isset($existsVhes[$typeIntervention->getId()])) { if (!isset($existsVhes[$typeIntervention->getId()])) {
$vhe = $this->getServiceVolumeHoraireEns()->newEntity($element, $typeIntervention); $vhe = $this->getServiceVolumeHoraireEns()->newEntity($element, $typeIntervention);
......
...@@ -434,7 +434,7 @@ where rang = 1 ...@@ -434,7 +434,7 @@ where rang = 1
DECLARE DECLARE
element_id NUMERIC; element_id NUMERIC;
BEGIN 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 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; SELECT id INTO element_id FROM element_pedagogique ep WHERE code = " . $c->quote($code) . " AND ep.annee_id = " . $annee . " AND histo_destruction IS NULL;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment