From f76fb7e08f161669dd07ddfb296686f784c47029 Mon Sep 17 00:00:00 2001
From: Jos Groot Lipman <jos.grootlipman@aareon.nl>
Date: Wed, 14 Oct 2015 14:30:05 +0000
Subject: [PATCH] AAFM#34060 Betere auto-filter bij 'range' velden. Ook
 null-waarde onderdrukken

svn path=/Website/branches/v2015.2/; revision=26651
---
 APPL/FAC/fac_report.js         | 5 ++++-
 APPL/FAC/fac_report_worker.asp | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/APPL/FAC/fac_report.js b/APPL/FAC/fac_report.js
index c994f45435..64d32e2a6e 100644
--- a/APPL/FAC/fac_report.js
+++ b/APPL/FAC/fac_report.js
@@ -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));
     }
 }
diff --git a/APPL/FAC/fac_report_worker.asp b/APPL/FAC/fac_report_worker.asp
index 71ffb843ee..18c96c0bb9 100644
--- a/APPL/FAC/fac_report_worker.asp
+++ b/APPL/FAC/fac_report_worker.asp
@@ -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));
 %>