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

FSN#41899 Bij één flexkenmerk in de lijst het label in de header zetten

Browse Source 
svn path=/Website/trunk/; revision=35242
This commit is contained in:
Jos Groot Lipman
2017-09-07 13:30:17 +00:00
parent 87a2abd47e
commit 3b58716a6a
4 changed files with 42 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
APPL/BEZ/bez_list.inc
View File

@@ -166,13 +166,24 @@ function bez_list(pautfunction, params)
if (withflex && !excel && !print)
{
// Fast check to see if we have any listable flex at all, to prevent superfluous empty column
var sql = "SELECT 1"
var sql = "SELECT bez_kenmerk_omschrijving"
+ " FROM bez_kenmerk"
+ " WHERE BITAND (bez_kenmerk_systeem, 2) = 2"
+ " AND bez_kenmerk_verwijder IS NULL"
+ " AND ROWNUM = 1";
var oRs = Oracle.Execute(sql);
anyflex = !oRs.eof;
if (anyflex)
{
var multiflex = false;
var flexlabel = oRs("bez_kenmerk_omschrijving").Value;
oRs.MoveNext();
if (!oRs.Eof)
{
multiflex = true;
flexlabel = L("lcl_flexlist");
}
}
oRs.close();
}
@@ -239,7 +250,7 @@ function bez_list(pautfunction, params)
+ ", COALESCE(org.alg_gebouw_code, org.alg_terreinsector_code) || ' ' || COALESCE(org.alg_gebouw_naam, org.alg_terreinsector_naam) code"
+ ", rr.res_ruimte_nr ruimte_nr"
+ (anyflex
? ", (SELECT LISTAGG(k.bez_kenmerk_omschrijving || ':'|| CHR(160) || "
? ", (SELECT LISTAGG(" + (multiflex?"bez_kenmerk_omschrijving || ':'|| CHR(160) || ":"")
+ " CASE"
+ " WHEN k.bez_kenmerk_kenmerktype = 'R' OR k.bez_kenmerk_kenmerktype = 'S'"
+ " THEN"
@@ -1210,7 +1221,7 @@ function bez_list(pautfunction, params)
rst.addColumn(new Column({caption: L("lcl_bez_remote"), content: fnColRemote, align: "center"}));
if (anyflex)
rst.addColumn(new Column({caption: L("lcl_flexlist"), content: "flex"}));
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
if (backo) // Ook badgenr-edit en aanmeld/afmeld vinkjes
{

2
APPL/MLD/mld.inc
View File

@@ -4982,7 +4982,7 @@ mld = {setmeldingstatus:
? " , mu.intern"
: "")
+ (params.anyflex
? ", (SELECT LISTAGG(mld_srtkenmerk_omschrijving || ':'|| CHR(160) || "
? ", (SELECT LISTAGG(" + (params.multiflex?"mld_srtkenmerk_omschrijving || ':'|| CHR(160) || ":"")
+ " CASE"
+ " WHEN skm.mld_srtkenmerk_kenmerktype = 'R' OR skm.mld_srtkenmerk_kenmerktype = 'S'"
+ " THEN"

17
APPL/MLD/mld_list.inc
View File

@@ -128,7 +128,7 @@ function mld_list (pautfunction, params)
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"
var sql= "SELECT mld_srtkenmerk_omschrijving"
+" FROM mld_srtkenmerk sk, mld_kenmerk k"
+" WHERE BITAND (mld_srtkenmerk_systeem, 2) = 2"
+" AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
@@ -138,6 +138,17 @@ function mld_list (pautfunction, params)
+" AND ROWNUM = 1";
var oRs = Oracle.Execute(sql);
var anyflex = !oRs.eof;
if (anyflex)
{
var multiflex = false;
var flexlabel = oRs("mld_srtkenmerk_omschrijving").Value;
oRs.MoveNext();
if (!oRs.Eof)
{
multiflex = true;
flexlabel = L("lcl_flexlist");
}
}
oRs.close();
}
@@ -341,7 +352,7 @@ function mld_list (pautfunction, params)
if (anyflex)
{
sqln += ", (SELECT LISTAGG(mld_srtkenmerk_omschrijving || ':'|| CHR(160) || "
sqln += ", (SELECT LISTAGG(" + (multiflex?"mld_srtkenmerk_omschrijving || ':'|| CHR(160) || ":"")
+ " CASE"
+ " WHEN skm.mld_srtkenmerk_kenmerktype = 'R' OR skm.mld_srtkenmerk_kenmerktype = 'S'"
+ " THEN"
@@ -916,7 +927,7 @@ function mld_list (pautfunction, params)
}
if (anyflex)
rst.addColumn(new Column({caption: L("lcl_flexlist"), content: "flex"}));
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
/* de mogelijke acties */
rst.addAction({ action: "mld_edit", caption: L("lcl_edit"), isDefault: true } );

15
APPL/MLD/opdr_list.inc
View File

@@ -194,7 +194,7 @@ function opdr_list(params)
if (params.withflex && !excel && !print)
{
// Fast check to see if we have any listable flex at all, to prevent superfluous empty column
var sql= "SELECT 1"
var sql= "SELECT mld_srtkenmerk_omschrijving"
+" FROM mld_srtkenmerk sk, mld_kenmerk k"
+" WHERE BITAND (mld_srtkenmerk_systeem, 2) = 2"
+" AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key"
@@ -204,6 +204,17 @@ function opdr_list(params)
+" AND ROWNUM = 1";
var oRs = Oracle.Execute(sql);
params.anyflex = !oRs.eof;
if (params.anyflex)
{
params.multiflex = false;
var flexlabel = oRs("mld_srtkenmerk_omschrijving").Value;
oRs.MoveNext();
if (!oRs.Eof)
{
params.multiflex = true;
flexlabel = L("lcl_flexlist");
}
}
oRs.close();
}
@@ -652,7 +663,7 @@ function opdr_list(params)
rst.addColumn(new Column({caption: L("lcl_mld_invoiced") + " (" + L("lcl_valutasign") + ")", content: "gefactureerd", datatype: "currency", total: true}));
}
if (params.anyflex)
rst.addColumn(new Column({caption: L("lcl_flexlist"), content: "flex"}));
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
// actions conditioneel maken?
rst.addAction({ action: "opdr_edit", caption: L("lcl_details"), isDefault: true });