Commit f2050911 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Correction #50952

parent 052022b6

data/ddl/view/V_INDICATEUR_550.sql

+6 −5
Original line number Diff line number Diff line
@@ -5,14 +5,15 @@ SELECT 
  s.libelle_court "Composantes concernées"

FROM

  tbl_workflow w

  JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id

  JOIN intervenant i ON i.id = wc.intervenant_id

  JOIN statut s ON s.id = i.statut_id

  LEFT JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id AND wc.etape_code = 'CLOTURE_REALISE'

  JOIN intervenant i ON i.id = w.intervenant_id

  JOIN statut s ON s.id = i.statut_id AND s.type_intervenant_id = (SELECT id FROM type_intervenant ti WHERE code = 'P')

  JOIN structure s ON s.id = w.structure_id

WHERE

  w.etape_code = 'SERVICE_VALIDATION_REALISE'

  AND w.objectif > w.realisation

  AND w.atteignable = 1

  AND (wc.etape_code = 'CLOTURE_REALISE' AND s.cloture = 1)

  AND wc.objectif = wc.realisation

  AND CASE WHEN s.cloture = 1 AND wc.objectif = wc.realisation THEN 1

  		   WHEN s.cloture = 0 THEN 1

  		   ELSE 0 END  = 1

  AND w.structure_id <> i.structure_id
 
 No newline at end of file

data/ddl/view/V_INDICATEUR_560.sql

+10 −8
Original line number Diff line number Diff line
@@ -6,23 +6,25 @@ SELECT 
FROM

  tbl_workflow w

  JOIN TYPE_VOLUME_HORAIRE tvh ON tvh.CODE = 'REALISE'

  JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id

  JOIN intervenant i ON i.id = wc.intervenant_id

  LEFT JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id AND wc.etape_code = 'CLOTURE_REALISE'

  JOIN intervenant i ON i.id = w.intervenant_id

  JOIN structure s ON s.id = w.structure_id

  JOIN statut s ON s.id = i.statut_id

  JOIN statut s ON s.id = i.statut_id AND s.type_intervenant_id = (SELECT id FROM type_intervenant ti WHERE code = 'P')

  LEFT JOIN HISTO_INTERVENANT_SERVICE his ON his.INTERVENANT_ID = w.intervenant_id

WHERE

  w.etape_code = 'REFERENTIEL_VALIDATION_REALISE'

  AND w.objectif > w.realisation

  AND w.atteignable = 1



  AND (wc.etape_code = 'CLOTURE_REALISE' AND s.cloture = 1)

  AND wc.objectif = wc.realisation

  AND CASE WHEN s.cloture = 1 AND wc.objectif = wc.realisation THEN 1

  		   WHEN s.cloture = 0 THEN 1

  		   ELSE 0 END  = 1

  AND w.structure_id = i.structure_id



  AND his.TYPE_VOLUME_HORAIRE_ID = tvh.ID

  AND his.REFERENTIEL = 1

GROUP BY

  w.annee_id,

  w.intervenant_id,

  i.structure_id

data/ddl/view/V_INDICATEUR_570.sql

+7 −6
Original line number Diff line number Diff line 
CREATE OR REPLACE FORCE VIEW V_INDICATEUR_570 AS

SELECT

  w.intervenant_id,

  i.annee_id,

  i.structure_id,

  s.libelle_court "Composantes concernées"

FROM

  tbl_workflow w

  JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id

  JOIN intervenant i ON i.id = wc.intervenant_id

  JOIN statut s ON s.id = i.statut_id

  LEFT JOIN tbl_workflow wc ON wc.intervenant_id = w.intervenant_id AND wc.etape_code = 'CLOTURE_REALISE'

  JOIN intervenant i ON i.id = w.intervenant_id

  JOIN statut s ON s.id = i.statut_id AND s.type_intervenant_id = (SELECT id FROM type_intervenant ti WHERE code = 'P')

  JOIN structure s ON s.id = w.structure_id

WHERE

  w.etape_code = 'REFERENTIEL_VALIDATION_REALISE'

  AND w.objectif > w.realisation

  AND w.atteignable = 1



  AND (wc.etape_code = 'CLOTURE_REALISE' AND s.cloture =1)

  AND wc.objectif = wc.realisation

  AND CASE WHEN s.cloture = 1 AND wc.objectif = wc.realisation THEN 1

  		   WHEN s.cloture = 0 THEN 1

  		   ELSE 0 END  = 1

  AND w.structure_id <> i.structure_id
 
 No newline at end of file