diff --git a/data/ddl/package/UNICAEN_TBL/body.sql b/data/ddl/package/UNICAEN_TBL/body.sql
index ec3ecd5ef96f399c0c58cbd94ba5598dc5427875..c0e51ac8a5313bf0122bb9d1f606453786582259 100644
--- a/data/ddl/package/UNICAEN_TBL/body.sql
+++ b/data/ddl/package/UNICAEN_TBL/body.sql
@@ -377,8 +377,13 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
JOIN scenario_noeud sn ON sn.id = sne.scenario_noeud_id
AND sn.histo_destruction IS NULL
+ /*@NOEUD_ID=sn.noeud_id*/
+ /*@SCENARIO_ID=sn.scenario_id*/
JOIN tbl_noeud n ON n.noeud_id = sn.noeud_id
+ /*@ANNEE_ID=n.annee_id*/
+ /*@ELEMENT_PEDAGOGIQUE_ID=n.element_pedagogique_id*/
+ /*@ETAPE_ID=n.element_pedagogique_etape_id*/
JOIN volume_horaire_ens vhe ON vhe.element_pedagogique_id = n.element_pedagogique_id
AND vhe.histo_destruction IS NULL
@@ -403,6 +408,9 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS
LEFT JOIN scenario_noeud_seuil sns ON sns.scenario_noeud_id = sn.id
AND sns.type_intervention_id = ti.id
+ WHERE
+ 1=1
+ /*@ETAPE_ENS_ID=sne.etape_id*/
)
SELECT
annee_id,
diff --git a/data/ddl/trigger/T_CRG_ETAPE.sql b/data/ddl/trigger/T_CRG_ETAPE.sql
index 2a9cb286993eb008918664a7ac2002b67af8b4f1..74cf3a1f0e0ac58c4b68efc635d2f2e3e112eddb 100644
--- a/data/ddl/trigger/T_CRG_ETAPE.sql
+++ b/data/ddl/trigger/T_CRG_ETAPE.sql
@@ -5,11 +5,11 @@ CREATE OR REPLACE TRIGGER "T_CRG_ETAPE"
IF NOT UNICAEN_TBL.ACTIV_TRIGGERS THEN RETURN; END IF;
IF DELETING THEN
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'etape_id', :OLD.id );
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'etape_ens_id', :OLD.id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ETAPE_ID', :OLD.id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ETAPE_ENS_ID', :OLD.id );
ELSE
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'etape_id', :NEW.id );
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'etape_ens_id', :NEW.id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ETAPE_ID', :NEW.id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ETAPE_ENS_ID', :NEW.id );
END IF;
END;
\ No newline at end of file
diff --git a/data/ddl/trigger/T_CRG_SCENARIO_NOEUD.sql b/data/ddl/trigger/T_CRG_SCENARIO_NOEUD.sql
index 994fb0deb7ba5397e7823c411a4ed5380fd01fcd..402c726a41fef9591a5fff9c07bbc13c947c7765 100644
--- a/data/ddl/trigger/T_CRG_SCENARIO_NOEUD.sql
+++ b/data/ddl/trigger/T_CRG_SCENARIO_NOEUD.sql
@@ -5,9 +5,9 @@ CREATE OR REPLACE TRIGGER "T_CRG_SCENARIO_NOEUD"
IF NOT UNICAEN_TBL.ACTIV_TRIGGERS THEN RETURN; END IF;
IF DELETING THEN
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'noeud_id', :OLD.noeud_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'NOEUD_ID', :OLD.noeud_id );
ELSE
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'noeud_id', :NEW.noeud_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'NOEUD_ID', :NEW.noeud_id );
END IF;
END;
\ No newline at end of file
diff --git a/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_EFFECTIF.sql b/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_EFFECTIF.sql
index d7d04611c4b11f540a4eba26f37ef6addbf13b72..c618ae4dd1c82a9d08513f9011c909b71a375150 100644
--- a/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_EFFECTIF.sql
+++ b/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_EFFECTIF.sql
@@ -17,9 +17,9 @@ CREATE OR REPLACE TRIGGER "T_CRG_SCENARIO_NOEUD_EFFECTIF"
) LOOP
IF p.etape_id IS NOT NULL THEN
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'etape_ens_id', p.etape_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ETAPE_ENS_ID', p.etape_id );
END IF;
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'noeud_id', p.noeud_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'NOEUD_ID', p.noeud_id );
END LOOP;
diff --git a/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_SEUIL.sql b/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_SEUIL.sql
index d5c01814f7f2184f2a1ac17471ad35e230c4be07..f1b1a43308a32716c19feb37137aee9804b6014a 100644
--- a/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_SEUIL.sql
+++ b/data/ddl/trigger/T_CRG_SCENARIO_NOEUD_SEUIL.sql
@@ -17,9 +17,9 @@ CREATE OR REPLACE TRIGGER "T_CRG_SCENARIO_NOEUD_SEUIL"
) LOOP
IF p.etape_id IS NOT NULL THEN
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'etape_ens_id', p.etape_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ETAPE_ENS_ID', p.etape_id );
END IF;
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'noeud_id', p.noeud_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'NOEUD_ID', p.noeud_id );
END LOOP;
diff --git a/data/ddl/trigger/T_CRG_VOLUME_HORAIRE_ENS.sql b/data/ddl/trigger/T_CRG_VOLUME_HORAIRE_ENS.sql
index f0ce213c3f8df81c753defab276bcbd76893d56d..59794f56ca22fc5db85eeed54f91c5913e7d6140 100644
--- a/data/ddl/trigger/T_CRG_VOLUME_HORAIRE_ENS.sql
+++ b/data/ddl/trigger/T_CRG_VOLUME_HORAIRE_ENS.sql
@@ -5,9 +5,9 @@ CREATE OR REPLACE TRIGGER "T_CRG_VOLUME_HORAIRE_ENS"
IF NOT UNICAEN_TBL.ACTIV_TRIGGERS THEN RETURN; END IF;
IF DELETING THEN
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'element_pedagogique_id', :OLD.element_pedagogique_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ELEMENT_PEDAGOGIQUE_ID', :OLD.element_pedagogique_id );
ELSE
- UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'element_pedagogique_id', :NEW.element_pedagogique_id );
+ UNICAEN_TBL.DEMANDE_CALCUL( 'chargens', 'ELEMENT_PEDAGOGIQUE_ID', :NEW.element_pedagogique_id );
END IF;
END;
\ No newline at end of file
diff --git a/data/ddl/view/V_TBL_CHARGENS.sql b/data/ddl/view/V_TBL_CHARGENS.sql
index d7d77625427ac24cd0bbb3dfc1cf680cfd541cc3..7ce78cb22b754b63e08751c97ff4dbd5038d9a70 100644
--- a/data/ddl/view/V_TBL_CHARGENS.sql
+++ b/data/ddl/view/V_TBL_CHARGENS.sql
@@ -30,8 +30,13 @@ FROM
JOIN scenario_noeud sn ON sn.id = sne.scenario_noeud_id
AND sn.histo_destruction IS NULL
+ /*@NOEUD_ID=sn.noeud_id*/
+ /*@SCENARIO_ID=sn.scenario_id*/
JOIN tbl_noeud n ON n.noeud_id = sn.noeud_id
+ /*@ANNEE_ID=n.annee_id*/
+ /*@ELEMENT_PEDAGOGIQUE_ID=n.element_pedagogique_id*/
+ /*@ETAPE_ID=n.element_pedagogique_etape_id*/
JOIN volume_horaire_ens vhe ON vhe.element_pedagogique_id = n.element_pedagogique_id
AND vhe.histo_destruction IS NULL
@@ -56,6 +61,9 @@ FROM
LEFT JOIN scenario_noeud_seuil sns ON sns.scenario_noeud_id = sn.id
AND sns.type_intervention_id = ti.id
+WHERE
+ 1=1
+ /*@ETAPE_ENS_ID=sne.etape_id*/
)
SELECT
annee_id,