From 3f036c1bdaf80e8fe326ff2c7add0c48570db5de Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 9 Jul 2021 22:56:42 +0000
Subject: [PATCH]

---
 .../DataList/WorkOrderItemLoanDataList.cs     | 49 +++++++++++++++++--
 .../DataList/WorkOrderItemUnitDataList.cs     |  5 +-
 2 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
index e3ae8b4d..8486f065 100644
--- a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Linq;
 using AyaNova.Biz;
 using AyaNova.Models;
 
@@ -134,6 +135,15 @@ namespace AyaNova.DataList
                 IsMeta = true
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                FieldKey = "metaloanunit",
+                UiFieldDataType = (int)UiFieldDataType.InternalId,
+                SqlIdColumnName = "aworkorderitemloan.loanunitid",
+                SqlValueColumnName = "aworkorderitemloan.loanunitid",
+                IsMeta = true
+            });
+
             #endregion
 
 
@@ -515,11 +525,42 @@ namespace AyaNova.DataList
 
         public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)
         {
-            //This is required to filter out rows where there are no matching scheduled user otherwise we'd get all workorders and items regardless 
             List<DataListFilterOption> ret = new List<DataListFilterOption>();
-            DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metawoitemloanid" };
-            FilterOption.Items.Add(new DataListColumnFilter() { value = "*NULL*", op = DataListFilterComparisonOperator.NotEqual });
-            ret.Add(FilterOption);
+            //This is required to filter out rows where there are no matching scheduled user otherwise we'd get all workorders and items regardless 
+            {
+
+                DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metawoitemloanid" };
+                FilterOption.Items.Add(new DataListColumnFilter() { value = "*NULL*", op = DataListFilterComparisonOperator.NotEqual });
+                ret.Add(FilterOption);
+            }
+
+            //This is an optional filter generated at client to restrict to particular item's workorders
+            //ClientCriteria format for this list is "OBJECTID,AYATYPE" 
+            var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
+            if (crit.Length > 1)
+            {                
+                int nType = 0;
+                if (!int.TryParse(crit[1], out nType)) return ret;
+                AyaType forType = (AyaType)nType;
+                if (forType != AyaType.LoanUnit) return ret;//could be more later
+
+                long lId = 0;
+                if (!long.TryParse(crit[0], out lId)) return ret;
+                if (lId == 0) return ret;
+
+                //Have valid type, have an id, so filter away
+                switch (forType)
+                {
+                    case AyaType.LoanUnit:
+                        {
+                            DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaloanunit" };
+                            FilterOption.Items.Add(new DataListColumnFilter() { value = crit[0], op = DataListFilterComparisonOperator.Equality });
+                            ret.Add(FilterOption);
+                        }
+                        break;
+
+                }
+            }
             return ret;
         }
     }//eoc
diff --git a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
index fcd74593..297c49dd 100644
--- a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
@@ -511,12 +511,11 @@ namespace AyaNova.DataList
             //ClientCriteria format for this list is "OBJECTID,AYATYPE" 
             var crit = (clientCriteria ?? "").Split(',').Select(z => z.Trim()).ToArray();
             if (crit.Length > 1)
-            {
-                //will be filtered from different types, show all workorders from Customer, Project and nothing else at this time (others but for sub lists like workorderitemunits etc)
+            {                
                 int nType = 0;
                 if (!int.TryParse(crit[1], out nType)) return ret;
                 AyaType forType = (AyaType)nType;
-                if (forType != AyaType.Unit) return ret;//only supports Unit currently but could be more later
+                if (forType != AyaType.Unit) return ret;//could be more later
 
                 long lId = 0;
                 if (!long.TryParse(crit[0], out lId)) return ret;