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/branches/v2016.2/; revision=31372
This commit is contained in:
Erik Groener
2016-11-07 08:51:57 +00:00
parent b87ba0ada8
commit 041e70cbdd
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
APPL/Shared/Suggest/SuggestLocatie.asp
View File

@@ -69,6 +69,16 @@ if (autlevel > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
+ " AND niveau = " + autlevel + ")";
}
var existBuilding = " AND EXISTS "
+ "(SELECT ''"
+ " FROM alg_v_aanweziggebouw gg"
+ " WHERE (gg.alg_gebouw_vervaldatum IS NULL OR gg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND gg.alg_locatie_key = l.alg_locatie_key"
+ " UNION ALL"
+ " SELECT ''"
+ " FROM alg_v_aanwezigterreinsector t"
+ " WHERE t.alg_locatie_key = l.alg_locatie_key)";
sql = "SELECT l.alg_locatie_key"
+ ", " + S("alg_loc_string") + " naam"
+ ", alg_locatie_code code"
@@ -78,6 +88,7 @@ if (autlevel > -1) // Efficiente versie van FAC_V_MY_PR**S_AFDELINGEN_WRITE
+ filtClause.from
+ " WHERE (UPPER(" + S("alg_loc_string") + ") LIKE " + safe.quoted_sql_wild(chars + "%")
+ " OR UPPER(alg_locatie_code) LIKE " + safe.quoted_sql_wild(chars + "%") + ")"
+ existBuilding
+ filtClause.where
+ " ORDER BY 2"
WriteResult(sql, bAll, "naam", "alg_locatie_key", "code", "postcode", "extra");

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

@@ -114,6 +114,17 @@ function getFiltClauseLocatie(pfiltcode, params)
+ " SELECT ''"
+ " FROM alg_v_aanwezigterreinsector t"
+ " WHERE t.alg_locatie_key = l.alg_locatie_key)";
var lfiltClauseEXP = " AND EXISTS"
+ " (SELECT ''"
+ " FROM alg_v_aanweziggebouw gg"
+ " WHERE gg.alg_locatie_key = l.alg_locatie_key"
+ " AND (gg.alg_gebouw_vervaldatum IS NULL OR gg.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " UNION ALL"
+ " SELECT ''"
+ " FROM alg_v_aanwezigterreinsector t"
+ " WHERE t.alg_locatie_key = l.alg_locatie_key)";
if (pfiltcode && pfiltcode != "")
{
switch(pfiltcode)
@@ -124,7 +135,7 @@ function getFiltClauseLocatie(pfiltcode, params)
+ " WHERE ag.alg_gebouw_bez = 1"
+ " AND (ag.alg_gebouw_vervaldatum IS NULL OR ag.alg_gebouw_vervaldatum > TRUNC(SYSDATE))"
+ " AND ag.alg_locatie_key = l.alg_locatie_key)";
lfiltClause.where += lfiltClauseFAC;
lfiltClause.where += lfiltClauseEXP;
break;
case "FAC": // Facilitaire locaties, met een niet-passief gebouw of terrein
@@ -207,6 +218,10 @@ function getFiltClauseLocatie(pfiltcode, params)
case "INCVR": // include virtual rooms, default these are NOT included
lfiltClause.where = lfiltClauseFAC;
break;
case "EXP": // vervallen gebouwen niet tonen
lfiltClause.where = lfiltClauseEXP;
break;
}
}
return lfiltClause;
@@ -228,6 +243,11 @@ function getFiltClauseGebouw(pfiltcode, params)
case "RES": // Er is (nog) geen gebouwfilter bij reserveerbare ruimten
case "FAC": lfiltClause.where = lfiltClauseFAC;
break;
case "INCVR": // include virtual rooms, default these are NOT included
lfiltClause.where = lfiltClauseFAC;
break;
case "EXP": lfiltClause.where = " AND (g.alg_gebouw_vervaldatum IS NULL OR g.alg_gebouw_vervaldatum > TRUNC(SYSDATE))";
break;
case "RESB": // Bezorgplaats voor voorzieningen, d.i. gebouwen met ruimten excl. reserveerbare ruimten
var loc_scope_act_filter = get_loc_scope_act_filter(params, 3)
lfiltClause.from = loc_scope_act_filter.from;