NYBU#27708

svn path=/Customer/trunk/; revision=19425

NYBU/nybu.sql

@@ -1051,7 +1051,7 @@ END nybu_update_prs;
 CREATE OR REPLACE VIEW nybu_v_rap_wp_verschil
 AS
    SELECT pf.prs_perslid_naam_full name,
-          '<a class="details" onclick=''FcltMgr.openDetail("appl/prs/prs_show_perslid.asp?prs_key='
+          '<a class="details" onclick=''FcltMgr.openDetail("appl/prs/prs_perslid.asp?mode=viewUpdate&key='
              || p.prs_perslid_key || '")''>'
              || p.prs_perslid_oslogin || '</a>'
              html_account,
@@ -1969,7 +1969,7 @@ AS
           alg_srtruimte sr
     WHERE v.alg_gebouw_key = g.alg_gebouw_key
       AND r.alg_verdieping_key = v.alg_verdieping_key
-      AND r.alg_srtruimte_key IN (56,43,58,39)
+      AND r.alg_srtruimte_key IN (56,43,58,39,121)
       AND sr.alg_srtruimte_key = r.alg_srtruimte_key;
 
 -- Kenmerkdomein studentenpartner
@@ -2183,9 +2183,12 @@ AS
                 cnt_kenmerkcontract roommate,
                 cnt_contract contr
           WHERE kamer.cnt_kenmerk_key = 1
+            AND kamer.cnt_kenmerkcontract_verwijder IS NULL
             AND roommate.cnt_kenmerk_key = 81
+            AND roommate.cnt_kenmerkcontract_verwijder IS NULL
             AND kamer.cnt_contract_key = roommate.cnt_contract_key
-            AND contr.cnt_contract_key = kamer.cnt_contract_key) b
+            AND contr.cnt_contract_key = kamer.cnt_contract_key
+            AND contr.cnt_contract_verwijder IS NULL) b
       ON     b.cnt_contract_key != a.cnt_contract_key
          AND b.alg_ruimte_key = a.alg_ruimte_key
          AND b.cnt_contract_looptijd_van < a.cnt_contract_looptijd_tot
@@ -2692,7 +2695,7 @@ BEGIN
              rec.prs_perslid_naam, rec.prs_perslid_naam_full, rec.prs_perslid_key,
              rec.cnt_contract_nummer_intern, rec.cnt_contract_key,
              rec.alg_ruimte_aanduiding, rec.alg_ruimte_key,
-             sk.cnt_srtkenmerk_omschrijving,
+             sk.cnt_srtkenmerk_omschrijving||' '||v_periodeNaam,
              'K91210',
              'P991210',
              '19010',
@@ -3795,11 +3798,13 @@ AS
         FROM cnt_contract c,
              (SELECT *
                 FROM cnt_kenmerkcontract
-               WHERE cnt_kenmerk_key = 81) h,
+               WHERE cnt_kenmerk_key = 81
+                 AND cnt_kenmerkcontract_verwijder IS NULL) h,
              prs_v_perslid_fullnames pf,
              (SELECT *
                 FROM cnt_kenmerkcontract
-               WHERE cnt_kenmerk_key = 1) sk,
+               WHERE cnt_kenmerk_key = 1
+                 AND cnt_kenmerkcontract_verwijder IS NULL) sk,
              (SELECT *
                 FROM prs_kenmerklink
                WHERE prs_kenmerklink_verwijder IS NULL
@@ -4078,6 +4083,26 @@ AS
                AND ext2_end.res_rsv_ruimte_key = r.res_rsv_ruimte_key
    );
 
+
+-- Voor kenmerkdomein contactpersoon (RES)
+CREATE OR REPLACE VIEW nybu_v_contactpersoon
+AS
+   SELECT prs_contactpersoon_key,
+             DECODE(prs_contactpersoon_aanhef,
+                    NULL, '',
+                    prs_contactpersoon_aanhef || ' ')
+          || DECODE(prs_contactpersoon_voorletters,
+                    NULL, '',
+                    prs_contactpersoon_voorletters || ' ')
+          || DECODE(prs_contactpersoon_tussenv,
+                    NULL, '',
+                    prs_contactpersoon_tussenv || ' ')
+          || prs_contactpersoon_naam prs_contactpersoon_naam_full,
+          b.prs_bedrijf_naam
+     FROM prs_contactpersoon p,
+          prs_bedrijf b
+    WHERE p.prs_bedrijf_key = b.prs_bedrijf_key;
+
 BEGIN adm.systrackscript('$Workfile: nybu.sql $', '$Revision$', 0); END;
 /
 BEGIN fac.registercustversion ('nybu', 2); END;