From 4a6715ee6e2a15ae83f5de9f289a96140a069df4 Mon Sep 17 00:00:00 2001
From: Arthur Egberink <arthur.egberink@aareon.nl>
Date: Wed, 15 Oct 2008 09:57:58 +0000
Subject: [PATCH] CONN#14793

svn path=/Customer/trunk/; revision=13705
---
 CONN/conn.sql | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/CONN/conn.sql b/CONN/conn.sql
index 1d2b826ce..15cccd5b6 100644
--- a/CONN/conn.sql
+++ b/CONN/conn.sql
@@ -1,7 +1,7 @@
 -- Script containing customer specific configuration sql statements for CONN: Connexxion
 -- (c) 2005-2006 Dijkoraad IT bv
--- $Revision: 134 $
--- $Modtime: 12-09-08 10:14 $
+-- $Revision: 135 $
+-- $Modtime: 15-10-08 11:51 $
 --
 -- Support: +31 53 4800700
 
@@ -2298,27 +2298,38 @@ SELECT p.prs_perslid_naam, p.prs_perslid_oslogin, a1.prs_afdeling_omschrijving,
           gr.fac_groep_omschrijving, a1.prs_afdeling_omschrijving, a2.prs_afdeling_omschrijving;
 
 -- CONN#546
-CREATE OR REPLACE VIEW conn_v_contracten_gegevens
+CREATE OR REPLACE VIEW conn_v_contracten_gegevens (contractnr,
+                                                   externnr,
+                                                   fclt_f_bedrijf,
+                                                   ingangsdatum,
+                                                   einddatum,
+                                                   bedrag
+                                                  )
 AS
-   SELECT TO_CHAR (c.cnt_contract_key) contractnr, c.cnt_contract_nummer externnr,
+   SELECT TO_CHAR (c.cnt_contract_key) contractnr,
+          c.cnt_contract_nummer externnr,
           NVL (b.prs_bedrijf_naam, afd2.prs_afdeling_naam) fclt_f_bedrijf,
           TO_CHAR (c.cnt_contract_looptijd_van, 'DD-MM-YYYY') ingangsdatum,
-          TO_CHAR (c.cnt_contract_looptijd_tot, 'DD-MM-YYYY') einddatum, k1.cnt_kenmerkcontract_waarde bedrag
+          TO_CHAR (c.cnt_contract_looptijd_tot, 'DD-MM-YYYY') einddatum,
+          kc.cnt_kenmerkcontract_waarde bedrag
      FROM prs_v_aanwezigbedrijf b,
           cnt_v_aanwezigcontract c,
           prs_v_aanwezigafdeling afd,
           prs_v_aanwezigafdeling afd2,
-          cnt_kenmerkcontract k1,
-          cnt_disc_params cdp
+          cnt_disc_params cdp,
+          (SELECT cnt_contract_key, cnt_kenmerkcontract_waarde
+             FROM cnt_kenmerkcontract kc, cnt_kenmerk k
+            WHERE kc.cnt_kenmerk_key = k.cnt_kenmerk_key
+              AND k.cnt_srtkenmerk_key = 24
+              AND kc.cnt_kenmerkcontract_verwijder IS NULL) kc
     WHERE b.prs_bedrijf_key(+) = c.cnt_prs_bedrijf_key
       AND cdp.cnt_ins_discipline_key = c.ins_discipline_key
       AND cdp.cnt_srtcontract_type <> 2
       AND c.cnt_prs_afdeling_key = afd2.prs_afdeling_key(+)
       AND afd.prs_afdeling_key = c.prs_afdeling_key_eig
-      AND c.cnt_contract_key = k1.cnt_contract_key(+)
-      AND 26 = k1.cnt_kenmerk_key(+)
-      AND k1.cnt_kenmerkcontract_verwijder IS NULL
-      AND SYSDATE BETWEEN c.cnt_contract_looptijd_van AND c.cnt_contract_looptijd_tot + 1;
+      AND c.cnt_contract_key = kc.cnt_contract_key(+)
+      AND SYSDATE BETWEEN c.cnt_contract_looptijd_van
+                      AND c.cnt_contract_looptijd_tot + 1;
 
 
 /* Formatted on 2005/09/13 14:07 (Formatter Plus v4.8.5) */