From 54c451fd86b867a2d6389feb7f74b59a2c34c652 Mon Sep 17 00:00:00 2001
From: Antony Le Courtes <antony.lecourtes@unicaen.fr>
Date: Thu, 11 Mar 2021 17:22:44 +0100
Subject: [PATCH] =?UTF-8?q?Correction=20blocage=20feuille=20de=20route=20c?=
=?UTF-8?q?ause=20pr=C3=A9sence=20contrat=20et=20referentiel=20pour=20un?=
=?UTF-8?q?=20m=C3=AAme=20vacataire=20(ticket=20#35495)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
data/ddl/package/UNICAEN_TBL/body.sql | 32 --------------------------
data/ddl/view/V_TBL_CONTRAT.sql | 33 ---------------------------
2 files changed, 65 deletions(-)
diff --git a/data/ddl/package/UNICAEN_TBL/body.sql b/data/ddl/package/UNICAEN_TBL/body.sql
index 09f25fba57..d0b075db4a 100644
--- a/data/ddl/package/UNICAEN_TBL/body.sql
+++ b/data/ddl/package/UNICAEN_TBL/body.sql
@@ -921,38 +921,6 @@ WHERE
i.histo_destruction IS NULL
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
- AND NOT (si.peut_avoir_contrat = 0 AND evh.code = ''valide'')
)
SELECT
annee_id,
diff --git a/data/ddl/view/V_TBL_CONTRAT.sql b/data/ddl/view/V_TBL_CONTRAT.sql
index fb5e10697d..0ef6ad1d87 100644
--- a/data/ddl/view/V_TBL_CONTRAT.sql
+++ b/data/ddl/view/V_TBL_CONTRAT.sql
@@ -33,39 +33,6 @@ WITH t AS (
WHERE
i.histo_destruction IS NULL
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
- AND NOT (si.peut_avoir_contrat = 0 AND evh.code = 'valide')
)
SELECT
annee_id,
--
GitLab