server/AyaNova/DataList/UnitMeterReadingDataList.cs

@@ -9,7 +9,11 @@ namespace AyaNova.DataList
         public UnitMeterReadingDataList()
         {
             DefaultListAType = AyaType.UnitMeterReading;
-            SQLFrom = "from aunitmeterreading left join aunit on (aunitmeterreading.unitid=aunit.id) left join aworkorderitem on (aunitmeterreading.workorderitemid) left join aworkorder";
+            SQLFrom = "from aunitmeterreading "
+            + "left join aunit on (aunitmeterreading.unitid = aunit.id) "
+            + "left join aworkorderitemunit on (aunitmeterreading.workorderitemunitid = aworkorderitemunit.id) "
+            + "left join aworkorderitem on (aworkorderitemunit.workorderitemid = aworkorderitem.id) "
+            + "left join aworkorder on (aworkorderitem.workorderid = aworkorder.id)";
             var RoleSet = BizRoles.GetRoleSet(DefaultListAType);
             AllowedRoles = RoleSet.ReadFullRecord | RoleSet.Change;
             DefaultColumns = new List<string>() { "notedate", "UnitMeterReadingDescription", "Unit" };
@@ -58,6 +62,18 @@ namespace AyaNova.DataList
                 SqlValueColumnName = "aunitmeterreading.meterdate"
             });
 
+            FieldDefinitions.Add(new DataListFieldDefinition
+            {
+                TKey = "UnitMeterReadingWorkOrderItemID",
+                FieldKey = "UnitMeterReadingWorkOrderItemID",
+                AType = (int)AyaType.WorkOrderItemUnit,
+                UiFieldDataType = (int)UiFieldDataType.Text,
+                SqlIdColumnName = "aworkorderitemunit.id",
+                SqlValueColumnName = "aworkorder.serial",
+                IsRowId = false
+            });
+
+
             //META column 
             FieldDefinitions.Add(new DataListFieldDefinition
             {
@@ -73,11 +89,10 @@ namespace AyaNova.DataList
         public List<DataListFilterOption> DataListInternalCriteria(long currentUserId, AuthorizationRoles userRoles, string clientCriteria)
         {
             List<DataListFilterOption> ret = new List<DataListFilterOption>();
-            //ClientCriteria MUST be CustomerId
             if (string.IsNullOrWhiteSpace(clientCriteria))
-                throw new System.ArgumentNullException("UnitMeterReadingDataList - ClientCriteria is empty, should be Customer ID");
+                throw new System.ArgumentNullException("UnitMeterReadingDataList - ClientCriteria is empty, should be Unit ID");
 
-            DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metacustomer" };
+            DataListFilterOption FilterOption = new DataListFilterOption() { Column = "metaunit" };
             FilterOption.Items.Add(new DataListColumnFilter() { value = clientCriteria, op = DataListFilterComparisonOperator.Equality });
 
             ret.Add(FilterOption);