Commit 6625c178 authored by Antony Le Courtes's avatar Antony Le Courtes
Browse files

Correction blocage feuille de route cause présence contrat et referentiel pour... 

Correction blocage feuille de route cause présence contrat et referentiel pour un même vacataire (ticket #35495)
parent ee726879

data/ddl/package/UNICAEN_TBL/body.sql

+0 −34
Original line number Diff line number Diff line
@@ -788,40 +788,6 @@ CREATE OR REPLACE PACKAGE BODY "UNICAEN_TBL" AS 
            /*@ANNEE_ID=i.annee_id*/

            AND NOT (si.peut_avoir_contrat = 0 AND evh.code = ''valide'')



          UNION ALL



          SELECT

            i.annee_id                                                                annee_id,

            i.id                                                                      intervenant_id,

            si.peut_avoir_contrat                                                     peut_avoir_contrat,

            s.structure_id                                                            structure_id,

            CASE WHEN evh.code IN (''contrat-edite'',''contrat-signe'') THEN 1 ELSE 0 END edite,

            CASE WHEN evh.code IN (''contrat-signe'')                 THEN 1 ELSE 0 END signe

          FROM

                      intervenant                 i



                 JOIN statut_intervenant         si ON si.id = i.statut_id



                 JOIN service_referentiel         s ON s.intervenant_id = i.id

                                                   AND s.histo_destruction IS NULL



                 JOIN type_volume_horaire       tvh ON tvh.code = ''PREVU''



                 JOIN volume_horaire_ref         vh ON vh.service_referentiel_id = s.id

                                                   AND vh.histo_destruction IS NULL

                                                   AND vh.heures <> 0

                                                   AND vh.type_volume_horaire_id = tvh.id



                 JOIN v_volume_horaire_ref_etat vhe ON vhe.volume_horaire_ref_id = vh.id



                 JOIN etat_volume_horaire       evh ON evh.id = vhe.etat_volume_horaire_id

                                                   AND evh.code IN (''valide'', ''contrat-edite'', ''contrat-signe'')



          WHERE

            i.histo_destruction IS NULL

            /*@INTERVENANT_ID=i.id*/

            /*@ANNEE_ID=i.annee_id*/

            AND NOT (si.peut_avoir_contrat = 0 AND evh.code = ''valide'')

        )

        SELECT

          annee_id,

data/ddl/view/V_TBL_CONTRAT.sql

+0 −35
Original line number Diff line number Diff line
@@ -35,41 +35,6 @@ WITH t AS ( 
    /*@INTERVENANT_ID=i.id*/

    /*@ANNEE_ID=i.annee_id*/

    AND NOT (si.peut_avoir_contrat = 0 AND evh.code = 'valide')



  UNION ALL



  SELECT

    i.annee_id                                                                annee_id,

    i.id                                                                      intervenant_id,

    si.peut_avoir_contrat                                                     peut_avoir_contrat,

    s.structure_id                                                            structure_id,

    CASE WHEN evh.code IN ('contrat-edite','contrat-signe') THEN 1 ELSE 0 END edite,

    CASE WHEN evh.code IN ('contrat-signe')                 THEN 1 ELSE 0 END signe

  FROM

              intervenant                 i



         JOIN statut_intervenant         si ON si.id = i.statut_id



         JOIN service_referentiel         s ON s.intervenant_id = i.id

                                           AND s.histo_destruction IS NULL



         JOIN type_volume_horaire       tvh ON tvh.code = 'PREVU'



         JOIN volume_horaire_ref         vh ON vh.service_referentiel_id = s.id

                                           AND vh.histo_destruction IS NULL

                                           AND vh.heures <> 0

                                           AND vh.type_volume_horaire_id = tvh.id



         JOIN v_volume_horaire_ref_etat vhe ON vhe.volume_horaire_ref_id = vh.id



         JOIN etat_volume_horaire       evh ON evh.id = vhe.etat_volume_horaire_id

                                           AND evh.code IN ('valide', 'contrat-edite', 'contrat-signe')



  WHERE

    i.histo_destruction IS NULL

    /*@INTERVENANT_ID=i.id*/

    /*@ANNEE_ID=i.annee_id*/

    AND NOT (si.peut_avoir_contrat = 0 AND evh.code = 'valide')

)

SELECT

  annee_id,