From abb343fab032aff826191fb440b8c9608e014614 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 23 Jun 2021 19:20:48 +0000
Subject: [PATCH]

---
 .../AyaNova/DataList/WorkOrderItemDataList.cs | 65 +++++++++++++++++--
 1 file changed, 59 insertions(+), 6 deletions(-)

diff --git a/server/AyaNova/DataList/WorkOrderItemDataList.cs b/server/AyaNova/DataList/WorkOrderItemDataList.cs
index 86a69d57..84e53020 100644
--- a/server/AyaNova/DataList/WorkOrderItemDataList.cs
+++ b/server/AyaNova/DataList/WorkOrderItemDataList.cs
@@ -7,17 +7,21 @@ namespace AyaNova.DataList
         public WorkOrderItemDataList()
         {
             DefaultListAType = AyaType.WorkOrder;
-            SQLFrom = "from aworkorder "
-            + "left join aworkorderitem on aworkorder.id=aworkorderitem.workorderid "
+            SQLFrom = "from aworkorder "            
             + "left join aworkorderstatus on (aworkorder.laststatusid = aworkorderstatus.id) "
             + "left join acustomer on (aworkorder.customerid=acustomer.id) "
             + "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) "
             + "left join aproject on (aworkorder.projectid=aproject.id) "
-            + "left join acontract on (aworkorder.contractid=acontract.id)";
+            + "left join acontract on (aworkorder.contractid=acontract.id)"
+            + "left join aworkorderitem on aworkorder.id=aworkorderitem.workorderid "
+            + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) "
+            + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) "
+            ;
+
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
-            DefaultColumns = new List<string>() { "WorkOrderItemSummary", "WorkOrderSerialNumber", "Customer", "WorkOrderServiceDate" };
-            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" } };
+            DefaultColumns = new List<string>() { "WorkOrderItemSummary", "WorkOrderItemWorkOrderStatusID", "WorkOrderItemPriorityID", "WorkOrderSerialNumber", "WorkOrderItemSequence", "Customer", "WorkOrderServiceDate" };
+            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();
 
 
@@ -34,7 +38,56 @@ namespace AyaNova.DataList
                 IsRowId = true
             });
 
-            #endregion
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "Sequence",
+                FieldKey = "WorkOrderItemSequence",
+                AType = (int)AyaType.WorkOrderItem,
+                UiFieldDataType = (int)UiFieldDataType.Integer,
+                SqlIdColumnName = "aworkorderitem.id",
+                SqlValueColumnName = "aworkorderitem.sequence"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemTechNotes",
+                FieldKey = "WorkOrderItemTechNotes",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlValueColumnName = "aworkorderitem.technotes"
+            });
+
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "Tags",
+                FieldKey = "WorkOrderItemTags",
+                UiFieldDataType = (int)UiFieldDataType.Tags,
+                SqlValueColumnName = "aworkorderitem.tags"
+            });
+
+              FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemWorkOrderStatusID",
+                FieldKey = "WorkOrderItemWorkOrderStatusID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.WorkOrderItemStatus,
+                SqlIdColumnName = "aworkorderitem.workorderitemstatusid",
+                SqlColorColumnName = "aworkorderitemstatus.color",
+                SqlValueColumnName = "aworkorderitemstatus.name"
+            });
+
+               FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "WorkOrderItemPriorityID",
+                FieldKey = "WorkOrderItemPriorityID",
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                AType = (int)AyaType.WorkOrderItemStatus,
+                SqlIdColumnName = "aworkorderitem.workorderitempriorityid",
+                SqlColorColumnName = "aworkorderitempriority.color",
+                SqlValueColumnName = "aworkorderitempriority.name"
+            });
+
+
+            #endregion workorderitem fields
 
 
             #region  WorkOrder Header fields