server/AyaNova/models/DataListTableProcessingOptions.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using AyaNova.DataList;
+using AyaNova.Biz;
 using Newtonsoft.Json;
 
 
@@ -18,7 +19,9 @@ namespace AyaNova.Models
             DataListTableRequest request,
             IDataListProcessing dataList,
             DataListSavedColumnView savedView,
-            DataListSavedFilter savedFilter)
+            DataListSavedFilter savedFilter,
+            long userId,
+            AuthorizationRoles userRoles)
         {
             //set some values from request
             Limit = request.Limit;
@@ -26,8 +29,6 @@ namespace AyaNova.Models
             base.ClientCriteria = request.ClientCriteria;
             base.DataListKey = request.DataListKey;
 
-
-
             //SET COLUMNS
             Columns = JsonConvert.DeserializeObject<List<string>>(savedView.Columns);
 
@@ -36,14 +37,30 @@ namespace AyaNova.Models
 
             //SET FILTER
             if (request.FilterId != 0)
-            {
                 base.Filter = JsonConvert.DeserializeObject<List<DataListFilterOption>>(savedFilter.Filter);
-            }
-
 
             //SERVER FILTER PROCESSING HERE CODE SEE DATALISTFETCHER
 
 
+/*
+     List<DataListFilterOption> StaticServerFilterOptions = new List<DataListFilterOption>();
+            if (DataList is IDataListInternalCriteria)
+                StaticServerFilterOptions = ((IDataListInternalCriteria)DataList).DataListInternalCriteria(userId, userRoles, dataListTableOptions);
+
+
+            // //Get the public field key names in a list from the listview
+            // List<string> PublicListViewFieldList = listOptions.Columns;
+
+            //Get the combination of all unique fields from both StaticServerFilterOptions and listOptions   
+            //NOTE: this assumes no list options filter colums that don't exist in listoptions.columns       
+            var AllUniqueFieldKeysRequiredForQuery = dataListTableOptions.Columns.Union(StaticServerFilterOptions.Select(z => z.Column).ToList()).ToList();
+
+            //Add the internal filters into the listoptions existing filters
+            //NOTE: There is currently no overlap between internal filtered columns and filters coming from the client
+            foreach (DataListFilterOption dfo in StaticServerFilterOptions)
+                dataListTableOptions.Filter.Add(dfo);
+*/
+
 
         }
     }