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

ASDL#37081 Geen plaatsgegevens in zoekschermen als plaatsgegevens op locatie niveau

Browse Source 
svn path=/Website/trunk/; revision=29959
This commit is contained in:
Ruud Lipper
2016-07-06 07:47:33 +00:00
parent 79eb0e87ed
commit 5016258354
2 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
APPL/MLD/mld_search.asp
View File

@@ -149,6 +149,8 @@ var fromdate = new Date(todate.getFullYear(), todate.getMonth(), 1);
var date_from = (!datefrom? fromdate : datefrom);
var date_to = (!dateto? todate : dateto);
var alg_eindlevel = 3; // eindlevel tbv plaatsselector. Standaard Gebouw
if (srtdisc > 0)
lcl.set_dialect(srtdisc, "MLD_SRTDISCIPLINE_KEY");
@@ -201,9 +203,9 @@ var anyorders = !oRs.eof;
oRs.close();
// Fast check to see if we have anything to do with geographics
sql= "SELECT 1 FROM ins_srtdiscipline WHERE (ins_srtdiscipline_alg=1 OR ins_srtdiscipline_ins=1 OR ins_srtdiscipline_bes=1) AND ROWNUM = 1";
sql= "SELECT min(ins_srtdiscipline_alg) min_plaats FROM ins_srtdiscipline WHERE (ins_srtdiscipline_alg > 0 OR ins_srtdiscipline_ins > 0 OR ins_srtdiscipline_bes > 0) and ins_srtdiscipline_verwijder is null";
oRs = Oracle.Execute(sql);
var anygeo = !oRs.eof;
var min_plaats = oRs("min_plaats").Value;
oRs.close();
// Fast check to see if we have anything to do with objects
@@ -212,7 +214,7 @@ oRs = Oracle.Execute(sql);
var anyobj = !oRs.eof;
oRs.close();
// Fast check to see if we have anything to do with orders
// Fast check to see if we have anything to do with call groups
// If not, we can suppress a few filters.
sql= "SELECT 1 FROM mld_stdmeldinggroep WHERE ROWNUM = 1";
oRs = Oracle.Execute(sql);
@@ -872,7 +874,15 @@ if (!frontend && srtdisc > -1)
{
if (!justClose)
{
if (anygeo) {
if (min_plaats > 0) {
switch(min_plaats)
{
case 7: alg_eindlevel = 2; break; // Locatie
case 5: alg_eindlevel = 3; break; // Gebouw
case 3: alg_eindlevel = (minfo?4:3); break; // Voor minfo Verdieping, anders maximaal Gebouw.
case 1: alg_eindlevel = (minfo?5:3); break; // Voor minfo Ruimte, anders maximaal Gebouw.
}
%>
<!-- Locatie en gebouw -->
<tr class="primsearch onlyxd hidden">
@@ -882,6 +892,8 @@ if (!frontend && srtdisc > -1)
</td>
</tr>
<% FCLTplaatsselector(authparams.ALGreadlevel, { regiokey: reg_key,
districtkey: dist_key,
locatiekey: loc_key,
@@ -889,7 +901,7 @@ if (!frontend && srtdisc > -1)
verdiepingkey: flr_key,
ruimtekey: room_key,
startlevel: alg_startlevel,
eindlevel: (minfo? 5 : 3), // Voor minfo Ruimte, anders maximaal Gebouw.
eindlevel: alg_eindlevel,
filtercode: (minfo?null:"FAC"),
trclass: "noxd",
terrein: true,
@@ -908,7 +920,7 @@ if (!frontend && srtdisc > -1)
suppressNoValues: true,
whenEmpty: L("lcl_search_generic") // want filter
});
} // anygeo
} // min_plaats
if (minfo)
{ %>

19
APPL/MLD/opdr_search.asp
View File

@@ -80,6 +80,9 @@ var disc_key_arr = getQParamIntArray("disc_key_str", []); // Productgroep
var meldinggrp_key = getQParamInt("meldinggrp_key", -1); // Meldinggroep
var behandelgrp_key = getQParamInt("behandelgrp_key", -1); // Behandelgroep
var stdm_arr = getQParamIntArray("stdm_str", []); // Melding (Stdmelding)
var alg_eindlevel = 3; // eindlevel tbv plaatsselector. Standaard Gebouw
if (stdm_arr.length != 0 && disc_key_arr.length == 0 && srtdisc == -1)
{
sql = "SELECT mld_ins_discipline_key"
@@ -111,9 +114,9 @@ if (cnt)
var authparams = user.checkAutorisation(autfunction);
// Fast check to see if we have anything to do with geographics
sql= "SELECT 1 FROM ins_srtdiscipline WHERE (ins_srtdiscipline_alg=1 OR ins_srtdiscipline_ins=1 OR ins_srtdiscipline_bes=1) AND ROWNUM = 1";
sql= "SELECT min(ins_srtdiscipline_alg) min_plaats FROM ins_srtdiscipline WHERE (ins_srtdiscipline_alg > 0 OR ins_srtdiscipline_ins > 0 OR ins_srtdiscipline_bes > 0) and ins_srtdiscipline_verwijder is null";
oRs = Oracle.Execute(sql);
var anygeo = !oRs.eof;
var min_plaats = oRs("min_plaats").Value;
oRs.close();
// Fast check to see if we have anything to do with call groups
@@ -571,13 +574,19 @@ oRs.close();
whenEmpty: L("lcl_search_generic") // want filter
});
if (anygeo)
if (min_plaats > 0)
{
// Locatie en gebouw
switch(min_plaats)
{
case 7: alg_eindlevel = 2; break; // Locatie
case 5: alg_eindlevel = 3; break; // Gebouw
case 3: alg_eindlevel = (minfo?4:3); break; // Voor minfo Verdieping, anders maximaal Gebouw.
case 1: alg_eindlevel = (minfo?5:3); break; // Voor minfo Ruimte, anders maximaal Gebouw.
}
FCLTplaatsselector(authparams.ALGreadlevel, { locatiekey: locatie_key,
gebouwkey: gebouw_key,
startlevel: alg_startlevel,
eindlevel: 3, // gebouw
eindlevel: alg_eindlevel,
trclass: "noxd",
filtercode: "FAC",
whenEmpty: L("lcl_search_generic") // want filter