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

AAFM#34060 Betere auto-filter bij 'range' velden. Ook null-waarde onderdrukken

Browse Source 
svn path=/Website/branches/v2015.2/; revision=26651
This commit is contained in:
Jos Groot Lipman
2015-10-14 14:30:05 +00:00
parent d4cfb6e771
commit f76fb7e08f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/FAC/fac_report.js
View File

@@ -33,11 +33,14 @@ function process_worker_info(data)
var inp = $("#" + data.distinct); // we krijgen de naam terug in data.distinct
inp.replaceWith('<select id="{0}" name="{0}"></select>'.format(data.distinct));
var sel = $("#" + data.distinct);
var l = data.values.length;
if (l > 0 && data.values[l-1][data.colname] === null)
data.values.pop();
if(data.values.length > 1)
sel.append($('<option></option>').val("").text(L("lcl_shared_alle") + " " + data.values.length));
for (var i = 0; i < data.values.length; i++)
{
var v = data.values[i][data.distinct];
var v = data.values[i][data.colname];
sel.append($('<option></option>').val(v).text(v));
}
}

2
APPL/FAC/fac_report_worker.asp
View File

@@ -29,7 +29,7 @@ JSON_Result = true;
xxx_params.filter.showall = 1;
xxx_params.filter.limit = 9999;
xxx_params.filter.scf_pivot = 0; // nooit
var result = { distinct: columns[0], values: rapport.REST_GET(xxx_params) };
var result = { distinct: distinct, colname: columns[0], values: rapport.REST_GET(xxx_params) };
Response.Write(JSON.stringify(result));
%>