Commit 6fef26d0 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Adaptation des requêtes plafonds aux changements de la 24 

(cherry picked from commit 7c4de214)
parent f1e46a94

data/plafonds-sql/10.sql

+4 −4
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ 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
 
 No newline at end of file
 
  JOIN formule_resultat_intervenant fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id
 
 No newline at end of file

data/plafonds-sql/11.sql

+4 −4
Original line number Diff line number Diff line
@@ -6,5 +6,5 @@ SELECT 
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_intervenant fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

  JOIN statut                       si ON si.id = i.statut_id
 
 No newline at end of file

data/plafonds-sql/12.sql

+5 −5
Original line number Diff line number Diff line
@@ -10,4 +10,4 @@ FROM 
  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
 
 No newline at end of file
 
  JOIN formule_resultat_intervenant fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id
 
 No newline at end of file

data/plafonds-sql/13.sql

+7 −7
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ SELECT 
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 formule_resultat_intervenant      fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

  JOIN formule_resultat_volume_horaire frvh ON frvh.formule_resultat_intervenant_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

data/plafonds-sql/18.sql

+5 −5
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ SELECT 
  i.annee_id                             annee_id,

  fr.type_volume_horaire_id              type_volume_horaire_id,

  i.id                                   intervenant_id,

  fr.service_referentiel + fr.heures_compl_referentiel heures

  fr.heures_service_referentiel + fr.heures_compl_referentiel 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_intervenant fr ON fr.intervenant_id = i.id AND fr.etat_volume_horaire_id = evh.id

  JOIN statut                       si ON si.id = i.statut_id
 
 No newline at end of file