From 4a82f7b0f661aecd4d494d4b56bf6048f08f9553 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 14 Feb 2020 16:56:59 +0000
Subject: [PATCH]

---
 DataList/DataListFiltering.cs | 39 +++++++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/DataList/DataListFiltering.cs b/DataList/DataListFiltering.cs
index b88390c..c336a0e 100644
--- a/DataList/DataListFiltering.cs
+++ b/DataList/DataListFiltering.cs
@@ -643,15 +643,42 @@ same as the server does but in a central location here for all tests to use.
             // FilterItem.fld = "widgetstartdate";
             // FilterItem.op = Util.OpGreaterThanOrEqualTo;
             // FilterItem.value = new DateTime(2019, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime();
-            dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetstartdate", Util.OpGreaterThanOrEqualTo, new DateTime(2019, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime()));
+            // dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetstartdate", Util.OpGreaterThanOrEqualTo, new DateTime(2019, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime()));
 
 
-            dynamic FilterItem2 = new JObject();
-            FilterItem2.fld = "widgetstartdate";
-            FilterItem2.op = Util.OpLessThanOrEqualTo;
-            FilterItem2.value = new DateTime(2019, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime();
-            dListView.Add(FilterItem2);
+            // dynamic FilterItem2 = new JObject();
+            // FilterItem2.fld = "widgetstartdate";
+            // FilterItem2.op = Util.OpLessThanOrEqualTo;
+            // FilterItem2.value = new DateTime(2019, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime();
+            // dListView.Add(FilterItem2);
 
+            //Build multiple condition filter (not handled by util method)
+            dynamic d = new JObject();
+            d.fld = "widgetstartdate";
+
+
+            dynamic filter = new JObject();
+            dynamic items = new JArray();
+            
+            dynamic fitem = new JObject();
+            fitem.op = Util.OpGreaterThanOrEqualTo;
+            fitem.value = new DateTime(2019, 3, 12, 10, 0, 0).ToOffsetAdjustedUniversalTime();
+            items.Add(fitem);
+
+            fitem = new JObject();
+            fitem.op = Util.OpLessThanOrEqualTo;
+            fitem.value = new DateTime(2019, 3, 12, 11, 0, 0).ToOffsetAdjustedUniversalTime();
+            items.Add(fitem);
+
+
+            filter.items = items;
+            d.filter = filter;
+
+            dListView.Add(d);
+/*
+"[{"fld":"widgetname","filter":{"items":[{"op":"%-","value":"DateOpBetweenFilterWorks"}]}},
+"{"fld":"widgetstartdate","filter":{"items":[{"op":">=","value":"2019-03-12T18:00:00Z"},{"op":"<=","value":"2019-03-12T19:00:00Z"}]}}"]"
+*/
 
 
             //FETCH DATALIST