Commit 7f78dd7a authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Merge remote-tracking branch 'origin/b23' into b23

parents b73b74a0 62b3c347

data/ddl/package/FORMULE_ROUEN/body.sql

+6 −6
Original line number Diff line number Diff line
@@ -254,13 +254,13 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ROUEN AS 






      -- AH=IF(ISERROR([.J20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG16]<>0);([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16];[.$J20]);[.$J20]))

      -- AH=IF(ISERROR([.J20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG$16]<>0);[.$J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.$J20]))/[.$AG$16]);[.$J20]))

      WHEN 'AH' THEN

        IF vh.type_intervention_code = 'TP' THEN

          IF cell('AG15') < i.heures_service_statutaire AND cell('AG16') <> 0 THEN

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');

          ELSE

            RETURN vh.taux_service_du;

          ELSE

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_du)) / cell('AG16');

          END IF;

        ELSE

          RETURN vh.taux_service_du;
@@ -268,13 +268,13 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ROUEN AS 






      -- AI=IF(ISERROR([.$K20]);1;IF([.$I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG16]<>0);([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.$K20]))/[.$AG$16];[.$K20]);[.$K20]))

      -- AI=IF(ISERROR([.K20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG$16]<>0);[.$K20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.$K20]))/[.$AG$16]);[.$K20]))

      WHEN 'AI' THEN

        IF vh.type_intervention_code = 'TP' THEN

          IF cell('AG15') < i.heures_service_statutaire AND cell('AG16') <> 0 THEN

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');

          ELSE

            RETURN vh.taux_service_compl;

          ELSE

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');

          END IF;

        ELSE

          RETURN vh.taux_service_compl;

data/ddl/package/FORMULE_ROUEN_2022/body.sql

+4 −4
Original line number Diff line number Diff line
@@ -254,13 +254,13 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ROUEN_2022 AS 






      -- AH=IF(ISERROR([.J20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG16]<>0);[.J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16]);[.J20]))

      -- AH=IF(ISERROR([.J20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG$16]<>0);[.$J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.$J20]))/[.$AG$16]);[.$J20]))

      WHEN 'AH' THEN

        IF vh.type_intervention_code = 'TP' THEN

          IF cell('AG15') < i.heures_service_statutaire AND cell('AG16') <> 0 THEN

            RETURN vh.taux_service_du;

          ELSE

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_du)) / cell('AG16');

          END IF;

        ELSE

          RETURN vh.taux_service_du;
@@ -268,11 +268,11 @@ CREATE OR REPLACE PACKAGE BODY FORMULE_ROUEN_2022 AS 






      -- AI=IF(ISERROR([.K20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG16]<>0);[.J20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.K20]))/[.$AG$16]);[.K20]))

      -- AI=IF(ISERROR([.K20]);1;IF([.I20]="TP";IF(AND([.$AG$15]<i_heures_decharge;[.$AG$16]<>0);[.$K20];([.$AG$16]-(([.$AG$15]-i_heures_decharge)*[.$AG$17])+(([.$AG$15]-i_heures_decharge)*[.$AG$17]*[.$K20]))/[.$AG$16]);[.$K20]))

      WHEN 'AI' THEN

        IF vh.type_intervention_code = 'TP' THEN

          IF cell('AG15') < i.heures_service_statutaire AND cell('AG16') <> 0 THEN

            RETURN vh.taux_service_du;

            RETURN vh.taux_service_compl;

          ELSE

            RETURN (cell('AG16') - ((cell('AG15') - i.heures_service_statutaire) * cell('AG17')) + ((cell('AG15') - i.heures_service_statutaire) * cell('AG17') * vh.taux_service_compl)) / cell('AG16');

          END IF;

data/ddl/view/V_CONTRAT_SERVICES.sql

+2 −1
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ WITH services AS ( 
            JOIN element_pedagogique ep ON ep.id = s.element_pedagogique_id

            JOIN type_volume_horaire tvh ON tvh.id = vh.type_volume_horaire_id

            LEFT JOIN validation_vol_horaire vvh ON vvh.volume_horaire_id = vh.id

            JOIN validation v ON v.id = vvh.validation_id AND v.histo_destruction IS NULL

            LEFT JOIN validation v ON v.id = vvh.validation_id AND v.histo_destruction IS NULL

            JOIN STRUCTURE str ON ep.structure_id = str.id

            LEFT JOIN contrat c ON c.id = vh.contrat_id

        WHERE

            vh.histo_destruction IS NULL

            AND tvh.code = 'PREVU'

            AND (v.id IS NOT NULL OR vh.auto_validation = 1)

            AND (vvh.validation_id IS NOT NULL OR vh.auto_validation = 1)

        GROUP BY

            s.intervenant_id,

            c.id,