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

Réparation des plafonds par périmètre élément pédagoqique

parent 8d94389d

config/autoload/unicaen-tbl.global.php

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ return [ 
                'key_values_if_null' => [

                    'PLAFOND_ID'             => 0,

                    'TYPE_VOLUME_HORAIRE_ID' => 0,

                    'INTERVENANT_ID'         => 0,

                ],

            ],

data/ddl/table/TBL_PLAFOND_ELEMENT.php

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ return [ 
            'length'      => 0,

            'scale'       => NULL,

            'precision'   => NULL,

            'nullable'    => FALSE,

            'nullable'    => TRUE,

            'default'     => NULL,

            'position'    => 5,

            'commentaire' => NULL,

module/Plafond/src/Service/PlafondService.php

+3 −3
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ class PlafondService extends AbstractEntityService 
                }

            }

            $view .= "\n  COALESCE(p.PLAFOND,ps.heures,0) PLAFOND,";

            if ($perimetre->getCode() !== $perimetre::VOLUME_HORAIRE) {

            if (!in_array($perimetre->getCode(), [$perimetre::VOLUME_HORAIRE, $perimetre::ELEMENT])) {

                $view .= "\n  CASE";

                $view .= "\n    WHEN p.type_volume_horaire_id = $tvhPrevuId THEN ps.plafond_etat_prevu_id";

                $view .= "\n    WHEN p.type_volume_horaire_id = $tvhRealiseId THEN ps.plafond_etat_realise_id";
@@ -569,13 +569,13 @@ class PlafondService extends AbstractEntityService 
                $view .= " FROM dual WHERE 0 = 1";

            }

            $view .= "\n  ) p";

            if ($perimetre->getCode() !== $perimetre::STRUCTURE) {

            if (!in_array($perimetre->getCode(), [$perimetre::STRUCTURE, $perimetre::ELEMENT])) {

                $view .= "\n  JOIN intervenant i ON i.id = p.intervenant_id";

            }

            $view .= "\n  LEFT JOIN " . $configTablesJoin[$perimetre->getCode()];

            $view .= "\n  LEFT JOIN plafond_derogation pd ON pd.plafond_id = p.plafond_id AND pd.intervenant_id = p.intervenant_id AND pd.histo_destruction IS NULL";

            $view .= "\nWHERE\n";

            if ($perimetre->getCode() !== $perimetre::VOLUME_HORAIRE) {

            if (!in_array($perimetre->getCode(),[$perimetre::VOLUME_HORAIRE, $perimetre::ELEMENT])) {

                $view .= "  CASE\n";

                $view .= "    WHEN p.type_volume_horaire_id = $tvhPrevuId THEN ps.plafond_etat_prevu_id\n";

                $view .= "    WHEN p.type_volume_horaire_id = $tvhRealiseId THEN ps.plafond_etat_realise_id\n";