From 3099344b6fadf609d8fe0831b58c3b474db8d329 Mon Sep 17 00:00:00 2001 From: Maarten van der Heide Date: Fri, 2 Feb 2018 14:07:01 +0000 Subject: [PATCH] RWSN#41911 Noti/Mail met bijlagen (niet) naar externen svn path=/Customer/trunk/; revision=36825 --- RWSN/rwsn.sql | 86 ++++++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/RWSN/rwsn.sql b/RWSN/rwsn.sql index feb46e550..9203fcb5c 100644 --- a/RWSN/rwsn.sql +++ b/RWSN/rwsn.sql @@ -2673,7 +2673,6 @@ END; -- (ipv. via dummy-export). -- Notificatiecode=MLDINF (speciale bon), maar 'Onderwerp' komt uit MLDNEW- of -- MLDAFM-code! -/* Formatted on 14-9-2017 13:42:18 (QP5 v5.136.908.31019) */ CREATE OR REPLACE VIEW rwsn_v_noti_extern ( sender, @@ -2690,7 +2689,13 @@ CREATE OR REPLACE VIEW rwsn_v_noti_extern AS SELECT NULL, NULL, - x.text, + REPLACE ( + REPLACE ( + REPLACE ( + lcl.x ('fac_srtnotificatie_oms', sn.fac_srtnotificatie_key, sn.fac_srtnotificatie_oms), + '##KEY##', TO_CHAR (x.mld_melding_key)), + '##STDMLD##', TO_CHAR (x.mld_stdmelding_omschrijving)), + '##DISC##', TO_CHAR (x.ins_discipline_omschrijving)), 'MLDINF', x.mld_melding_key, NULL, @@ -2701,43 +2706,45 @@ AS x.fac_srtnotificatie_key, 22, 'MLD/M' || SUBSTR (LPAD (TO_CHAR (x.mld_melding_key), 7, '0'), 1, 4) || '___/M' || TO_CHAR (x.mld_melding_key) || '/' || TO_CHAR (y.mld_kenmerk_key) || '/*', NULL) - FROM (SELECT md.ins_srtdiscipline_key, - md.ins_discipline_key, - sm.mld_stdmelding_key, - m.mld_melding_key, - md.ins_discipline_email sender, - km.mld_kenmerkmelding_waarde receiver, - REPLACE ( - REPLACE ( - REPLACE ( - lcl.x ('fac_srtnotificatie_oms', sn.fac_srtnotificatie_key, sn.fac_srtnotificatie_oms), - '##KEY##', TO_CHAR (m.mld_melding_key)), - '##STDMLD##', TO_CHAR (sm.mld_stdmelding_omschrijving)), - '##DISC##', TO_CHAR (md.ins_discipline_omschrijving)) - text, - t.fac_srtnotificatie_key - FROM mld_melding m, - mld_stdmelding sm, - mld_discipline md, - mld_kenmerkmelding km, - mld_kenmerk k, - fac_tracking t, - fac_srtnotificatie sn - WHERE m.mld_stdmelding_key = sm.mld_stdmelding_key - AND sm.mld_ins_discipline_key = md.ins_discipline_key - AND m.mld_melding_key = km.mld_melding_key - AND km.mld_kenmerk_key = k.mld_kenmerk_key - AND k.mld_srtkenmerk_key = 20 -- E-mail - AND m.mld_melding_key = t.fac_tracking_refkey - AND t.fac_srtnotificatie_key IN (26, 22) -- MLDNEW/MLDAFM - AND t.fac_tracking_datum > - DECODE ( - TO_CHAR (SYSDATE + 5 / 1440, 'HH24'), - '08', TO_DATE (TO_CHAR (SYSDATE - 1, 'dd-mm-yyyy') || ' 16:00', 'dd-mm-yyyy hh24:mi'), - '12', TO_DATE (TO_CHAR (SYSDATE, 'dd-mm-yyyy') || ' 08:00', 'dd-mm-yyyy hh24:mi'), - '16', TO_DATE (TO_CHAR (SYSDATE, 'dd-mm-yyyy') || ' 12:00', 'dd-mm-yyyy hh24:mi'), - SYSDATE + 5 / 1440) - AND t.fac_srtnotificatie_key = sn.fac_srtnotificatie_key) x + FROM ( SELECT md.ins_srtdiscipline_key, + md.ins_discipline_key, + md.ins_discipline_omschrijving, + sm.mld_stdmelding_key, + sm.mld_stdmelding_omschrijving, + m.mld_melding_key, + md.ins_discipline_email sender, + km.mld_kenmerkmelding_waarde receiver, + MIN (t.fac_srtnotificatie_key) fac_srtnotificatie_key -- 22=MLDAFM wint! + FROM mld_melding m, + mld_stdmelding sm, + mld_discipline md, + mld_kenmerkmelding km, + mld_kenmerk k, + fac_tracking t + WHERE m.mld_stdmelding_key = sm.mld_stdmelding_key + AND sm.mld_ins_discipline_key = md.ins_discipline_key + AND m.mld_melding_key = km.mld_melding_key + AND km.mld_kenmerk_key = k.mld_kenmerk_key + AND k.mld_srtkenmerk_key = 20 -- E-mail + AND m.mld_melding_key = t.fac_tracking_refkey + AND t.fac_srtnotificatie_key IN (26, 22) -- MLDNEW/MLDAFM + AND t.fac_tracking_datum > + DECODE ( + TO_CHAR (SYSDATE + 5 / 1440, 'HH24'), + '08', TO_DATE (TO_CHAR (SYSDATE - 1, 'dd-mm-yyyy') || ' 16:00', 'dd-mm-yyyy hh24:mi'), + '12', TO_DATE (TO_CHAR (SYSDATE, 'dd-mm-yyyy') || ' 08:00', 'dd-mm-yyyy hh24:mi'), + '16', TO_DATE (TO_CHAR (SYSDATE, 'dd-mm-yyyy') || ' 12:00', 'dd-mm-yyyy hh24:mi'), + SYSDATE + 5 / 1440) + GROUP BY md.ins_srtdiscipline_key, + md.ins_discipline_key, + md.ins_discipline_omschrijving, + sm.mld_stdmelding_key, + sm.mld_stdmelding_omschrijving, + m.mld_melding_key, + md.ins_discipline_email, + km.mld_kenmerkmelding_waarde) x + LEFT JOIN fac_srtnotificatie sn + ON x.fac_srtnotificatie_key = sn.fac_srtnotificatie_key LEFT JOIN (SELECT mld_stdmelding_key, mld_kenmerk_niveau, mld_kenmerk_key FROM mld_kenmerk WHERE mld_srtkenmerk_key = 5100) y -- Bij afmelden mee te sturen bijlagen @@ -2745,6 +2752,7 @@ AS OR (x.ins_discipline_key = y.mld_stdmelding_key AND y.mld_kenmerk_niveau = 'D') OR (x.ins_srtdiscipline_key = y.mld_stdmelding_key AND y.mld_kenmerk_niveau = 'T')); + -- RWSN#31363: CUST10-noti naar externe bezoeker nav. registratie afspraak. /* Formatted on 14-2-2017 9:45:15 (QP5 v5.136.908.31019) */ CREATE OR REPLACE VIEW rwsn_v_noti_ext_bezoeker