MARX#39537 flexkenmerken kunnen worden aangegeven voor tonen in lijsten (MLD+OPDR)

svn path=/Website/trunk/; revision=33716
This commit is contained in:
Jos Groot Lipman
2017-05-08 11:33:50 +00:00
parent b24562d505
commit 7423ef4a05

View File

@@ -108,21 +108,6 @@ function mld_list (pautfunction, params)
params.minfo = minfo;
var tiny = (params.tiny==1);
if (params.withflex && !excel && !print)
{
// Fast check to see if we have any listable flex at all, to prevent superfluous column
var sql= "SELECT 1"
+" FROM mld_srtkenmerk sk, mld_kenmerk k"
+" WHERE BITAND (mld_srtkenmerk_systeem, 2) = 2"
+" AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
+" AND k.mld_kenmerk_niveau <> 'O'"
+" AND k.mld_kenmerk_verwijder IS NULL"
+" AND sk.mld_srtkenmerk_verwijder IS NULL"
+" AND ROWNUM = 1";
var oRs = Oracle.Execute(sql);
var anyflex = !oRs.eof;
oRs.close();
}
// AUTORISATIES
if (urole == "bo")
{
@@ -140,6 +125,22 @@ function mld_list (pautfunction, params)
var excel = (outputmode == 2 || outputmode == 6);
var showall = params.showall;
if (params.withflex && !excel && !print)
{
// Fast check to see if we have any listable flex at all, to prevent superfluous column
var sql= "SELECT 1"
+" FROM mld_srtkenmerk sk, mld_kenmerk k"
+" WHERE BITAND (mld_srtkenmerk_systeem, 2) = 2"
+" AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
+" AND k.mld_kenmerk_niveau <> 'O'"
+" AND k.mld_kenmerk_verwijder IS NULL"
+" AND sk.mld_srtkenmerk_verwijder IS NULL"
+" AND ROWNUM = 1";
var oRs = Oracle.Execute(sql);
var anyflex = !oRs.eof;
oRs.close();
}
var mld_key = params.mld_key;
var behandel_key = params.behandel_key;
var disc_key_arr = params.disc_key_arr;