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

DJIN #54781 Bijlage zichtbaar in melding/opdrachtoverzicht

Browse Source 
svn path=/Website/trunk/; revision=39294
This commit is contained in:
Erik Groener
2018-10-05 10:59:07 +00:00
parent 26cbd379b2
commit 927ab739ec
2 changed files with 34 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
APPL/MLD/mld_list.inc
View File

@@ -134,7 +134,8 @@ 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 mld_srtkenmerk_omschrijving"
var sql= "SELECT sk.mld_srtkenmerk_omschrijving"
+" , sk.mld_srtkenmerk_kenmerktype"
+" FROM mld_srtkenmerk sk, mld_kenmerk k"
+" WHERE BITAND (mld_srtkenmerk_systeem, 2) = 2"
+" AND BITAND (mld_srtkenmerk_systeem, 4) = 0" // niet als vertrouwelijk
@@ -147,12 +148,20 @@ function mld_list (pautfunction, params)
if (anyflex)
{
var multiflex = false;
var bijlageflex = (oRs("mld_srtkenmerk_kenmerktype").Value == "M");
var flexlabel = oRs("mld_srtkenmerk_omschrijving").Value;
oRs.MoveNext();
if (!oRs.Eof)
{
multiflex = true;
flexlabel = L("lcl_flexlist");
while (!oRs.eof)
{
if (oRs("mld_srtkenmerk_kenmerktype").Value == "M")
bijlageflex = true;
oRs.MoveNext();
}
}
}
oRs.close();
@@ -998,9 +1007,8 @@ function mld_list (pautfunction, params)
return flexParams;
}
function fncolFlex(oRs)
function fncolFlexBijlagen(oRs)
{
var flexval = oRs("flex").Value;
var mld_key = oRs("mld_melding_key").Value;
var bijlagen_oms = "";
var bijlagen_aantal = 0;
@@ -1034,10 +1042,7 @@ function mld_list (pautfunction, params)
oRs_k.MoveNext();
}
oRs_k.Close();
return safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+ "<span title='" + Server.HTMLEncode(bijlagen_lijst.join("\n")) + "'>"
+ safe.html(bijlagen_oms) + ": " + bijlagen_aantal
+ "</span>";
return "<span title='" + Server.HTMLEncode(bijlagen_lijst.join("\n")) + "'>" + bijlagen_aantal + "</span>";
}
@@ -1175,7 +1180,11 @@ function mld_list (pautfunction, params)
}
if (anyflex)
rst.addColumn(new Column({caption: flexlabel, content: fncolFlex}));
{
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
if (bijlageflex)
rst.addColumn(new Column({caption: L("lcl_appendixes_sum"), content: fncolFlexBijlagen}));
}
/* de mogelijke acties */
rst.addAction({ action: "mld_edit", caption: L("lcl_edit"), isDefault: true } );

25
APPL/MLD/opdr_list.inc
View File

@@ -197,7 +197,8 @@ 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 mld_srtkenmerk_omschrijving"
var sql= "SELECT sk.mld_srtkenmerk_omschrijving"
+" , sk.mld_srtkenmerk_kenmerktype"
+" FROM mld_srtkenmerk sk, mld_kenmerk k"
+" WHERE BITAND (mld_srtkenmerk_systeem, 2) = 2"
+" AND BITAND (mld_srtkenmerk_systeem, 4) = 0" // niet als vertrouwelijk
@@ -210,12 +211,20 @@ function opdr_list(params)
if (params.anyflex)
{
params.multiflex = false;
params.bijlageflex = (oRs("mld_srtkenmerk_kenmerktype").Value == "M");
var flexlabel = oRs("mld_srtkenmerk_omschrijving").Value;
oRs.MoveNext();
if (!oRs.Eof)
{
params.multiflex = true;
flexlabel = L("lcl_flexlist");
while (!oRs.eof)
{
if (oRs("mld_srtkenmerk_kenmerktype").Value == "M")
params.bijlageflex = true;
oRs.MoveNext();
}
}
}
oRs.close();
@@ -602,9 +611,8 @@ function opdr_list(params)
return displ;
}
function fncolFlex(oRs)
function fncolFlexBijlagen(oRs)
{
var flexval = oRs("flex").Value;
var opdr_key = oRs("mld_opdr_key").Value;
var bijlagen_oms = "";
var bijlagen_aantal = 0;
@@ -637,10 +645,7 @@ function opdr_list(params)
oRs_k.MoveNext();
}
oRs_k.Close();
return safe.html(flexval.replace(/\r/g, "\n")+ "\n")
+ "<span title='" + Server.HTMLEncode(bijlagen_lijst.join("\n")) + "'>"
+ safe.html(bijlagen_oms) + ": " + bijlagen_aantal
+ "</span>";
return "<span title='" + Server.HTMLEncode(bijlagen_lijst.join("\n")) + "'>" + bijlagen_aantal + "</span>";
}
@@ -772,7 +777,11 @@ function opdr_list(params)
rst.addColumn(new Column({caption: L("lcl_mld_invoiced") + "&nbsp;(" + L("lcl_valutasign") + ")", content: "gefactureerd", datatype: "currency", total: true}));
}
if (params.anyflex)
rst.addColumn(new Column({caption: flexlabel, content: fncolFlex}));
{
rst.addColumn(new Column({caption: flexlabel, content: "flex"}));
if (params.bijlageflex)
rst.addColumn(new Column({caption: L("lcl_appendixes_sum"), content: fncolFlexBijlagen}));
}
// actions conditioneel maken?
rst.addAction({ action: "opdr_edit", caption: L("lcl_details"), isDefault: true });