FSN#36641 srtdisc_sql ook naar beschikbare stdmeldingen laten kijken

svn path=/Website/trunk/; revision=29542
This commit is contained in:
Ruud Lipper
2016-05-26 13:12:56 +00:00
parent 8b578ce43d
commit 8ef174a184

View File

@@ -4030,6 +4030,13 @@ mld = {setmeldingstatus:
+ " AND f.fac_functie_code = " + safe.quoted_sql(autfunction) + " AND f.fac_functie_code = " + safe.quoted_sql(autfunction)
+ " AND (g.fac_gebruiker_alg_level_write < 9 AND g.fac_gebruiker_prs_level_write < 9)" + " AND (g.fac_gebruiker_alg_level_write < 9 AND g.fac_gebruiker_prs_level_write < 9)"
+ " AND g.prs_perslid_key = " + user_key + ")" + " AND g.prs_perslid_key = " + user_key + ")"
+ " AND td.ins_discipline_key IN("
+ " SELECT mld_ins_discipline_key"
+ " FROM mld_stdmelding "
+ " WHERE mld_stdmelding_verwijder IS NULL "
+ " AND (mld_stdmelding_vervaldatum IS NULL "
+ " OR mld_stdmelding_vervaldatum > TRUNC (SYSDATE)) "
+ (autfunction == "WEB_MLDUSE" ? " AND mld_stdmelding_notfrontend = 0) " : ")")
if (ins_key > 0) // dan moet die discipline ook nog meldingen hebben die betrekking *kunnen* if (ins_key > 0) // dan moet die discipline ook nog meldingen hebben die betrekking *kunnen*
{ // hebben op ons object. In theorie zouden we ook nog kunnen ALG-scopen... { // hebben op ons object. In theorie zouden we ook nog kunnen ALG-scopen...
mySRTsql += " AND sd.ins_srtdiscipline_ins = 1" mySRTsql += " AND sd.ins_srtdiscipline_ins = 1"
@@ -4042,6 +4049,7 @@ mld = {setmeldingstatus:
+ " AND insd.ins_deel_key = " + params.ins_key + " AND insd.ins_deel_key = " + params.ins_key
+ " AND isd.ins_srtdeel_key = insd.ins_srtdeel_key" + " AND isd.ins_srtdeel_key = insd.ins_srtdeel_key"
+ " AND isg.ins_srtgroep_key = isd.ins_srtgroep_key" + " AND isg.ins_srtgroep_key = isd.ins_srtgroep_key"
+ (autfunction == "WEB_MLDUSE" ? " AND mld_stdmelding_notfrontend = 0 " : "")
+ " AND ( msm.ins_srtinst_niveau = 'S' AND ins_srtinst_key = insd.ins_srtdeel_key" + " AND ( msm.ins_srtinst_niveau = 'S' AND ins_srtinst_key = insd.ins_srtdeel_key"
+ " OR msm.ins_srtinst_niveau = 'G' AND ins_srtinst_key = isg.ins_srtgroep_key" + " OR msm.ins_srtinst_niveau = 'G' AND ins_srtinst_key = isg.ins_srtgroep_key"
+ " OR msm.ins_srtinst_niveau = 'D' AND ins_srtinst_key = isg.ins_discipline_key" + " OR msm.ins_srtinst_niveau = 'D' AND ins_srtinst_key = isg.ins_discipline_key"