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/trunk/; revision=33045
This commit is contained in:
Erik Groener
2017-03-06 09:54:43 +00:00
parent 0c54aed646
commit 39d0ea8a6f
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -604,25 +604,21 @@ function get_res_bezorgfilter(params, level)
if (level == 2 && res_deel_alg_level >= 2) filter_deel = "l.alg_locatie_key = " + oRs("alg_locatie_key").Value;
if (level == 1 && res_deel_alg_level >= 1) filter_deel = "r.alg_regio_key = " + oRs("alg_regio_key").Value;
if (level == 0 && res_deel_alg_level >= 0) filter_deel = "d.alg_district_key = " + oRs("alg_district_key").Value;
oRs.close();
var filter_artikel = "EXISTS"
+ " (SELECT ''"
+ " FROM res_srtartikel_onrgoed rao"
+ " WHERE rao.alg_onrgoed_key = r.alg_ruimte_key"
+ " AND rao.alg_onrgoed_niveau = 'R'"
+ " AND rao.res_discipline_key IN"
+ " (SELECT res_discipline_key"
+ " FROM res_activiteitdiscipline"
+ " WHERE res_activiteit_key = " + params.act_key
+ " )"
+ " )";
var bezorgfilter = " AND (" + filter_artikel + (res_deel_key > 0 ? " OR (" + filter_deel + ")" : "") + ")";
return bezorgfilter;
oRs.Close();
}
else
return "";
var filter_artikel = "EXISTS"
+ " (SELECT ''"
+ " FROM res_srtartikel_onrgoed rao"
+ " , res_activiteitdiscipline rad"
+ " WHERE rao.res_discipline_key = rad.res_discipline_key"
+ (level == 5 ? " AND rao.alg_onrgoed_key = r.alg_ruimte_key" : "")
+ " AND rad.res_activiteit_key = " + params.act_key
+ " )";
var bezorgfilter = " AND (" + filter_artikel + (res_deel_key > 0 ? " OR (" + filter_deel + ")" : "") + ")";
return " /* get_res_bezorgfilter */ " + bezorgfilter;
}
// Levert lege string of