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

Ajout de la prixse en compte des heures faites hors établissement en standard dans la formule

parent 0c620ea0

data/ddl/package/OSE_FORMULE/body.sql

+4 −0
Changes for data/ddl/package/OSE_FORMULE/body.sql: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 
    vh_etat_volume_horaire_id NUMERIC;

    vh_structure_is_affectation NUMERIC;

    vh_structure_is_univ NUMERIC;

    vh_structure_is_exterieur NUMERIC;

    vh t_volume_horaire;

    etat_volume_horaire_id NUMERIC DEFAULT 1;

    length NUMERIC;
@@ -290,6 +291,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 
        vh.structure_code,

        vh_structure_is_affectation,

        vh_structure_is_univ,

        vh_structure_is_exterieur,

        vh.ponderation_service_du,

        vh.ponderation_service_compl,

        vh.service_statutaire,
@@ -309,6 +311,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 


      vh.structure_is_affectation := vh_structure_is_affectation = 1;

      vh.structure_is_univ        := vh_structure_is_univ = 1;

      vh.structure_is_exterieur   := vh_structure_is_exterieur = 1;



      FOR etat_volume_horaire_id IN 1 .. vh_etat_volume_horaire_id LOOP

        BEGIN
@@ -372,6 +375,7 @@ CREATE OR REPLACE PACKAGE BODY "OSE_FORMULE" AS 
      volumes_horaires.items(length).ponderation_service_compl := d.ponderation_service_compl;

      volumes_horaires.items(length).structure_is_affectation  := COALESCE(d.structure_code,' ') = COALESCE(intervenant.structure_code,' ');

      volumes_horaires.items(length).structure_is_univ         := d.structure_code = '__UNIV__';

      volumes_horaires.items(length).structure_is_exterieur    := d.structure_code = '__EXTERIEUR__';

      volumes_horaires.items(length).service_statutaire        := d.service_statutaire = 1;

      volumes_horaires.items(length).heures                    := d.heures;

      volumes_horaires.items(length).type_intervention_code    := CASE WHEN d.referentiel = 1 THEN NULL ELSE d.type_intervention_code END;

data/ddl/package/OSE_FORMULE/definition.sql

+1 −0
Changes for data/ddl/package/OSE_FORMULE/definition.sql: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ CREATE OR REPLACE PACKAGE "OSE_FORMULE" AS 
    structure_code             VARCHAR(100),

    structure_is_affectation   BOOLEAN DEFAULT TRUE,

    structure_is_univ          BOOLEAN DEFAULT FALSE,

    structure_is_exterieur     BOOLEAN DEFAULT FALSE,

    service_statutaire         BOOLEAN DEFAULT TRUE,

    taux_fi                    FLOAT DEFAULT 1,

    taux_fa                    FLOAT DEFAULT 0,

data/ddl/view/V_FORMULE_VOLUME_HORAIRE.sql

+3 −0
Changes for data/ddl/view/V_FORMULE_VOLUME_HORAIRE.sql: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ SELECT 
  t.structure_code,

  t.structure_is_affectation,

  t.structure_is_univ,

  t.structure_is_exterieur,

  t.PONDERATION_SERVICE_DU,

  t.PONDERATION_SERVICE_COMPL,

  t.SERVICE_STATUTAIRE,
@@ -47,6 +48,7 @@ SELECT 
  str.code                                                             structure_code,

  CASE WHEN COALESCE(str.id,0) = COALESCE(i.structure_id,0)      THEN 1 ELSE 0 END structure_is_affectation,

  CASE WHEN COALESCE(str.id,0) = COALESCE(to_number(p.valeur),0) THEN 1 ELSE 0 END structure_is_univ,

  CASE WHEN s.element_pedagogique_id IS NULL THEN 1 ELSE 0 END         structure_is_exterieur,

  COALESCE(ep.ponderation_service_du,1)                                ponderation_service_du,

  COALESCE(ep.ponderation_service_compl,1)                             ponderation_service_compl,

  COALESCE(tf.service_statutaire,1)                                    service_statutaire,
@@ -121,6 +123,7 @@ SELECT 
  s.code                            structure_code,

  CASE WHEN COALESCE(sr.structure_id,0) = COALESCE(i.structure_id,0)      THEN 1 ELSE 0 END structure_is_affectation,

  CASE WHEN COALESCE(sr.structure_id,0) = COALESCE(to_number(p.valeur),0) THEN 1 ELSE 0 END structure_is_univ,

  0                                 structure_is_exterieur,

  1                                 ponderation_service_du,

  1                                 ponderation_service_compl,

  COALESCE(fr.service_statutaire,1) service_statutaire,