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

INLO#56400 Reservering en Standaard teksten selecteerbaar bij mailen

Browse Source 
svn path=/Website/trunk/; revision=40882
This commit is contained in:
Erik Groener
2019-02-11 08:28:06 +00:00
parent 7acc1930e3
commit b22c3ba417
1 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
APPL/Shared/queuemail.asp
View File

@@ -430,43 +430,46 @@ function bestandenlijstALL(pmodule, pniveau, pkey)
<%
// standaard afmeldteksten
var sql = "SELECT ma.mld_afmeldtekst_key"
+ " , " + lcl.xsqla("ma.mld_afmeldtekst_naam", "ma.mld_afmeldtekst_key")
+ " , " + lcl.xsql("ma.mld_afmeldtekst_omschrijving", "ma.mld_afmeldtekst_key") + " afmeldtekstoms"
+ " , 2 src"
+ " FROM mld_melding mm"
+ " , mld_stdmelding sm"
+ " , mld_afmeldtekst ma"
+ " WHERE mm.mld_stdmelding_key = sm.mld_stdmelding_key"
+ " AND ( (ma.mld_stdmelding_key = mm.mld_stdmelding_key)"
+ " OR (ma.mld_stdmelding_key IS NULL AND ma.mld_ins_discipline_key = sm.mld_ins_discipline_key)"
+ " OR (ma.mld_stdmelding_key IS NULL AND ma.mld_ins_discipline_key IS NULL)"
+ " )"
+ " AND BITAND(ma.mld_afmeldtekst_usefor, 8) = 8"
+ " AND mm.mld_melding_key = " + pkey
+ " UNION "
+ "SELECT mo.mld_opdr_key"
+ " ," + safe.quoted_sql(L("lcl_opdr_closeremark") + " /") +"|| mo.mld_opdr_bedrijfopdr_volgnr"
+ " , mo.mld_opdr_opmerking"
+ " , 1"
+ " FROM mld_opdr mo"
+ " WHERE mo.mld_melding_key = " + pkey
+ " AND mo.mld_statusopdr_key in (6, 7, 9)" // status=afgemeld, verwerkt en afgerond
+ " AND mo.mld_opdr_opmerking IS NOT NULL"
+ " ORDER BY 4,2";
var oRs = Oracle.Execute(sql);
var show_afmeldtekst = !oRs.eof;
oRs.Close()
if (show_afmeldtekst)
if (pmodule == "MLD")
{
FCLTselector("stdopmerk",
sql,
{ label: L("lcl_mld_inf_std_opm"),
initKey: -1,
emptyOption: "",
extraParamValue: "afmeldtekstoms",
onChange: "PasteFromSelectbox()"
});
var sql = "SELECT ma.mld_afmeldtekst_key"
+ " , " + lcl.xsqla("ma.mld_afmeldtekst_naam", "ma.mld_afmeldtekst_key")
+ " , " + lcl.xsql("ma.mld_afmeldtekst_omschrijving", "ma.mld_afmeldtekst_key") + " afmeldtekstoms"
+ " , 2 src"
+ " FROM mld_melding mm"
+ " , mld_stdmelding sm"
+ " , mld_afmeldtekst ma"
+ " WHERE mm.mld_stdmelding_key = sm.mld_stdmelding_key"
+ " AND ( (ma.mld_stdmelding_key = mm.mld_stdmelding_key)"
+ " OR (ma.mld_stdmelding_key IS NULL AND ma.mld_ins_discipline_key = sm.mld_ins_discipline_key)"
+ " OR (ma.mld_stdmelding_key IS NULL AND ma.mld_ins_discipline_key IS NULL)"
+ " )"
+ " AND BITAND(ma.mld_afmeldtekst_usefor, 8) = 8"
+ " AND mm.mld_melding_key = " + pkey
+ " UNION "
+ "SELECT mo.mld_opdr_key"
+ " ," + safe.quoted_sql(L("lcl_opdr_closeremark") + " /") +"|| mo.mld_opdr_bedrijfopdr_volgnr"
+ " , mo.mld_opdr_opmerking"
+ " , 1"
+ " FROM mld_opdr mo"
+ " WHERE mo.mld_melding_key = " + pkey
+ " AND mo.mld_statusopdr_key in (6, 7, 9)" // status=afgemeld, verwerkt en afgerond
+ " AND mo.mld_opdr_opmerking IS NOT NULL"
+ " ORDER BY 4,2";
var oRs = Oracle.Execute(sql);
var show_afmeldtekst = !oRs.eof;
oRs.Close()
if (show_afmeldtekst)
{
FCLTselector("stdopmerk",
sql,
{ label: L("lcl_mld_inf_std_opm"),
initKey: -1,
emptyOption: "",
extraParamValue: "afmeldtekstoms",
onChange: "PasteFromSelectbox()"
});
}
}
// Notitie