Commit 0814027e authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Indicateurs corrigés suite refonte tbl contrat

parent 69df6059

data/ddl/view/V_INDICATEUR_380.sql

+3 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ SELECT DISTINCT 
    JOIN mission mi                 ON mi.intervenant_id = i.id

    JOIN volume_horaire_mission vhm ON vhm.mission_id = mi.id

    JOIN statut si                  ON si.id = i.statut_id

    LEFT JOIN tbl_contrat tblc      ON tblc.mission_id = vhm.mission_id

    JOIN tbl_contrat tblc           ON tblc.mission_id = vhm.mission_id AND tblc.volume_horaire_index = 0

  WHERE w.atteignable = 1

    AND w.etape_code = 'CONTRAT'

    AND w.objectif > w.realisation
@@ -20,5 +20,6 @@ SELECT DISTINCT 
    AND si.histo_destruction IS NULL

    AND si.contrat = 1

    AND vhm.contrat_id IS NULL

    AND tblc.id IS NULL

    AND tblc.contrat_id IS NULL

    AND tblc.contrat_parent_id IS NULL

    AND tblc.actif = 1
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_390.sql

+3 −13
Original line number Diff line number Diff line
@@ -9,23 +9,13 @@ SELECT DISTINCT 
FROM

  tbl_workflow w

  JOIN intervenant  i                   ON w.intervenant_id = i.id

  JOIN mission mi                       ON mi.intervenant_id = i.id

  JOIN volume_horaire_mission vhm       ON vhm.mission_id = mi.id

  JOIN tbl_contrat tc ON tc.intervenant_id = w.intervenant_id AND tc.volume_horaire_index =0

  JOIN statut      si                   ON si.id = i.statut_id

  JOIN TYPE_VOLUME_HORAIRE tvh          ON tvh.CODE = 'PREVU'

  JOIN validation_vol_horaire_miss vvhm ON vvhm.volume_horaire_mission_id = vhm.id

  JOIN validation v                     ON vvhm.validation_id = v.id

  LEFT JOIN tbl_contrat tblc            ON tblc.mission_id = vhm.mission_id

WHERE

  w.atteignable = 1

  AND w.etape_code = 'CONTRAT'

  AND w.objectif > w.realisation

  AND i.histo_destruction IS NULL

  AND si.histo_destruction IS NULL

  AND si.contrat = 1

  AND vhm.contrat_id IS NULL

  AND vhm.histo_destruction IS NULL

  AND vhm.type_volume_horaire_id = tvh.ID

  AND tblc.contrat_parent_id IS NOT NULL

  AND v.histo_destruction IS NULL

  AND tblc.actif = 1
 
 No newline at end of file
 
  AND tc.contrat_parent_id IS NOT NULL

  AND tc.actif = 1
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_420.sql

+1 −2
Original line number Diff line number Diff line
@@ -9,14 +9,13 @@ SELECT DISTINCT 
FROM tbl_workflow w

  JOIN intervenant    i ON w.intervenant_id = i.id

  JOIN statut        si ON si.id = i.statut_id

  LEFT JOIN tbl_contrat tblc ON tblc.intervenant_id = w.intervenant_id

  JOIN tbl_contrat tblc ON tblc.intervenant_id = w.intervenant_id AND volume_horaire_index = 0

WHERE

  w.atteignable = 1

  AND w.etape_code = 'CONTRAT'

  AND w.objectif > 0

  AND w.realisation = 0

  AND i.histo_destruction IS NULL

  AND si.histo_destruction IS NULL

  AND tblc.contrat_id IS NULL

  AND si.contrat = 1

  AND tblc.actif = 1
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_430.sql

+2 −2
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_430 AS

SELECT

SELECT DISTINCT

  w.intervenant_id,

  CASE

    WHEN w.structure_id IS NOT NULL
@@ -9,7 +9,7 @@ SELECT 
FROM

  intervenant i

  JOIN tbl_workflow w ON w.intervenant_id = i.id

  JOIN tbl_contrat tblc ON tblc.intervenant_id = i.id

  JOIN tbl_contrat tblc ON tblc.intervenant_id = i.id AND tblc.volume_horaire_index = 0

  JOIN type_service ts ON tblc.type_service_id = ts.id

WHERE

  w.atteignable = 1