Commit cb730ca7 authored by Florian Joriot's avatar Florian Joriot
Browse files

Correction indicateur 910 et 920

parent ee59cd6a

data/ddl/view/V_INDICATEUR_910.sql

+3 −7
Original line number Diff line number Diff line
@@ -5,17 +5,13 @@ SELECT 
  Max(v.HISTO_CREATION) AS "Date de modification"

FROM

  tbl_workflow w

  JOIN VALIDATION v ON v.INTERVENANT_ID = w.INTERVENANT_ID

  JOIN type_volume_horaire tvh ON tvh.code = 'REALISE'

  LEFT JOIN VALIDATION_VOL_HORAIRE vvh ON vvh.VALIDATION_ID = v.ID

  LEFT JOIN VALIDATION_VOL_HORAIRE_REF vvhr ON vvhr.VALIDATION_ID = v.ID

  LEFT JOIN VOLUME_HORAIRE vh ON vh.ID = vvh.VOLUME_HORAIRE_ID

  LEFT JOIN VOLUME_HORAIRE_REF vhr ON vhr.ID = vvhr.VOLUME_HORAIRE_REF_ID

  LEFT JOIN type_volume_horaire tvh ON tvh.code = 'REALISE'

  LEFT JOIN service s ON s.intervenant_id = w.intervenant_id

  LEFT JOIN volume_horaire vh ON s.id = vh.service_id

WHERE

  w.etape_code = 'DEMANDE_MEP'

  AND w.type_intervenant_code = 'E'

  AND w.atteignable = 1

  AND w.objectif > w.realisation

  AND (vhr.TYPE_VOLUME_HORAIRE_ID = tvh.id OR vh.TYPE_VOLUME_HORAIRE_ID = tvh.id)

GROUP BY

  w.intervenant_id, w.structure_id
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_920.sql

+3 −6
Original line number Diff line number Diff line
@@ -5,12 +5,9 @@ SELECT DISTINCT 
  Max(v.HISTO_CREATION) AS "Date de modification"

FROM

  tbl_workflow w

  JOIN VALIDATION v ON v.INTERVENANT_ID = w.INTERVENANT_ID

  JOIN type_volume_horaire tvh ON tvh.code = 'REALISE'

  LEFT JOIN VALIDATION_VOL_HORAIRE vvh ON vvh.VALIDATION_ID = v.ID

  LEFT JOIN VALIDATION_VOL_HORAIRE_REF vvhr ON vvhr.VALIDATION_ID = v.ID

  LEFT JOIN VOLUME_HORAIRE vh ON vh.ID = vvh.VOLUME_HORAIRE_ID

  LEFT JOIN VOLUME_HORAIRE_REF vhr ON vhr.ID = vvhr.VOLUME_HORAIRE_REF_ID

  LEFT JOIN type_volume_horaire tvh ON tvh.code = 'REALISE'

  LEFT JOIN service s ON s.intervenant_id = w.intervenant_id

  LEFT JOIN volume_horaire vh ON s.id = vh.service_id

WHERE

  w.etape_code = 'DEMANDE_MEP'

  AND w.type_intervenant_code = 'P'