Merge pull request #243 from knelson-farmbeltnorth/develop

Handling binary variations in certain early datasets; filling Role on PersonRole.

Author: strhea

ISOv4Plugin/Mappers/AllocationStampMapper.cs

@@ -89,6 +89,7 @@ public static  IEnumerable<TimeScope> ImportAllocationStamps(IEnumerable<ISOAllo
         public static TimeScope ImportAllocationStamp(ISOAllocationStamp isoAllocationStamp)
         {
             TimeScope adaptTimeScope = new TimeScope();
+            adaptTimeScope.DateContext = DateContextEnum.ActualStart;
             adaptTimeScope.TimeStamp1 = isoAllocationStamp.Start;
 
             //[Check] AllocationStamp XML element: a recording with only the Start attribute defined is allowed

ISOv4Plugin/Mappers/TaskDataMapper.cs

@@ -35,7 +35,7 @@ public class TaskDataMapper : ITaskDataMapper
         public const string ExportVersion = "ExportVersion"; //Version "3" or "4"
         public const string SuppressTimeLogDataInterpolation = "SuppressTimeLogDataInterpolation";
 
-        public TaskDataMapper(string dataPath, Properties properties)
+        public TaskDataMapper(string dataPath, Properties properties, int? taskDataVersionMajor = null)
         {
             BaseFolder = dataPath;
             RepresentationMapper = new RepresentationMapper();
@@ -45,16 +45,22 @@ public TaskDataMapper(string dataPath, Properties properties)
             InstanceIDMap = new InstanceIDMap();
             Errors = new List<IError>();
 
-            //Export version
-            string exportVersion = Properties.GetProperty(ExportVersion);
-            if (Int32.TryParse(exportVersion, out int version))
+            if (taskDataVersionMajor.HasValue)
             {
-                Version = version;  //3 or 4
+                Version = taskDataVersionMajor.Value;
             }
-            if (version != 3 && version != 4)
+            else
             {
-                Version = 4; //Default ISO Version for the export
-            }
+                string exportVersion = Properties.GetProperty(ExportVersion);
+                if (Int32.TryParse(exportVersion, out int version))
+                {
+                    Version = version;  //3 or 4
+                }
+                if (version != 3 && version != 4)
+                {
+                    Version = 4; //Default ISO Version for the export
+                }
+            }           
         }
 
         public string BaseFolder { get; private set; }

ISOv4Plugin/Mappers/TaskMapper.cs

@@ -17,6 +17,7 @@
 using AgGateway.ADAPT.ISOv4Plugin.ISOModels;
 using AgGateway.ADAPT.ISOv4Plugin.Mappers.Factories;
 using AgGateway.ADAPT.ISOv4Plugin.Representation;
+using AgGateway.ADAPT.Representation.RepresentationSystem.ExtensionMethods;
 
 namespace AgGateway.ADAPT.ISOv4Plugin.Mappers
 {
@@ -571,7 +572,11 @@ private LoggedData ImportLoggedData(ISOTask isoLoggedTask)
                 if (personID.HasValue)
                 {
                     //Create a Role
-                    PersonRole role = new PersonRole() { PersonId = personID.Value };
+                    PersonRole role = new PersonRole()
+                    {
+                        PersonId = personID.Value,
+                        Role = new EnumeratedValue { Value = AgGateway.ADAPT.Representation.RepresentationSystem.DefinedTypeEnumerationInstanceList.dtiPersonRoleOperator.ToModelEnumMember() }
+                    };
 
                     //Add to Catalog
                     DataModel.Catalog.PersonRoles.Add(role);
@@ -713,19 +718,28 @@ private Summary ImportSummary(ISOTask isoLoggedTask, LoggedData loggedData)
                 foreach (ISOTime time in isoLoggedTask.Times.Where(t => t.HasStart && t.HasType)) //Nothing added without a Start and Type attribute
                 {
                     TimeScope timeScope = new TimeScope();
+                    timeScope.DateContext = DateContextEnum.ActualStart;
                     timeScope.TimeStamp1 = time.Start;
                     if (time.Stop != null)
                     {
                         timeScope.TimeStamp2 = time.Stop;
                     }
 
-                    if (time.Stop == null && time.Duration != null)
+                    if (time.Duration != null)
                     {
-                        //Calculate the Stop time if missing and duration present
-                        timeScope.TimeStamp2 = timeScope.TimeStamp1.Value.AddSeconds(time.Duration.Value);
+                        timeScope.Duration = System.TimeSpan.FromSeconds(time.Duration.Value);
+                        if (time.Stop == null)
+                        {
+                            //Calculate the Stop time if missing and duration present
+                            timeScope.TimeStamp2 = timeScope.TimeStamp1.Value.AddSeconds(time.Duration.Value);
+                        }
+                    }
+                    else if (timeScope.TimeStamp1.HasValue && timeScope.TimeStamp2.HasValue)
+                    {
+                        //Calculate the Duration if missing and start/stop present
+                        timeScope.Duration = timeScope.TimeStamp2.Value - timeScope.TimeStamp1.Value;
                     }
                     timeScope.DateContext = time.Type == ISOEnumerations.ISOTimeType.Planned ? DateContextEnum.ProposedStart : DateContextEnum.ActualStart;
-                    timeScope.Duration = timeScope.TimeStamp2.GetValueOrDefault() - timeScope.TimeStamp1.GetValueOrDefault();
                     summary.TimeScopes.Add(timeScope);
                 }
 
@@ -827,6 +841,7 @@ private StampedMeteredValues GetStampedMeteredValuesForTimes(IEnumerable<ISOTime
 
             //TimeScope
             stampedValues.Stamp = new TimeScope();
+            stampedValues.Stamp.DateContext = DateContextEnum.ActualStart;
             stampedValues.Stamp.TimeStamp1 = orderedTimes.First().Start;
             if (orderedTimes.Last().Stop != null)
             {
@@ -841,7 +856,10 @@ private StampedMeteredValues GetStampedMeteredValuesForTimes(IEnumerable<ISOTime
             //All types should be the same
             stampedValues.Stamp.DateContext = orderedTimes.First().Type == ISOEnumerations.ISOTimeType.Planned ? DateContextEnum.ProposedStart : DateContextEnum.ActualStart;
             //Duration will define the time from the first to the last time.   Gaps will be identifiable by examining Summary.Timescopes as defined above.
-            stampedValues.Stamp.Duration = stampedValues.Stamp.TimeStamp2.GetValueOrDefault() - stampedValues.Stamp.TimeStamp1.GetValueOrDefault();
+            if (stampedValues.Stamp.TimeStamp1.HasValue && stampedValues.Stamp.TimeStamp2.HasValue)
+            {
+                stampedValues.Stamp.Duration = stampedValues.Stamp.TimeStamp2.Value - stampedValues.Stamp.TimeStamp1.Value;
+            }
 
             //Values
             foreach (ISODataLogValue dlv in orderedTimes.Last().DataLogValues) //The last Time contains the comprehensive Task totals