PMXML: activity type P6 6.1

joniles · Jan 16, 2025 · bfc9ce8 · bfc9ce8
1 parent ffa0c00
commit bfc9ce8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -6,6 +6,7 @@
 	</properties>
 	<body>
 		<release date="unreleased" version="13.9.1">
+			<action dev="joniles" type="update">Improve handling of Activity Type attribute when reading PMXML files written by Primavera P6 6.x.</action>
 		</release>
 		<release date="2025-01-09" version="13.9.0">
 			<action dev="joniles" type="update">Updated to POI 5.4.0</action>

diff --git a/src/main/java/net/sf/mpxj/primavera/ActivityTypeHelper.java b/src/main/java/net/sf/mpxj/primavera/ActivityTypeHelper.java
@@ -100,6 +100,9 @@ public static String getXerFromInstance(ActivityType value)
       XML_TYPE_MAP.put("Start Milestone", net.sf.mpxj.ActivityType.START_MILESTONE);
       XML_TYPE_MAP.put("Finish Milestone", net.sf.mpxj.ActivityType.FINISH_MILESTONE);
       XML_TYPE_MAP.put("WBS Summary", net.sf.mpxj.ActivityType.WBS_SUMMARY);
+
+      // Version 6.1 schema. Need access to prmbo.xsd to confirm other values
+      XML_TYPE_MAP.put("0", net.sf.mpxj.ActivityType.TASK_DEPENDENT);
    }
 
    private static final Map<net.sf.mpxj.ActivityType, String> TYPE_XML_MAP = new HashMap<>();

diff --git a/src/main/java/net/sf/mpxj/primavera/PrimaveraPMFileReader.java b/src/main/java/net/sf/mpxj/primavera/PrimaveraPMFileReader.java
@@ -1854,7 +1854,7 @@ private void processTasks(List<WBSType> wbs, Map<Integer, Notes> wbsNotes, List<
          // and Finish Date attributes are populated with that date.
          if (task.getMilestone())
          {
-            if ("Start Milestone".equals(row.getType()))
+            if (task.getActivityType() == net.sf.mpxj.ActivityType.START_MILESTONE)
             {
                task.setFinish(task.getStart());
             }