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

UWVA#51358 opdrachten lijst -> 'aanvrager' niet meer op Excel indien mld_opdr_show_requestor_in_list = 2

Browse Source 
svn path=/Website/branches/v2017.2/; revision=36201
This commit is contained in:
Koen Reefman
2017-12-05 08:39:20 +00:00
parent cbf4bb1b3a
commit 15415dcbf4
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
APPL/Shared/resultset_table_v2.inc
View File

@@ -1118,8 +1118,8 @@ function __rsMakeTableHeader(oRs, oRsFlexData, anyMultiActions)
// Nog kolommen toevoegen voor de flexkenmerken
html += addFlexKenmerkHeader(oRsFlexData, this);
if ((!isPrinting && (columns[i].purpose & VIEW_ONLY)) ||
((isPrinting || showProperties || isExcel) && (columns[i].purpose & PRINTING_ONLY)))
if ((isPlain && (columns[i].purpose & VIEW_ONLY)) ||
((!isPlain || showProperties) && (columns[i].purpose & PRINTING_ONLY)))
{
if ((isPrinting || showProperties || isExcel || !columns[i].combine) && !(isExcel && columns[i].hidden))
{
@@ -1310,8 +1310,8 @@ function __rsMakeTableRow(oRs, oRsFlexData, cnt, anyMultiActions, noFlexResult)
thisKey: thisKey
});
if ((!isPrinting && (columns[i].purpose & VIEW_ONLY)) ||
((isPrinting || showProperties || isExcel) && (columns[i].purpose & PRINTING_ONLY)))
if ((isPlain && (columns[i].purpose & VIEW_ONLY)) ||
((!isPlain || showProperties) && (columns[i].purpose & PRINTING_ONLY)))
{
if (!columns[i].combine)
colHasVal = false;
@@ -1480,8 +1480,8 @@ function __rsMakeTableFootnote(anyMultiActions, oRsFlexData)
var html_f = "";
for (var i = 0; i < columns.length; i++)
{
if ((!isPrinting && (columns[i].purpose & VIEW_ONLY)) ||
((isPrinting || showProperties || isExcel) && (columns[i].purpose & PRINTING_ONLY)))
if ((isPlain && (columns[i].purpose & VIEW_ONLY)) ||
((!isPlain || showProperties) && (columns[i].purpose & PRINTING_ONLY)))
{
if (!columns[i].combine || isPrinting || showProperties || isExcel) // Bij isPrinting, isExcel of showProperties niet combineren.
{
@@ -1626,7 +1626,7 @@ function Column(params)
this.columnClass = params.columnClass;
this.customSort = params.customSort;
this.align = params.align;
this.purpose = params.purpose? params.purpose : PRINT_AND_VIEW;
this.purpose = params.purpose ? params.purpose : PRINT_AND_VIEW;
this.hidden = params.hidden;
this.datatype = params.datatype;
this.decimals = params.decimals;