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

UWVA#38222 Locatie met louter vervallen gebouwen toch te selecteren

Browse Source 
svn path=/Website/trunk/; revision=31627
This commit is contained in:
Erik Groener
2016-11-23 07:50:38 +00:00
parent f362b4d84f
commit 83ce079fbc
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/MLD/mld_search.asp
View File

@@ -900,7 +900,7 @@ if (!frontend && srtdisc > -1)
ruimtekey: room_key,
startlevel: alg_startlevel,
eindlevel: alg_eindlevel,
filtercode: (minfo?null:"FAC"),
filtercode: (minfo?"EXP":"FAC"),
trclass: "noxd",
terrein: true,
whenEmpty: L("lcl_search_generic") // want filter

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

@@ -328,6 +328,12 @@ function getFiltClauseVerdieping(pfiltcode, params)
+ " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND sg.alg_srtgebouw_key(+) = g.alg_srtgebouw_key"
+ " AND g.alg_gebouw_key = v.alg_gebouw_key)";
var lfiltClauseEXP = " AND EXISTS"
+ " (SELECT xg.alg_gebouw_key"
+ " FROM alg_srtgebouw xsg, alg_v_aanweziggebouw xg"
+ " WHERE (xg.alg_gebouw_vervaldatum IS NULL OR xg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND xsg.alg_srtgebouw_key(+) = xg.alg_srtgebouw_key"
+ " AND xg.alg_gebouw_key = v.alg_gebouw_key)";
if (pfiltcode && pfiltcode != "")
{
switch(pfiltcode)
@@ -386,6 +392,9 @@ function getFiltClauseVerdieping(pfiltcode, params)
+ " WHERE ct.alg_verdieping_key = v.alg_verdieping_key"
+ ")";
break;
case "EXP": lfiltClause.where = lfiltClauseEXP;
break;
}
}
return lfiltClause;
@@ -404,6 +413,15 @@ function getFiltClauseRuimte(pfiltcode, params)
+ " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND sg.alg_srtgebouw_key(+) = ag.alg_srtgebouw_key"
+ " AND av.alg_verdieping_key = r.alg_verdieping_key)";
var lfiltClauseEXP = " AND EXISTS"
+ " (SELECT xav.alg_verdieping_key"
+ " FROM alg_srtgebouw xsg, alg_v_aanweziggebouw xag"
+ ", alg_v_aanwezigverdieping xav"
+ " WHERE xag.alg_gebouw_key = xav.alg_gebouw_key"
+ " AND (xag.alg_gebouw_vervaldatum IS NULL OR xag.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND xsg.alg_srtgebouw_key(+) = xag.alg_srtgebouw_key"
+ " AND xav.alg_verdieping_key = r.alg_verdieping_key)";
if (pfiltcode && pfiltcode != "")
{
switch(pfiltcode)
@@ -447,6 +465,9 @@ function getFiltClauseRuimte(pfiltcode, params)
+ ")"
+ not_reserveerbare_ruimte;
break;
case "EXP": lfiltClause.where = lfiltClauseEXP;
break;
}
}
if (pfiltcode != "INCVR") { // include virtual rooms, default these are NOT included