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

Correction indicateur sur derniere heure modifié

parent c0483ffb
Loading
Loading
Loading
Loading
+3 −7
Original line number Diff line number Diff line
@@ -2,20 +2,16 @@ CREATE OR REPLACE FORCE VIEW V_INDICATEUR_910 AS
SELECT
  w.intervenant_id,
  w.structure_id,
  Max(v.HISTO_CREATION) AS "Date de modification"
  Max(vh.HISTO_MODIFICATION) 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
  JOIN contrat c ON c.intervenant_id = w.intervenant_id
  JOIN volume_horaire vh ON c.id = vh.contrat_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
+4 −8
Original line number Diff line number Diff line
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_920 AS
SELECT DISTINCT
SELECT
  w.intervenant_id,
  w.structure_id,
  Max(v.HISTO_CREATION) AS "Date de modification"
  Max(vh.HISTO_MODIFICATION) 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
  JOIN contrat c ON c.intervenant_id = w.intervenant_id
  JOIN volume_horaire vh ON c.id = vh.contrat_id
WHERE
  w.etape_code = 'DEMANDE_MEP'
  AND w.type_intervenant_code = 'P'
  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