Merge pull request #209 from knelson-farmbeltnorth/parent_product_allocations

Parent product allocations

Author: Stuart Rhea

ISOv4Plugin/ISOv4Plugin.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AgGatewayADAPTFramework" Version="3.0.0" />
+    <PackageReference Include="AgGatewayADAPTFramework" Version="3.0.2" />
   </ItemGroup>
 
   <ItemGroup>

ISOv4Plugin/Mappers/TimeLogMapper.cs

@@ -340,8 +340,27 @@ protected IEnumerable<OperationData> ImportTimeLog(ISOTask loggedTask, ISOTimeLo
                 ISOTime time = GetTimeElementFromTimeLog(isoTimeLog);
 
                 //Identify unique devices represented in this TimeLog data
-                IEnumerable<string> deviceElementIDs = time.DataLogValues.Where(d => !d.ProcessDataDDI.EqualsIgnoreCase("DFFF") && !d.ProcessDataDDI.EqualsIgnoreCase("DFFE"))
+                List<string> deviceElementIDs = time.DataLogValues.Where(d => !d.ProcessDataDDI.EqualsIgnoreCase("DFFF") && !d.ProcessDataDDI.EqualsIgnoreCase("DFFE"))
                     .Select(d => d.DeviceElementIdRef).Distinct().ToList();
+
+                //Supplement the list with any parent device elements which although don't log data in the TLG
+                //May require a vrProductIndex working data based on product allocations
+                HashSet<string> parentsToAdd = new HashSet<string>();
+                foreach (string deviceElementID in deviceElementIDs)
+                {
+                    ISODeviceElement isoDeviceElement = TaskDataMapper.DeviceElementHierarchies.GetISODeviceElementFromID(deviceElementID);
+                    if (isoDeviceElement != null)
+                    {
+                        while (isoDeviceElement.Parent != null &&
+                                isoDeviceElement.Parent is ISODeviceElement parentDet)
+                        {
+                            parentsToAdd.Add(parentDet.DeviceElementId);
+                            isoDeviceElement= parentDet;
+                        }
+                    }
+                }
+                deviceElementIDs.AddRange(parentsToAdd);
+
                 Dictionary<ISODevice, HashSet<string>> loggedDeviceElementsByDevice = new Dictionary<ISODevice, HashSet<string>>();
                 foreach (string deviceElementID in deviceElementIDs)
                 {