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

MNNL#37255 verwijderdatum alle objecten meenemen en nu wordt ook op terrein gefiltert

Browse Source 
svn path=/Website/trunk/; revision=33212
This commit is contained in:
Koen Reefman
2017-03-22 13:51:04 +00:00
parent 041aae9b72
commit 5ce3b83154
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
APPL/Shared/Suggest/SuggestGebouwTerrein.asp
View File

@@ -35,7 +35,7 @@ var terrein = getQParamInt("terrein", 0) == 1;
var act_key = getQParamInt("act_key", -1);
var stdm_key = getQParamInt("stdm_key", -1);
var params = { stdm_key: stdm_key };
var params = { stdm_key: stdm_key, terrein: terrein };
if (filtcode == "PRK")
{
var date_from = getQParamDate("date_from", new Date());

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

@@ -318,7 +318,11 @@ function getFiltClauseGebouw(pfiltcode, params)
}
}
if (params.stdm_key > 0)
lfiltClause.where += get_rel_obj_filter(params.stdm_key, 3);
{
lfiltClause.where_geb += get_rel_obj_filter(params.stdm_key, 3);
if (params.terrein)
lfiltClause.where_ter += get_rel_obj_filter(params.stdm_key, 3.5);
}
return lfiltClause;
}
@@ -536,11 +540,14 @@ function get_rel_obj_filter(stdm_key, level)
case "S": ins_srtdeel_keys = "= " + ins_srtinst_key;
break;
// Groep
case "G": ins_srtdeel_keys = "IN (SELECT ins_srtdeel_key FROM ins_srtdeel WHERE ins_srtgroep_key = " + ins_srtinst_key + ")";
case "G": ins_srtdeel_keys = "IN (SELECT ins_srtdeel_key FROM ins_srtdeel WHERE ins_srtgroep_key = " + ins_srtinst_key + ")"
+ " AND ins_srtdeel_verwijder IS NULL)";
break;
// Discipline
case "D": ins_srtdeel_keys = "IN (SELECT ins_srtdeel_key FROM ins_srtdeel WHERE ins_srtgroep_key IN"
+ " (SELECT ins_srtgroep_key FROM ins_srtgroep WHERE ins_discipline_key = " + ins_srtinst_key + "))";
+ " (SELECT ins_srtgroep_key FROM ins_srtgroep WHERE ins_discipline_key = " + ins_srtinst_key
+ " AND ins_srtgroep_verwijder IS NULL)"
+ " AND ins_srtdeel_verwijder IS NULL)";
break;
// Komt niet voor ?
default: ins_srtdeel_keys = "= " + ins_srtinst_key;
@@ -548,14 +555,16 @@ function get_rel_obj_filter(stdm_key, level)
}
switch (level)
{
case 5: filter_table = " AND ao.alg_ruimte_key = r.alg_ruimte_key";
break;
case 4: filter_table = " AND ao.alg_verdieping_key = v.alg_verdieping_key";
break;
case 3: filter_table = " AND ao.alg_gebouw_key = g.alg_gebouw_key";
break;
case 2: filter_table = " AND ao.alg_locatie_key = l.alg_locatie_key";
break;
case 5: filter_table = " AND ao.alg_ruimte_key = r.alg_ruimte_key";
break;
case 4: filter_table = " AND ao.alg_verdieping_key = v.alg_verdieping_key";
break;
case 3.5: filter_table = " AND ao.alg_terreinsector_key = t.alg_terreinsector_key";
break;
case 3: filter_table = " AND ao.alg_gebouw_key = g.alg_gebouw_key";
break;
case 2: filter_table = " AND ao.alg_locatie_key = l.alg_locatie_key";
break;
}
if (!oRs.eof && filter_table != "")