HSLE#36221 Invulscherm bij cateringbestelling alleen bepaalde ruimtetypen tonen.

svn path=/Website/trunk/; revision=32568
This commit is contained in:
Erik Groener
2017-01-26 12:51:30 +00:00
parent c35f7b8a16
commit 2196134453

View File

@@ -503,6 +503,8 @@ function get_res_bezorgfilter(params, level)
{
params = params || {};
var res_deel_key = getQParamInt("res_deel_key", params.res_deel_key||-1);
var filter_deel = "";
if (res_deel_key>0)
{
sql = "SELECT res_deel_alg_level,"
@@ -521,18 +523,29 @@ function get_res_bezorgfilter(params, level)
var oRs = Oracle.Execute(sql);
var res_deel_alg_level = oRs("res_deel_alg_level").Value;
if (level == 5 && res_deel_alg_level >= 5) return " AND r.alg_ruimte_key = " + oRs("alg_ruimte_key").Value;
if (level == 4 && res_deel_alg_level >= 4) return " AND v.alg_verdieping_key = " + oRs("alg_verdieping_key").Value;
if (level == 3 && res_deel_alg_level >= 3) return " AND g.alg_gebouw_key = " + oRs("alg_gebouw_key").Value;
if (level == 2 && res_deel_alg_level >= 2) return " AND l.alg_locatie_key = " + oRs("alg_locatie_key").Value;
if (level == 1 && res_deel_alg_level >= 1) return " AND r.alg_regio_key = " + oRs("alg_regio_key").Value;
if (level == 0 && res_deel_alg_level >= 0) return " AND d.alg_district_key = " + oRs("alg_district_key").Value;
if (level == 5 && res_deel_alg_level >= 5) filter_deel = "r.alg_ruimte_key = " + oRs("alg_ruimte_key").Value;
if (level == 4 && res_deel_alg_level >= 4) filter_deel = "v.alg_verdieping_key = " + oRs("alg_verdieping_key").Value;
if (level == 3 && res_deel_alg_level >= 3) filter_deel = "g.alg_gebouw_key = " + oRs("alg_gebouw_key").Value;
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();
return "";
}
return "";
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;
}
// Levert lege string of