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

LPNL#69097 Het filterveld ruimte werkt niet als je zoekt op reserveerbare objecten

Browse Source 
svn path=/Website/branches/v2021.1/; revision=53983
This commit is contained in:
Erik Groener
2021-12-02 11:40:14 +00:00
parent a87b159cf2
commit 93571b2bba
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
APPL/API2/model_res_deel.inc
View File

@@ -70,13 +70,13 @@ function model_res_deel(ins_min_level_arr, insMultiReserve)
"filter": "like"
},
"ruimtekey": {
"dbs": "res_v_ins_deelgegevens.tbl_res_deel_key",
"dbs": "res_v_ins_deelgegevens.alg_ruimte_key",
"label": L("lcl_location"),
"typ": "key",
"hidden_fld": true,
"foreign": {
"tbl": get_tbl(),
"key": "tbl_res_deel_key",
"tbl": get_tbl({desc: true}),
"key": "alg_ruimte_key",
"desc": "alg_plaatsaanduiding",
"selectorforeign": "ALG_RUIMTE",
"selectorparams": {"startlevel": 2, "eindlevel": 5, "readonlylevel": 1}
@@ -195,18 +195,24 @@ function model_res_deel(ins_min_level_arr, insMultiReserve)
<%
};
function get_tbl(alias)
function get_tbl(params)
{
var sql = "(SELECT a.alg_onroerendgoed_keys"
var params = params || {};
var sql = "(SELECT DISTINCT"
+ " a.alg_ruimte_key"
+ " , a.alg_onroerendgoed_keys"
+ " , a.alg_onroerendgoed_type"
+ " , a.alg_plaatsaanduiding"
+ " , a.alg_locatie_key"
+ " , a.alg_terreinsector_key"
+ " , a.alg_gebouw_key"
+ " , a.alg_verdieping_key"
+ " , a.alg_ruimte_key"
+ " , d.ins_deel_key"
+ " , r.res_deel_key tbl_res_deel_key"
+ ( params.desc
? ""
: " , d.ins_deel_key"
+ " , r.res_deel_key tbl_res_deel_key"
)
+ " FROM res_deel r"
+ " , ins_deel d"
+ " , ins_v_alg_overzicht a"
@@ -214,14 +220,14 @@ function model_res_deel(ins_min_level_arr, insMultiReserve)
+ " AND d.ins_alg_ruimte_key = a.alg_onroerendgoed_keys"
+ " AND d.ins_alg_ruimte_type = a.alg_onroerendgoed_type"
+ ")";
if (alias)
sql += " " + alias;
if (params.alias)
sql += " " + params.alias;
return sql;
}
if (inArray(1, this.ins_min_level_arr) || inArray(5, this.ins_min_level_arr)) // gekoppeld aan ins_deel
{
var gparams = { GET: { tables: [get_tbl("res_v_ins_deelgegevens")]
var gparams = { GET: { tables: [get_tbl({alias: "res_v_ins_deelgegevens"})]
, wheres: ["res_deel.res_deel_key = res_v_ins_deelgegevens.tbl_res_deel_key(+)"]
}
};