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

HSLE#36221 Invulscherm bij cateringbestelling alleen bepaalde ruimtetypen tonen.

Browse Source 
svn path=/Website/branches/v2017.1/; revision=33985
This commit is contained in:
Erik Groener
2017-05-24 06:46:55 +00:00
parent 8dd86201bb
commit 23f693a14c
1 changed files with 2 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
APPL/Shared/Suggest/plaatsFilter.inc
View File

@@ -645,49 +645,11 @@ function get_res_bezorgfilter(params, level)
+ deel_filter
+ (level <= 4 ? " AND r.alg_verdieping_key = vv.alg_verdieping_key " : "")
+ (level <= 3 ? " AND vv.alg_gebouw_key = gg.alg_gebouw_key " : "")
+ (level <= 2 ? " AND gg.alg_locatie_key = l.alg_locatie_key" : "")
+ (level <= 2 ? " AND gg.alg_locatie_key = l.alg_locatie_key" : "");
}
else
{
// Alleen catering
var deel_filter = "";
sql = "SELECT MIN(res_deel_alg_level) res_deel_alg_level,"
+ " alg_district_key,"
+ " alg_regio_key,"
+ " alg_locatie_key,"
+ " alg_gebouw_key,"
+ " alg_verdieping_key,"
+ " alg_ruimte_key"
+ " FROM res_deel rd, ins_deel id, "
+ " alg_v_onrgoed_boom aob"
+ " WHERE rd.res_ins_deel_key = id.ins_deel_key"
+ " AND COALESCE(id.ins_alg_ruimte_type_org, id.ins_alg_ruimte_type) = 'R'"
+ " AND COALESCE(id.ins_alg_ruimte_key_org, id.ins_alg_ruimte_key) = aob.alg_ruimte_key"
+ " AND res_deel_alg_level > -1"
+ (res_deel_key > 0
? " AND res_deel_key = " + res_deel_key
: ""
)
+ " GROUP BY alg_district_key,"
+ " alg_regio_key,"
+ " alg_locatie_key,"
+ " alg_gebouw_key,"
+ " alg_verdieping_key,"
+ " alg_ruimte_key";
var oRs = Oracle.Execute(sql);
if (!oRs.eof)
res_deel_alg_level = oRs("res_deel_alg_level").Value;
if (level >= 5 && res_deel_alg_level == 5) deel_filter = " AND aob.alg_ruimte_key = " + oRs("alg_ruimte_key").Value;
if (level >= 4 && res_deel_alg_level == 4) deel_filter = " AND aob.alg_verdieping_key = " + oRs("alg_verdieping_key").Value;
if (level >= 3 && res_deel_alg_level == 3) deel_filter = " AND aob.alg_gebouw_key = " + oRs("alg_gebouw_key").Value;
if (level >= 2 && res_deel_alg_level == 2) deel_filter = " AND aob.alg_locatie_key = " + oRs("alg_locatie_key").Value;
if (level >= 1 && res_deel_alg_level == 1) deel_filter = " AND aob.alg_regio_key = " + oRs("alg_regio_key").Value;
if (level >= 0 && res_deel_alg_level == 0) deel_filter = " AND aob.alg_district_key = " + oRs("alg_district_key").Value;
// Als geen van bovenstaande combinaties geldt, dan blijft deel_filter leeg.
oRs.Close();
var niveau = {alias: "l", field: "alg_district_key"};
switch (level)
{
@@ -718,8 +680,7 @@ function get_res_bezorgfilter(params, level)
+ " OR (obj.alg_onrgoed_niveau = 'D' and obj.alg_onrgoed_key = aob.alg_district_key)"
+ " )"
+ " AND obj.alg_onrgoed_verwijder IS NULL"
+ " AND rad.res_activiteit_key = " + params.act_key
+ deel_filter;
+ " AND rad.res_activiteit_key = " + params.act_key;
}
return " /* get_res_bezorgfilter */ " + bezorgfilter;