Merge pull request #195 from ADAPT/develop

Merge for next release

Author: Stuart Rhea

ISOv4Plugin/Mappers/TimeLogMapper.cs

@@ -366,8 +366,11 @@ protected IEnumerable<OperationData> ImportTimeLog(ISOTask loggedTask, ISOTimeLo
                     {
                         OperationData operationData = new OperationData();
 
+                        //Get ids of all device elements in a group including parent element ids
+                        //since product allocations can be at parent elements which are not logging any data.
+                        var elementHierarchyIds = GetISOElementHierarchyIds(deviceElementGroup);
                         Dictionary<string, List<ISOProductAllocation>> productAllocations = deviceProductAllocations
-                            .Where(x => deviceElementGroup.Contains(x.Key))
+                            .Where(x => elementHierarchyIds.Contains(x.Key))
                             .ToDictionary(x => x.Key, x => x.Value);
                         List<int> productIDs = GetDistinctProductIDs(TaskDataMapper, productAllocations);
 
@@ -479,6 +482,20 @@ private List<string> FilterDeviceElementIds(DeviceHierarchyElement deviceHierarc
             return elementIdsToKeep;
         }
 
+        private List<string> GetISOElementHierarchyIds(List<string> deviceElementIds)
+        {
+            return deviceElementIds.Aggregate(new { ids = new HashSet<string>(), TaskDataMapper.DeviceElementHierarchies }, (acc, x) =>
+            {
+                var isoDevElement = acc.DeviceElementHierarchies.GetISODeviceElementFromID(x);
+                while (isoDevElement != null)
+                {
+                    acc.ids.Add(isoDevElement.DeviceElementId);
+                    isoDevElement = isoDevElement.Parent as ISODeviceElement;
+                }
+                return acc;
+            }).ids.ToList();
+        }
+
         protected virtual ISOTime GetTimeElementFromTimeLog(ISOTimeLog isoTimeLog)
         {
             return isoTimeLog.GetTimeElement(this.TaskDataPath);