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

Modif formule Réunion

parent 8a739ec4

data/ddl/package/FORMULE_REUNION/body.sql

+17 −3
Original line number Diff line number Diff line
@@ -202,10 +202,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_REUNION AS 






      -- AB=IF([.$H20]="Référentiel";[.DE20]+[.DK20]+[.DQ20];0)

      -- AB=IF([.$H20]="Référentiel";[.$DE20]+[.$DK20]+[.$DQ20]+[.$DS20];0)

      WHEN 'AB' THEN

        IF vh.volume_horaire_ref_id IS NOT NULL THEN

          RETURN cell('DE',l) + cell('DK',l) + cell('DQ',l);

          RETURN cell('DE',l) + cell('DK',l) + cell('DQ',l) + cell('DS',l);

        ELSE

          RETURN 0;

        END IF;
@@ -234,7 +234,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_REUNION AS 






      -- AH15=SUM([.AG$1:.AG$1048576])

      -- AH15=SUM([.AG20:.AG500])

      WHEN 'AH15' THEN

        RETURN calcFnc('somme','AG');
@@ -1184,6 +1184,20 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_REUNION AS 






      -- DS=IF([.$D20]="Oui";0;IF([.$DN$17]=0;[.$M20];0))

      WHEN 'DS' THEN

        IF vh.service_statutaire THEN

          RETURN 0;

        ELSE

          IF cell('DN17') = 0 THEN

            RETURN vh.heures;

          ELSE

            RETURN 0;

          END IF;

        END IF;









    ELSE

      dbms_output.put_line('La colonne c=' || c || ', l=' || l || ' n''existe pas!');

data/ddl/package/FORMULE_REUNION_2022/body.sql

+17 −3
Original line number Diff line number Diff line
@@ -202,10 +202,10 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_REUNION_2022 AS 






      -- AB=IF([.$H20]="Référentiel";[.DE20]+[.DK20]+[.DQ20];0)

      -- AB=IF([.$H20]="Référentiel";[.$DE20]+[.$DK20]+[.$DQ20]+[.$DS20];0)

      WHEN 'AB' THEN

        IF vh.volume_horaire_ref_id IS NOT NULL THEN

          RETURN cell('DE',l) + cell('DK',l) + cell('DQ',l);

          RETURN cell('DE',l) + cell('DK',l) + cell('DQ',l) + cell('DS',l);

        ELSE

          RETURN 0;

        END IF;
@@ -234,7 +234,7 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_REUNION_2022 AS 






      -- AH15=SUM([.AG$1:.AG$1048576])

      -- AH15=SUM([.AG20:.AG500])

      WHEN 'AH15' THEN

        RETURN calcFnc('somme','AG');
@@ -1184,6 +1184,20 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_REUNION_2022 AS 






      -- DS=IF([.$D20]="Oui";0;IF([.$DN$17]=0;[.$M20];0))

      WHEN 'DS' THEN

        IF vh.service_statutaire THEN

          RETURN 0;

        ELSE

          IF cell('DN17') = 0 THEN

            RETURN vh.heures;

          ELSE

            RETURN 0;

          END IF;

        END IF;









    ELSE

      dbms_output.put_line('La colonne c=' || c || ', l=' || l || ' n''existe pas!');