From 08138894c9cb357e3608abaf9bb8a3ad15653dd1 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 14 Sep 2021 18:46:42 +0000
Subject: [PATCH]

---
 ...s => SchedulePersonalWorkOrderDataList.cs} | 25 ++++++-------------
 1 file changed, 7 insertions(+), 18 deletions(-)
 rename server/AyaNova/DataList/{ScheduleWorkOrderDataList.cs => SchedulePersonalWorkOrderDataList.cs} (94%)

diff --git a/server/AyaNova/DataList/ScheduleWorkOrderDataList.cs b/server/AyaNova/DataList/SchedulePersonalWorkOrderDataList.cs
similarity index 94%
rename from server/AyaNova/DataList/ScheduleWorkOrderDataList.cs
rename to server/AyaNova/DataList/SchedulePersonalWorkOrderDataList.cs
index eb6b8ce1..a4c4c9b4 100644
--- a/server/AyaNova/DataList/ScheduleWorkOrderDataList.cs
+++ b/server/AyaNova/DataList/SchedulePersonalWorkOrderDataList.cs
@@ -5,41 +5,30 @@ using AyaNova.Models;
 
 namespace AyaNova.DataList
 {
-    internal class ScheduleWorkOrderDataList : DataListProcessingBase, IDataListInternalCriteria
+    internal class SchedulePersonalWorkOrderDataList : DataListProcessingBase, IDataListInternalCriteria
     {
-        public ScheduleWorkOrderDataList()
+        public SchedulePersonalWorkOrderDataList()
         {
             DefaultListAType = AyaType.WorkOrder;
             SQLFrom = "from viewworkorder "
             + "left join aworkorderstatus on (viewworkorder.laststatusid = aworkorderstatus.id) "
-            + "left join acustomer on (viewworkorder.customerid=acustomer.id) "
-            + "left join aheadoffice on (acustomer.headofficeid=aheadoffice.id) "
-            + "left join aproject on (viewworkorder.projectid=aproject.id) "
-            + "left join acontract on (viewworkorder.contractid=acontract.id)"
+            + "left join acustomer on (viewworkorder.customerid=acustomer.id) "           
             + "left join aworkorderitem on viewworkorder.id=aworkorderitem.workorderid "
             + "left join aworkorderitemstatus on (aworkorderitem.workorderitemstatusid = aworkorderitemstatus.id) "
             + "left join aworkorderitempriority on (aworkorderitem.workorderitempriorityid = aworkorderitempriority.id) "
             //scheduled users
             + "left join aworkorderitemscheduleduser on aworkorderitem.id=aworkorderitemscheduleduser.workorderitemid "
-            + "left join auser on (aworkorderitemscheduleduser.userid=auser.id) "
-            + "left join aservicerate on (aworkorderitemscheduleduser.servicerateid=aservicerate.id) "
             ;
 
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
             DefaultColumns = new List<string>() {
-                    "WorkOrderSerialNumber",
-                    "WorkOrderItemSequence",
-                    "WorkOrderItemSummary",
-                    "Customer",
-                    "WorkOrderServiceDate",
-                    "WorkOrderItemScheduledUserUserID",
+                    "WorkOrderSerialNumber",              
+                    "Customer",                 
                     "WorkOrderItemScheduledUserStartDate",
-                    "WorkOrderItemScheduledUserStopDate",
-                    "WorkOrderItemScheduledUserServiceRateID",
-                    "WorkOrderItemScheduledUserEstimatedQuantity"
+                    "WorkOrderItemScheduledUserStopDate"
                   };
-            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderSerialNumber", "-" }, { "WorkOrderItemSequence", "+" }, { "WorkOrderItemScheduledUserStartDate", "-" }, { "WorkOrderItemScheduledUserUserID", "+" } };
+            DefaultSortBy = new Dictionary<string, string>() { { "WorkOrderItemScheduledUserStartDate", "+" } };
             FieldDefinitions = new List<DataListFieldDefinition>();