From 56a29bc114863470a1036ee8e37a92916d8aee20 Mon Sep 17 00:00:00 2001 From: Jos Groot Lipman Date: Thu, 6 Apr 2023 16:17:59 +0000 Subject: [PATCH] SVRZ#62191 Core-wens: mailen rapportage svn path=/Database/trunk/; revision=59910 --- AUT/AUT_INI.SRC | 24 ++++++++++++++++++++++++ FAC/FAC_PAC.SRC | 16 +++++++++++----- FAC/FAC_TAB.SRC | 4 ++++ FAC/FAC_VIE.SRC | 3 ++- FCLT.NMK | 2 ++ FCLT.SRC | 1 + _UP/DB44to45.src | 8 ++++++++ 7 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 AUT/AUT_INI.SRC diff --git a/AUT/AUT_INI.SRC b/AUT/AUT_INI.SRC new file mode 100644 index 00000000..b850d582 --- /dev/null +++ b/AUT/AUT_INI.SRC @@ -0,0 +1,24 @@ +/* + * $Revision$ + * $Id$ + */ + +_FAC_MODULE('AUT','lcl_module_AUT') + +INSERT INTO aut_idp + (aut_idp_code, aut_idp_type, aut_idp_algorithm, + aut_idp_omschrijving, aut_idp_opmerking, + aut_idp_secret, aut_idp_audience, aut_idp_issuer, aut_idp_clockskew) + VALUES ('_INTERNAL', 4, 'HS256', + 'Internal use', 'Internal use only. Do not modify', + DBMS_RANDOM.string('a', 32), 'internal.facilitor.nl', 'internal.facilitor.nl', 30 + ); + +INSERT INTO aut_idp_map + (aut_idp_key, aut_idp_map_from, aut_idp_map_to, aut_idp_map_identify) + SELECT aut_idp_key, 'perslid_key', 99, 1 + FROM aut_idp + WHERE aut_idp_code = '_INTERNAL'; + +REGISTERONCE('$Id$') + diff --git a/FAC/FAC_PAC.SRC b/FAC/FAC_PAC.SRC index 8c5f163c..ca658bf7 100644 --- a/FAC/FAC_PAC.SRC +++ b/FAC/FAC_PAC.SRC @@ -114,7 +114,9 @@ CREATE OR REPLACE PACKAGE fac PROCEDURE putsystemnotification (pmessage VARCHAR2, pmode NUMBER); PROCEDURE putnotificationsrtprio (pfrom NUMBER, pto NUMBER, pcode VARCHAR2, pref NUMBER, poptmessage VARCHAR2, poptstatus NUMBER, poptemail VARCHAR2, poptmobile VARCHAR2, pxref NUMBER, - pprio NUMBER, psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR DEFAULT 'DEFAULT'); + pprio NUMBER, psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL, + pbedrijfadreskey NUMBER DEFAULT NULL, pqueue VARCHAR2 DEFAULT 'DEFAULT', + pgeturl VARCHAR2 DEFAULT NULL); PROCEDURE clrnotifications (pcode VARCHAR2, pref NUMBER, pxref NUMBER DEFAULT NULL, puitz VARCHAR2 DEFAULT NULL, puitz2 VARCHAR2 DEFAULT NULL); PROCEDURE clrnotifications (pcode VARCHAR2, pref NUMBER, psubject VARCHAR2, preceiver NUMBER, pextrakey NUMBER); PROCEDURE clrnotifications_xmlnode (pxmlnode VARCHAR2, prefkey NUMBER); @@ -2222,7 +2224,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS psender VARCHAR2, pattach VARCHAR2 DEFAULT NULL, pbedrijfadreskey NUMBER DEFAULT NULL, - pqueue VARCHAR DEFAULT 'DEFAULT') + pqueue VARCHAR2 DEFAULT 'DEFAULT', + pgeturl VARCHAR2 DEFAULT NULL) AS soms fac_srtnotificatie.fac_srtnotificatie_oms%TYPE; smode fac_srtnotificatie.fac_srtnotificatie_mode%TYPE; @@ -2490,7 +2493,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS fac_notificatie_systeemadres, fac_notificatie_attachments, prs_bedrijfadres_key, - fac_notificatie_queue) + fac_notificatie_queue, + fac_notificatie_geturl) VALUES (skey, lmode, pfrom, @@ -2506,7 +2510,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS lsysteem, pattach, pbedrijfadreskey, - pqueue); + pqueue, + pgeturl); END IF; END; @@ -2760,7 +2765,8 @@ CREATE OR REPLACE PACKAGE BODY fac AS lxsender, attachments, lbedrijfadreskey, - pqueue); + pqueue, + NULL); // TODO: geturl END IF; END LOOP; diff --git a/FAC/FAC_TAB.SRC b/FAC/FAC_TAB.SRC index baac5645..f07a653a 100644 --- a/FAC/FAC_TAB.SRC +++ b/FAC/FAC_TAB.SRC @@ -639,6 +639,10 @@ CREATE_TABLE(fac_notificatie, 0) VARCHAR2(30), fac_notificatie_oms VARCHAR2(2048), + fac_notificatie_geturl /* rapport mailen */ + VARCHAR2(4000), + fac_notificatie_getbody + VARCHAR2(4000), fac_notificatie_refkey NUMBER(10), fac_notificatie_extrakey diff --git a/FAC/FAC_VIE.SRC b/FAC/FAC_VIE.SRC index e8d7b7e9..937e2e6e 100644 --- a/FAC/FAC_VIE.SRC +++ b/FAC/FAC_VIE.SRC @@ -720,7 +720,8 @@ SELECT fac_notificatie_receiver_email, fac_notificatie_receiver_phone, fac_notif fac_notificatie_key, fac_notificatie_refkey, fac_notificatie_datum, fac_srtnotificatie_code, fac_srtnotificatie_xmlnode, fac_notificatie_extrakey, fac_notificatie_sender_email, fac_notificatie_lang, fac_notificatie_systeemadres, fac_notificatie_attachments, fac_srtnotificatie_delay, fac_srtnotificatie_srtkm_key, prs_perslid_key_receiver, - fac_notificatie_notbefore, fac_notificatie_failcount, prs_bedrijfadres_key + fac_notificatie_notbefore, fac_notificatie_failcount, prs_bedrijfadres_key, + prs_perslid_key_sender, fac_notificatie_geturl, fac_notificatie_getbody FROM fac_notificatie n LEFT OUTER JOIN fac_srtnotificatie sn ON n.fac_srtnotificatie_key = sn.fac_srtnotificatie_key; diff --git a/FCLT.NMK b/FCLT.NMK index 0a668d10..1681a07a 100644 --- a/FCLT.NMK +++ b/FCLT.NMK @@ -129,6 +129,7 @@ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL: \ $(MSRC)\aut\aut_seq.src \ $(MSRC)\aut\aut_tab.src \ $(MSRC)\aut\aut_tri.src \ + $(MSRC)\aut\aut_ini.src \ $(MSRC)\bes\bes_ind.src \ $(MSRC)\bes\bes_ini.src \ $(MSRC)\bes\bes_pac.src \ @@ -182,6 +183,7 @@ $(EXE)\$(NEXTROOT)\FCLT$(NEXTVERSION)$(FILEVERSION).SQL: \ $(MSRC)\exc\exc_tab.src \ $(MSRC)\exc\exc_seq.src \ $(MSRC)\exc\exc_pac.src \ + $(MSRC)\exc\exc_ini.src \ $(MSRC)\fac\fac_ind.src \ $(MSRC)\fac\fac_ini.src \ $(MSRC)\fac\fac_lcl.src \ diff --git a/FCLT.SRC b/FCLT.SRC index f42c0351..2f0c69c6 100644 --- a/FCLT.SRC +++ b/FCLT.SRC @@ -163,6 +163,7 @@ SET ECHO ON #include "msg\msg_ini.src" #include "kpi\kpi_ini.src" #include "ctr\ctr_ini.src" +#include "aut\aut_ini.src" #include "exc\exc_ini.src" COMMIT; diff --git a/_UP/DB44to45.src b/_UP/DB44to45.src index e974659e..b0ab908f 100644 --- a/_UP/DB44to45.src +++ b/_UP/DB44to45.src @@ -232,6 +232,14 @@ ALTER TABLE alg_gebouw ADD alg_gebouw_postcode VARCHAR2(12); /////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000 +ALTER TABLE fac_notificatie ADD fac_notificatie_geturl VARCHAR2(4000); +ALTER TABLE fac_notificatie ADD fac_notificatie_getbody VARCHAR2(4000); + +#include "../AUT/AUT_INI.SRC" + +/////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000 + + REGISTERONCE('$Id$') #include "epilogue.inc"