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=33868
This commit is contained in:
Erik Groener
2017-05-16 10:53:38 +00:00
parent a09fd5f3c8
commit 59797e58dc
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/RES/res_edit_rsv_ruimte.asp
View File

@@ -1313,7 +1313,7 @@ FCLTHeader.Requires({plugins: ["jQuery", "kenmerk"],
} }
// Plaatsselector is altijd afhankelijk van activiteit // Plaatsselector is altijd afhankelijk van activiteit
urlAdd.push({urlParam: "act_key", val: rrr.activiteit_key, init: rrr.activiteit_key}); urlAdd.push({urlParam: "act_key", field: "sel_activity", init: rrr.activiteit_key});
if (getQParamInt("disc_key", -1) > 0) if (getQParamInt("disc_key", -1) > 0)
urlAdd.push({urlParam: "disc_key", val: getQParamInt("disc_key"), init: getQParamInt("disc_key")}); urlAdd.push({urlParam: "disc_key", val: getQParamInt("disc_key"), init: getQParamInt("disc_key")});

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

@@ -669,6 +669,7 @@ function get_res_bezorgfilter(params, level)
+ " WHERE rd.res_ins_deel_key = id.ins_deel_key" + " 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_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 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 : ""); + (res_deel_key > 0 ? " AND res_deel_key = " + res_deel_key : "");
var oRs = Oracle.Execute(sql); var oRs = Oracle.Execute(sql);
res_deel_alg_level = oRs("res_deel_alg_level").Value; res_deel_alg_level = oRs("res_deel_alg_level").Value;
@@ -677,8 +678,8 @@ function get_res_bezorgfilter(params, level)
if (level >= 4 && res_deel_alg_level == 4) filter_deel = "vv.alg_verdieping_key IN "; if (level >= 4 && res_deel_alg_level == 4) filter_deel = "vv.alg_verdieping_key IN ";
if (level >= 3 && res_deel_alg_level == 3) filter_deel = "gg.alg_gebouw_key IN "; if (level >= 3 && res_deel_alg_level == 3) filter_deel = "gg.alg_gebouw_key IN ";
if (level >= 2 && res_deel_alg_level == 2) filter_deel = "ll.alg_locatie_key IN "; if (level >= 2 && res_deel_alg_level == 2) filter_deel = "ll.alg_locatie_key IN ";
if (level >= 1 && res_deel_alg_level == 1) filter_deel = "rg.alg_regio_key IN "; if (level >= 1 && res_deel_alg_level == 1) filter_deel = "ll.alg_locatie_key IN "; //"rg.alg_regio_key IN ";
if (level >= 0 && res_deel_alg_level == 0) filter_deel = "di.alg_district_key IN "; if (level >= 0 && res_deel_alg_level == 0) filter_deel = "ll.alg_locatie_key IN "; //"di.alg_district_key IN ";
oRs.close(); oRs.close();
// } // }