2021-09-02 15:26:11 +00:00
parent 52cf84e7d0
commit 48c447f93a
35 changed files with 89 additions and 52 deletions
--- a/server/AyaNova/DataList/PMItemDataList.cs
+++ b/server/AyaNova/DataList/PMItemDataList.cs
@@ -81,7 +81,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/PMItemExpenseDataList.cs
@@ -186,7 +186,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemLaborDataList.cs
+++ b/server/AyaNova/DataList/PMItemLaborDataList.cs
@@ -203,7 +203,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemLoanDataList.cs
+++ b/server/AyaNova/DataList/PMItemLoanDataList.cs
@@ -191,7 +191,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/PMItemOutsideServiceDataList.cs
@@ -206,7 +206,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemPartDataList.cs
+++ b/server/AyaNova/DataList/PMItemPartDataList.cs
@@ -192,7 +192,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemScheduledUserDataList.cs
+++ b/server/AyaNova/DataList/PMItemScheduledUserDataList.cs
@@ -173,7 +173,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemTaskDataList.cs
+++ b/server/AyaNova/DataList/PMItemTaskDataList.cs
@@ -160,7 +160,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemTravelDataList.cs
+++ b/server/AyaNova/DataList/PMItemTravelDataList.cs
@@ -189,7 +189,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/PMItemUnitDataList.cs
+++ b/server/AyaNova/DataList/PMItemUnitDataList.cs
@@ -159,7 +159,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "apmitem.tags"
--- a/server/AyaNova/DataList/QuoteItemDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemDataList.cs
@@ -80,7 +80,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemExpenseDataList.cs
@@ -185,7 +185,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemLaborDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemLaborDataList.cs
@@ -203,7 +203,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemLoanDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemLoanDataList.cs
@@ -192,7 +192,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemOutsideServiceDataList.cs
@@ -207,7 +207,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemPartDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemPartDataList.cs
@@ -192,7 +192,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemScheduledUserDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemScheduledUserDataList.cs
@@ -172,7 +172,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemTaskDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemTaskDataList.cs
@@ -160,7 +160,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemTravelDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemTravelDataList.cs
@@ -189,7 +189,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/QuoteItemUnitDataList.cs
+++ b/server/AyaNova/DataList/QuoteItemUnitDataList.cs
@@ -159,7 +159,7 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aquoteitem.tags"
--- a/server/AyaNova/DataList/WorkOrderItemDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemDataList.cs
@@ -22,14 +22,14 @@ namespace AyaNova.DataList

            var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
            AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { 
+            DefaultColumns = new List<string>() {
                "WorkOrderSerialNumber",
                "WorkOrderItemSequence",
-                "WorkOrderItemSummary",              
-                "WorkOrderItemWorkOrderStatusID", 
-                "WorkOrderItemPriorityID",               
-                "Customer", 
-                "WorkOrderServiceDate" 
+                "WorkOrderItemSummary",
+                "WorkOrderItemWorkOrderStatusID",
+                "WorkOrderItemPriorityID",
+                "Customer",
+                "WorkOrderServiceDate"
                };
            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" } };
            FieldDefinitions = new List<DataListFieldDefinition>();
@@ -79,8 +79,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -219,6 +220,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
@@ -389,7 +391,7 @@ namespace AyaNova.DataList
                SqlValueColumnName = "viewworkorder.longitude"
            });

-         
+

            FieldDefinitions.Add(new DataListFieldDefinition
            {
--- a/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemExpenseDataList.cs
@@ -185,8 +185,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -317,6 +318,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemLaborDataList.cs
@@ -202,8 +202,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -334,6 +335,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemLoanDataList.cs
@@ -190,8 +190,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -322,6 +323,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemOutsideServiceDataList.cs
@@ -204,8 +204,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -336,6 +337,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemPartDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemPartDataList.cs
@@ -192,8 +192,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -324,6 +325,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemPartRequestDataList.cs
@@ -225,8 +225,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -357,6 +358,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemScheduledUserDataList.cs
@@ -173,8 +173,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -305,6 +306,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemTaskDataList.cs
@@ -160,8 +160,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -292,6 +293,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemTravelDataList.cs
@@ -188,8 +188,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -320,6 +321,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
--- a/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemUnitDataList.cs
@@ -73,7 +73,14 @@ namespace AyaNova.DataList
                SqlValueColumnName = "aworkorderitemunit.notes"
            });

-
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemUnitTags",
+                FieldKey = "WorkOrderItemUnitTags",
+                TKeySection = "WorkOrderItemUnit",
+                UiFieldDataType = (int)UiFieldDataType.Tags,
+                SqlValueColumnName = "aworkorderitemunit.tags"
+            });

            FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemUnitCustom1", FieldKey = "workorderitemunitcustom1", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitemunit.customfields", TKeySection = "WorkOrderItemUnit" });
            FieldDefinitions.Add(new DataListFieldDefinition { TKey = "WorkOrderItemUnitCustom2", FieldKey = "workorderitemunitcustom2", IsCustomField = true, IsFilterable = false, IsSortable = false, SqlValueColumnName = "aworkorderitemunit.customfields", TKeySection = "WorkOrderItemUnit" });
@@ -158,8 +165,9 @@ namespace AyaNova.DataList

            FieldDefinitions.Add(new DataListFieldDefinition
            {
-                TKey = "Tags",
+                TKey = "WorkOrderItemTags",
                FieldKey = "WorkOrderItemTags",
+                TKeySection = "WorkOrderItem",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "aworkorderitem.tags"
            });
@@ -290,6 +298,7 @@ namespace AyaNova.DataList
            {
                TKey = "Tags",
                FieldKey = "workordertags",
+                TKeySection = "WorkOrder",
                UiFieldDataType = (int)UiFieldDataType.Tags,
                SqlValueColumnName = "viewworkorder.tags"
            });
@@ -526,7 +535,7 @@ namespace AyaNova.DataList
            //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;