From c8f9878c5ec67a0ac47c51839f5f5c58430e25a4 Mon Sep 17 00:00:00 2001
From: Suzan Wiegerinck <suzan.wiegerinck@aareon.nl>
Date: Wed, 9 Mar 2016 10:13:51 +0000
Subject: [PATCH] PCHD#34588 Aanpassing in notificatie view

svn path=/Customer/trunk/; revision=28404
---
 PCHH/pchh.sql | 65 +++++++++++++++++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/PCHH/pchh.sql b/PCHH/pchh.sql
index e24ae8bef..3915f84d1 100644
--- a/PCHH/pchh.sql
+++ b/PCHH/pchh.sql
@@ -1,3 +1,4 @@
+/* Formatted on 9-3-2016 11:11:41 (QP5 v5.136.908.31019) */
 -- Script containing customer specific configuration sql statements for PCHH (Holding)
 -- (c) 2008 Facilitor
 -- $Revision$
@@ -10,7 +11,7 @@ set echo on
 set define off
 
 
-/* Formatted on 12-1-2016 11:42:07 (QP5 v5.136.908.31019) */
+
 -- Notificatie jobs
 --
 -- PCHD#34588: notificatie naar aanvragende werkmaatschappij sturen.
@@ -28,19 +29,25 @@ CREATE OR REPLACE VIEW pchh_v_noti_mldenergie
    xmobile
 )
 AS
-   SELECT DISTINCT NULL sender,
-                   NULL receiver,
-                   NULL text,
-                   fac_srtnotificatie_code,
-                   n.fac_srtnotificatie_key,
-                   m.mld_melding_key,
-                   NULL xkey,
-                   prs_bedrijf_email xemail,
-                   NULL xmobile
+   SELECT DISTINCT
+          NULL sender,
+          NULL receiver,
+          REPLACE (
+             REPLACE (sn.fac_srtnotificatie_oms,
+                      '##KEY##',
+                      m.mld_melding_key),
+             ' (##DISC##/##STDMLD##)',
+             ''),
+          fac_srtnotificatie_code,
+          n.fac_srtnotificatie_key,
+          m.mld_melding_key,
+          NULL xkey,
+          prs_contactpersoon_email xemail,
+          NULL xmobile
      FROM fac_tracking t,
           mld_melding m,
           fac_srtnotificatie n,
-          prs_bedrijf b,
+          prs_contactpersoon c,
           mld_kenmerkmelding km,
           mld_kenmerk k
     WHERE T.FAC_TRACKING_REFKEY = M.MLD_MELDING_KEY
@@ -48,15 +55,21 @@ AS
           AND (N.FAC_SRTNOTIFICATIE_CODE = 'MLDNEW'
                OR N.FAC_SRTNOTIFICATIE_CODE = 'MLDAFM')
           AND KM.MLD_MELDING_KEY = M.MLD_MELDING_KEY
-          AND KM.MLD_KENMERK_KEY IN (303, 318, 281, 315)
-          AND FAC.SAFE_TO_NUMBER (mld_kenmerkmelding_waarde) = prs_bedrijf_key
-          AND t.fac_tracking_datum > (SELECT fac_notificatie_job_nextrun - fac_notificatie_job_interval/24
-    FROM fac_notificatie_job
-    WHERE UPPER (fac_notificatie_job_view) = 'PCHH_V_NOTI_MLDENERGIE' )
-      AND t.fac_tracking_datum < (SELECT fac_notificatie_job_nextrun
-        FROM fac_notificatie_job
-    WHERE UPPER (fac_notificatie_job_view) = 'PCHH_V_NOTI_MLDENERGIE');
-    
+          AND KM.MLD_KENMERK_KEY = 302
+          AND FAC.SAFE_TO_NUMBER (mld_kenmerkmelding_waarde) =
+                prs_contactpersoon_key
+          AND t.fac_tracking_datum >
+                (SELECT fac_notificatie_job_nextrun
+                        - fac_notificatie_job_interval / 24
+                   FROM fac_notificatie_job
+                  WHERE UPPER (fac_notificatie_job_view) =
+                           'PCHH_V_NOTI_MLDENERGIE')
+          AND t.fac_tracking_datum <
+                (SELECT fac_notificatie_job_nextrun
+                   FROM fac_notificatie_job
+                  WHERE UPPER (fac_notificatie_job_view) =
+                           'PCHH_V_NOTI_MLDENERGIE');
+
 SHOW ERRORS
 
 CREATE OR REPLACE FORCE VIEW PCHH.PCHH_V_WERKMAATSCHAPPIJ
@@ -82,9 +95,15 @@ AS
           AND B.PRS_BEDRIJF_KEY = C.PRS_BEDRIJF_KEY
           AND b.prs_bedrijf_huurder = 1;
 
-BEGIN fac.registercustversion('PCHH', 2); END;
+BEGIN
+   fac.registercustversion ('PCHH', 2);
+END;
 /
-BEGIN adm.systrackscriptId('$Id$', 0); END;
+
+BEGIN
+   adm.systrackscriptId ('$Id$', 0);
+END;
 /
+
 COMMIT;
-SPOOL OFF
+SPOOL OFF
\ No newline at end of file