Merge pull request #242 from ADAPT/develop

strhea · web-flow · commit dfd4f45934d7 · 2025-04-22T14:53:34.000-05:00
Merge to master for release
diff --git a/ISOv4Plugin/Mappers/LoggedDataMappers/Import/WorkingDataMapper.cs b/ISOv4Plugin/Mappers/LoggedDataMappers/Import/WorkingDataMapper.cs
@@ -217,6 +217,12 @@ private NumericWorkingData CreateProductIndexWorkingData(int deviceElementUseId)
         private void UpdateCondensedWorkingDatas(List<ISOEnumeratedMeter> condensedWorkingDatas, ISODataLogValue dlv, DeviceElementUse deviceElementUse, List<DeviceElementUse> pendingDeviceElementUses, DeviceHierarchyElement isoDeviceElementHierarchy)
         {
             ISODeviceElement isoDeviceElement = TaskDataMapper.DeviceElementHierarchies.GetISODeviceElementFromID(dlv.DeviceElementIdRef);
+            if (isoDeviceElement == null)
+            {
+                // If no device element found for the log value, nothing more to do here
+                return;
+            }
+
             List<ISODeviceElement> isoSectionElements = isoDeviceElement.ChildDeviceElements.Where(d => d.DeviceElementType == ISOEnumerations.ISODeviceElementType.Section).ToList();
             foreach (var subElement in isoDeviceElement.ChildDeviceElements)
             {

Original file line number	Diff line number	Diff line change
`@@ -217,6 +217,12 @@ private NumericWorkingData CreateProductIndexWorkingData(int deviceElementUseId)`
`217`	`217`	`private void UpdateCondensedWorkingDatas(List<ISOEnumeratedMeter> condensedWorkingDatas, ISODataLogValue dlv, DeviceElementUse deviceElementUse, List<DeviceElementUse> pendingDeviceElementUses, DeviceHierarchyElement isoDeviceElementHierarchy)`
`218`	`218`	`{`
`219`	`219`	`ISODeviceElement isoDeviceElement = TaskDataMapper.DeviceElementHierarchies.GetISODeviceElementFromID(dlv.DeviceElementIdRef);`
	`220`	`+ if (isoDeviceElement == null)`
	`221`	`+ {`
	`222`	`+ // If no device element found for the log value, nothing more to do here`
	`223`	`+ return;`
	`224`	`+ }`
	`225`	`+`
`220`	`226`	`List<ISODeviceElement> isoSectionElements = isoDeviceElement.ChildDeviceElements.Where(d => d.DeviceElementType == ISOEnumerations.ISODeviceElementType.Section).ToList();`
`221`	`227`	`foreach (var subElement in isoDeviceElement.ChildDeviceElements)`
`222`	`228`	`{`