admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSUN#37615 Bijlages [mee kunnen sturen met notificatie]

Browse Source 
svn path=/Website/trunk/; revision=31661
This commit is contained in:
Erik Groener
2016-11-24 12:14:17 +00:00
parent d297d045ae
commit 26594bf64d
2 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
UTILS/PutOrders/puo_notifications.js
View File

@@ -67,6 +67,15 @@ function sendNotification(ref_key, pcode)
Log2File(1, "** START sendNotification (" + toDateTimeString(new Date()) + ")");
}
var sql_kenmerk = "SELECT k1.mld_kenmerk_key kenmerk_key"
+ " , k1.mld_srtkenmerk_key srtkenmerk_key"
+ " FROM mld_kenmerk k1"
+ " WHERE k1.mld_kenmerk_groep ="
+ " (SELECT MIN(k2.mld_kenmerk_groep)"
+ " FROM mld_kenmerk k2"
+ " WHERE k2.mld_srtkenmerk_key = k1.mld_srtkenmerk_key"
+ " )";
var sql = "SELECT fac_notificatie_receiver_email"
+ " , fac_notificatie_receiver_phone"
+ " , fac_notificatie_oms"
@@ -75,14 +84,16 @@ function sendNotification(ref_key, pcode)
+ " , fac_notificatie_key"
+ " , fac_srtnotificatie_xmlnode"
+ " , fac_srtnotificatie_code"
+ " , fac_srtnotificatie_kenmerk_key"
+ " , kenmerk_key attach_kenmerk_key"
+ " , NVL(fac_notificatie_extrakey, -1) fac_notificatie_extrakey"
+ " , fac_notificatie_sender_email"
+ " , COALESCE(fac_notificatie_lang, 'NL') fac_notificatie_lang"
+ " , fac_notificatie_systeemadres"
+ " , fac_notificatie_attachments"
+ " FROM fac_v_notifyqueue"
+ " WHERE ( BITAND (fac_notificatie_status, " + (puo_const.STATUS_EMAIL | puo_const.STATUS_SMS) + ") > 0"
+ " FROM fac_v_notifyqueue f"
+ " , (" + sql_kenmerk + ") k"
+ " WHERE fac_srtnotificatie_srtkm_key = k.srtkenmerk_key(+)"
+ " AND ( BITAND (fac_notificatie_status, " + (puo_const.STATUS_EMAIL | puo_const.STATUS_SMS) + ") > 0"
+ " OR fac_notificatie_systeemadres IS NOT NULL)"
+ strFilter
+ " ORDER BY fac_notificatie_datum"
@@ -101,7 +112,7 @@ function sendNotification(ref_key, pcode)
+ oRs("fac_notificatie_key").value + " "
+ oRs("fac_srtnotificatie_code").value + ": "
+ oRs("fac_notificatie_refkey").value + "; "
+ oRs("fac_srtnotificatie_kenmerk_key").value
+ oRs("attach_kenmerk_key").value
+ " (" + toDateTimeString(new Date()) + ")"
);
if ((S("puo_flags") & 1) != 1) // Voor in testomgevingen
@@ -144,7 +155,7 @@ function notificationMail(rec, p_notificationXSL, params)
var receiver_email = rec("fac_notificatie_receiver_email").value || "";
var sender_email = rec("fac_notificatie_sender_email").value || "";
var attach_refkey = rec("fac_notificatie_refkey").value;
var attach_kenmerk = [rec("fac_srtnotificatie_kenmerk_key").value];
var attach_kenmerk = [rec("attach_kenmerk_key").value];
var srtcode = rec("fac_srtnotificatie_code").value || "";
var xmlnode = rec("fac_srtnotificatie_xmlnode").value || "";