server/AyaNova/DataList/PartInventoryDataList.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using AyaNova.Biz;
 using AyaNova.Models;
 
@@ -114,38 +115,34 @@ namespace AyaNova.DataList
             });
 
         }
-        //"clientCriteria":"p:102074,w:*"
+        //"clientCriteria":"102074,0"
         public List<DataListFilterOption> DataListServerCriteria(long currentUserId, AuthorizationRoles userRoles, DataListBase dataListBase)
         {
             List<DataListFilterOption> ret = new List<DataListFilterOption>();
-            //ClientCriteria MUST be CustomerId
-            if (string.IsNullOrWhiteSpace(dataListBase.ClientCriteria))
-                throw new System.ArgumentNullException("CustomerNoteDataList - ClientCriteria is empty, should be Customer ID");
 
-            DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metacustomer" };
-            FilterOption.Items.Add(new DataListColumnFilter() { value = dataListBase.ClientCriteria, op = DataListFilterComparisonOperator.Equality });
+            //ClientCriteria is optional for this list
+            //Format for this list is "PARTID,WAREHOUSEID" where the id is 0 if not filtered or the id to filter
+            var crit = (dataListBase.ClientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
+            if (crit.Length > 1)
+            {
+                //Part criteria
+                if (crit[0]!="0")
+                {
+                    DataListFilterOption FilterOption = new DataListFilterOption() { Column = "PartPartNumber" };
+                    FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
+                    ret.Add(FilterOption);
+                }
 
-            ret.Add(FilterOption);
+                 //Warehouse criteria
+                if (crit[1]!="0")
+                {
+                    DataListFilterOption FilterOption = new DataListFilterOption() { Column = "PartWarehouseName" };
+                    FilterOption.Items.Add(new DataListColumnFilter() { value = crit[1], op = DataListFilterComparisonOperator.Equality });
+                    ret.Add(FilterOption);
+                }
+            }
             return ret;
         }
 
-        /*
-        metaFilter.push({
-    //       fld: "PartPartNumber",
-    //       filter: {
-    //         items: [{ op: "=", value: vm.$route.params.filter.PartPartNumber }]
-    //       }
-    //     });
-    //   }
-
-    //   if (vm.$route.params.filter.PartWarehouseName != null) {
-    //     metaFilter.push({
-    //       fld: "PartWarehouseName",
-    //       filter: {
-    //         items: [
-    //           { op: "=", value: vm.$route.params.filter.PartWarehouseName }
-    //         ]
-        */
-
     }//eoc
 }//eons