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

DJIN#51713 Zoekvelden Verdieping en Ruimte in mld_search en opdr_search

Browse Source 
svn path=/Website/trunk/; revision=37750
This commit is contained in:
Erik Groener
2018-04-24 10:04:55 +00:00
parent eec427659c
commit 5dbf9f9d95
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
APPL/MLD/mld.inc
View File

@@ -4946,6 +4946,8 @@ mld = {setmeldingstatus:
var adr_key = params.adr_key;
var loc_key = params.loc_key;
var bld_key = params.bld_key;
var flr_key = params.flr_key;
var room_key = params.room_key;
var verantw_key = params.verantw_key;
var caller_key = params.caller_key;
var org_key = params.org_key;
@@ -5389,7 +5391,11 @@ mld = {setmeldingstatus:
+ " AND ko.mld_kenmerkopdr_verwijder IS NULL"
+ " AND UPPER(ko.mld_kenmerkopdr_waarde) LIKE " + safe.quoted_sql_wild("%" + searchtekst + "%") + "))";
if (bld_key)
if (room_key)
sql += " AND g.alg_ruimte_key = " + room_key;
else if (flr_key)
sql += " AND g.alg_verdieping_key = " + flr_key;
else if (bld_key)
sql += " AND (g.alg_gebouw_key = " + bld_key + " OR g.alg_terreinsector_key = " + bld_key + ")";
else if (loc_key)
sql += " AND m.mld_alg_locatie_key = " + loc_key;

4
APPL/MLD/opdr_search_list.asp
View File

@@ -55,6 +55,8 @@ var behandel_key = getQParamInt("behandel_key", -1); // Behandelaar
var beh_key_str = getQParamIntArray("behmulti", [-1]); // Behandelaar multi
var gebouwkey = getQParamInt("gebouwkey", -1);
var verdiepingkey = getQParamInt("verdiepingkey", -1);
var ruimtekey = getQParamInt("ruimtekey", -1);
var opdrtype =getQParamInt("opdrtype", -1); // Opdrachttype
var srtdisc_key = getQParamInt("srtdisc", -1); // Soort melding
var disc_key_str = getQParamIntArray("discmulti", [-1]); // Productgroep
@@ -117,6 +119,8 @@ var params = { urole : urole,
adr_key: (adr_key != -1 ? adr_key : null),
loc_key: (locatiekey != -1 ? locatiekey : null),
bld_key: (gebouwkey != -1 ? gebouwkey : null),
flr_key: (verdiepingkey != -1 ? verdiepingkey : null),
room_key: (ruimtekey != -1 ? ruimtekey : null),
verantw_key: (verantw_key != -1 ? verantw_key : null),
behandel_key: (behandel_key != -1 ? behandel_key : null),
beh_key_arr : (beh_key_str.length > 0 && beh_key_str.join(",").indexOf("-1") == -1? beh_key_str : null),