Commit b8906fa9 authored by joriot221's avatar joriot221
Browse files

Merge branch 'master' into VFJ_18_RefusPiece 

# Conflicts:
#	admin/src/DataGen.php
#	composer.lock
#	data/ddl/package/UNICAEN_TBL/body.sql
#	data/ddl/view/V_TBL_PLAFOND_INTERVENANT.sql
#	module/Plafond/src/Entity/Db/Plafond.php
#	module/Plafond/src/Service/IndicateurServiceAwareTrait.php
#	module/Plafond/src/Service/IndicateurServiceFactory.php
#	module/Plafond/src/View/Helper/PlafondsViewHelperFactory.php
#	public/css/app.css
parents 10d22d8f f0325fc7

data/ddl/package/UNICAEN_TBL/body.sql

+56 −35
Changes for data/ddl/package/UNICAEN_TBL/body.sql: 56 added lines, 35 removed lines.
Original line number Diff line number Diff line
@@ -1896,90 +1896,90 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS 
          CASE WHEN p.heures > COALESCE(p.PLAFOND,ps.heures,pa.heures,0) + COALESCE(pd.heures, 0) + 0.05 THEN 1 ELSE 0 END depassement

        FROM

          (

          SELECT 1 PLAFOND_ID, NULL PLAFOND, p.* FROM (

          SELECT 2 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                             annee_id,

                fr.type_volume_horaire_id              type_volume_horaire_id,

                i.id                                   intervenant_id,

                fr.heures_compl_fc_majorees         heures

              /*  ROUND( (COALESCE(si.plafond_hc_remu_fc,0) - COALESCE(i.montant_indemnite_fc,0)) / a.taux_hetd, 2 ) plafond*/



                fr.total - fr.heures_compl_fc_majorees heures

              FROM

                intervenant                     i

                JOIN annee                      a ON a.id = i.annee_id

                JOIN statut                    si ON si.id = i.statut_id

                JOIN etat_volume_horaire      evh ON evh.code = ''saisi''

                JOIN formule_resultat          fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

                JOIN statut                    si ON si.id = i.statut_id

            ) p



            UNION ALL



          SELECT 2 PLAFOND_ID, NULL PLAFOND, p.* FROM (

          SELECT 5 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                          annee_id,

                fr.type_volume_horaire_id           type_volume_horaire_id,

                i.id                                   intervenant_id,

                fr.total - fr.heures_compl_fc_majorees heures

                fr.intervenant_id                   intervenant_id,

                fr.heures_compl_fi + fr.heures_compl_fc + fr.heures_compl_fa + fr.heures_compl_referentiel heures

              FROM

                     intervenant                i

                JOIN statut                    si ON si.id = i.statut_id

                JOIN etat_volume_horaire      evh ON evh.code = ''saisi''

                JOIN formule_resultat          fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

                JOIN statut                    si ON si.id = i.statut_id

            ) p



            UNION ALL



          SELECT 8 PLAFOND_ID, NULL PLAFOND, p.* FROM (

          SELECT 4 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                             annee_id,

                fr.type_volume_horaire_id              type_volume_horaire_id,

                i.id                                   intervenant_id,

                SUM(frvh.heures_compl_fi) heures

                fr.total - fr.heures_compl_fc_majorees heures

              FROM

                intervenant                     i

                JOIN etat_volume_horaire      evh ON evh.code = ''saisi''

                JOIN formule_resultat          fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

                JOIN formule_resultat_vh     frvh ON frvh.formule_resultat_id = fr.id

                JOIN volume_horaire            vh ON vh.id = frvh.volume_horaire_id

                JOIN type_intervention         ti ON ti.id = vh.type_intervention_id

                JOIN statut                    si ON si.id = i.statut_id

              WHERE

                ti.regle_foad = 0

              GROUP BY

                fr.type_volume_horaire_id,

                i.annee_id,

                i.id,

                i.statut_id

            ) p



            UNION ALL



          SELECT 4 PLAFOND_ID, NULL PLAFOND, p.* FROM (

          SELECT 1 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                          annee_id,

                fr.type_volume_horaire_id           type_volume_horaire_id,

                i.id                                intervenant_id,

                fr.total - fr.heures_compl_fc_majorees heures

                fr.heures_compl_fc_majorees         heures

              /*  ROUND( (COALESCE(si.plafond_hc_remu_fc,0) - COALESCE(i.montant_indemnite_fc,0)) / a.taux_hetd, 2 ) plafond*/



              FROM

                     intervenant                i

                JOIN annee                      a ON a.id = i.annee_id

                JOIN statut                    si ON si.id = i.statut_id

                JOIN etat_volume_horaire      evh ON evh.code = ''saisi''

                JOIN formule_resultat          fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

                JOIN statut                    si ON si.id = i.statut_id

            ) p



            UNION ALL



          SELECT 5 PLAFOND_ID, NULL PLAFOND, p.* FROM (

          SELECT 8 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                annee_id,

                fr.type_volume_horaire_id type_volume_horaire_id,

                fr.intervenant_id                   intervenant_id,

                fr.heures_compl_fi + fr.heures_compl_fc + fr.heures_compl_fa + fr.heures_compl_referentiel heures

                i.id                      intervenant_id,

                SUM(frvh.heures_compl_fi) heures

              FROM

                intervenant                     i

                JOIN statut                    si ON si.id = i.statut_id

                JOIN etat_volume_horaire      evh ON evh.code = ''saisi''

                JOIN formule_resultat          fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

                JOIN formule_resultat_vh     frvh ON frvh.formule_resultat_id = fr.id

                JOIN volume_horaire            vh ON vh.id = frvh.volume_horaire_id

                JOIN type_intervention         ti ON ti.id = vh.type_intervention_id

                JOIN statut                    si ON si.id = i.statut_id

              WHERE

                ti.regle_foad = 0

              GROUP BY

                fr.type_volume_horaire_id,

                i.annee_id,

                i.id,

                i.statut_id

            ) p

          ) p

          JOIN intervenant i ON i.id = p.intervenant_id
@@ -2072,7 +2072,7 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS 
          CASE WHEN p.heures > COALESCE(p.PLAFOND,ps.heures,pa.heures,0) + COALESCE(pd.heures, 0) + 0.05 THEN 1 ELSE 0 END depassement

        FROM

          (

          SELECT 3 PLAFOND_ID, NULL PLAFOND, p.* FROM (

          SELECT 6 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                 annee_id,

                vhr.type_volume_horaire_id type_volume_horaire_id,
@@ -2082,15 +2082,18 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS 
              FROM

                service_referentiel       sr

                JOIN intervenant i ON i.id = sr.intervenant_id

                JOIN fonction_referentiel      fr ON fr.id = sr.fonction_id

                JOIN fonction_referentiel      frf ON frf.id = sr.fonction_id

                JOIN fonction_referentiel      fr ON fr.id = frf.parent_id

                JOIN volume_horaire_ref       vhr ON vhr.service_referentiel_id = sr.id AND vhr.histo_destruction IS NULL

              WHERE

                sr.histo_destruction IS NULL

              GROUP BY

                i.annee_id, vhr.type_volume_horaire_id, i.id, fr.id

            ) p



            UNION ALL



          SELECT 3 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                i.annee_id                        annee_id,

                vhr.type_volume_horaire_id        type_volume_horaire_id,
@@ -2100,18 +2103,15 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS 
              FROM

                     service_referentiel       sr

                JOIN intervenant                i ON i.id = sr.intervenant_id

                JOIN fonction_referentiel      frf ON frf.id = sr.fonction_id

                JOIN fonction_referentiel      fr ON fr.id = frf.parent_id

                JOIN fonction_referentiel      fr ON fr.id = sr.fonction_id

                JOIN volume_horaire_ref       vhr ON vhr.service_referentiel_id = sr.id AND vhr.histo_destruction IS NULL

              WHERE

                sr.histo_destruction IS NULL

              GROUP BY

                i.annee_id, vhr.type_volume_horaire_id, i.id, fr.id

            ) p



              UNION ALL



          SELECT 6 PLAFOND_ID, NULL PLAFOND, p.* FROM (

              SELECT

                i.annee_id                 annee_id,

                vhr.type_volume_horaire_id type_volume_horaire_id,
@@ -2242,6 +2242,27 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS 
              GROUP BY

                i.annee_id, vhr.type_volume_horaire_id, i.id, s.id

            ) p



            UNION ALL



          SELECT 25 PLAFOND_ID, NULL PLAFOND, p.* FROM (

            SELECT

                      i.annee_id                 annee_id,

                      vh.type_volume_horaire_id  type_volume_horaire_id,

                      i.id                       intervenant_id,

                      str.id                     structure_id,

                      SUM(vh.heures)             heures

                    FROM

                      service                    s

                      JOIN element_pedagogique  ep ON ep.id = s.element_pedagogique_id

                      JOIN intervenant           i ON i.id = s.intervenant_id

                      JOIN structure           str ON str.id = ep.structure_id

                      JOIN volume_horaire       vh ON vh.service_id = s.id AND vh.histo_destruction IS NULL

                    WHERE

                      s.histo_destruction IS NULL

                    GROUP BY

                      i.annee_id, vh.type_volume_horaire_id, i.id, str.id

            ) p

          ) p

          JOIN intervenant i ON i.id = p.intervenant_id

          LEFT JOIN plafond_application pa ON pa.plafond_id = p.plafond_id AND p.annee_id = pa.annee_id

data/ddl/view/V_INDICATEUR_P_ELEMENT.sql

0 → 100644
+19 −0
Changes for data/ddl/view/V_INDICATEUR_P_ELEMENT.sql: 19 added lines, 0 removed lines.
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_ELEMENT AS

SELECT

  p.numero*100 + tp.type_volume_horaire_id * 10 numero,

  tp.intervenant_id,

  ep.structure_id structure_id,

  pe.libelle etat,

  ep.libelle element,

  tp.heures,

  tp.plafond,

  tp.derogation

FROM

  tbl_plafond_element tp

  JOIN plafond p ON p.id = tp.plafond_id

  JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id

  JOIN intervenant i ON i.id = tp.intervenant_id

  JOIN element_pedagogique ep ON ep.id = tp.element_pedagogique_id

WHERE

  pe.code <> 'desactive'

  AND tp.depassement = 1
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_P_INTERVENANT.sql

0 → 100644
+17 −0
Changes for data/ddl/view/V_INDICATEUR_P_INTERVENANT.sql: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_INTERVENANT AS

SELECT

  p.numero*100 + tp.type_volume_horaire_id * 10 numero,

  tp.intervenant_id,

  i.structure_id structure_id,

  pe.libelle etat,

  tp.heures,

  tp.plafond,

  tp.derogation

FROM

  tbl_plafond_intervenant tp

  JOIN plafond p ON p.id = tp.plafond_id

  JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id

  JOIN intervenant i ON i.id = tp.intervenant_id

WHERE

  pe.code <> 'desactive'

  AND tp.depassement = 1
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_P_REFERENTIEL.sql

0 → 100644
+20 −0
Changes for data/ddl/view/V_INDICATEUR_P_REFERENTIEL.sql: 20 added lines, 0 removed lines.
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_REFERENTIEL AS

SELECT

  p.numero*100 + tp.type_volume_horaire_id * 10 numero,

  tp.intervenant_id,

  COALESCE(srs.structure_id, i.structure_id) structure_id,

  pe.libelle etat,

  fr.libelle_court fonction,

  tp.heures,

  tp.plafond,

  tp.derogation

FROM

  tbl_plafond_referentiel tp

  JOIN plafond p ON p.id = tp.plafond_id

  JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id

  JOIN intervenant i ON i.id = tp.intervenant_id

  JOIN fonction_referentiel fr ON fr.id = tp.fonction_referentiel_id

  LEFT JOIN (SELECT DISTINCT intervenant_id, fonction_id, structure_id FROM service_referentiel) srs ON srs.intervenant_id = tp.intervenant_id AND srs.fonction_id = tp.fonction_referentiel_id

WHERE

  pe.code <> 'desactive'

  AND tp.depassement = 1
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_P_STRUCTURE.sql

0 → 100644
+16 −0
Changes for data/ddl/view/V_INDICATEUR_P_STRUCTURE.sql: 16 added lines, 0 removed lines.
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_P_STRUCTURE AS

SELECT

  p.numero*100 + tp.type_volume_horaire_id * 10 numero,

  tp.intervenant_id,

  tp.structure_id,

  pe.libelle etat,

  tp.heures,

  tp.plafond,

  tp.derogation

FROM

  tbl_plafond_structure tp

  JOIN plafond p ON p.id = tp.plafond_id

  JOIN plafond_etat pe ON pe.id = tp.plafond_etat_id

WHERE

  pe.code <> 'desactive'

  AND tp.depassement = 1
 
 No newline at end of file