7 files changed, 48 insertions, 9 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
index aaeca9df5c9..74cfd245556 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java
@@ -1416,4 +1416,21 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact {
       return "(see children)";
    }
 
+   /* (non-Javadoc)
+    * @see org.eclipse.osee.ats.world.IWorldViewArtifact#getWorldViewSWEnhancement()
+    */
+   @Override
+   public String getWorldViewSWEnhancement() throws OseeCoreException, SQLException {
+      Set<String> strs = new HashSet<String>();
+      try {
+         // Roll up version if same for all children
+         for (TeamWorkFlowArtifact team : getTeamWorkFlowArtifacts()) {
+            if (team.getWorldViewPercentRework() > 0) strs.add(team.getWorldViewSWEnhancement());
+         }
+         return Collections.toString(",", strs);
+      } catch (SQLException ex) {
+         return XViewerCells.getCellExceptionString(ex);
+      }
+   }
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
index 82ebcfb4962..f9edb029b35 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java
@@ -1231,4 +1231,8 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld
    public String getWorldViewLastStatused() throws OseeCoreException, SQLException {
       return XDate.getDateStr(smaMgr.getLog().getLastStatusedDate(), XDate.MMDDYYHHMM);
    }
+
+   public String getWorldViewSWEnhancement() throws OseeCoreException, SQLException {
+      return "";
+   }
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
index 16671d26803..907f4d5571a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TaskArtifact.java
@@ -343,4 +343,10 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
       return "";
    }
 
+   public String getWorldViewSWEnhancement() throws OseeCoreException, SQLException {
+      StateMachineArtifact sma = getParentSMA();
+      if (sma != null) return sma.getWorldViewSWEnhancement();
+      return "";
+   }
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
index fdbc2de1932..70e77dffd79 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/TeamWorkFlowArtifact.java
@@ -588,4 +588,9 @@ public class TeamWorkFlowArtifact extends TaskableStateMachineArtifact implement
       }
       return null;
    }
+
+   public String getWorldViewSWEnhancement() throws OseeCoreException, SQLException {
+      return getSoleAttributeValue(ATSAttributes.SW_ENHANCEMENT_ATTRIBUTE.getStoreName(), "");
+   }
+
 }
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java
index 0357d406cd7..b86602c21b2 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java
@@ -81,6 +81,8 @@ public interface IWorldViewArtifact {
 
    public String getWorldViewLegacyPCR() throws OseeCoreException, SQLException;
 
+   public String getWorldViewSWEnhancement() throws OseeCoreException, SQLException;
+
    public double getWorldViewManDaysNeeded() throws OseeCoreException, SQLException;
 
    public String getWorldViewNotes() throws OseeCoreException, SQLException;
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java
index 7992764e5d3..8569eaf7727 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java
@@ -85,6 +85,7 @@ public class WorldLabelProvider extends XViewerLabelProvider {
          if (xCol.equals(WorldXViewerFactory.Resolution_Col)) return wva.getWorldViewResolution();
          if (xCol.equals(WorldXViewerFactory.Decision_Col)) return wva.getWorldViewDecision();
          if (xCol.equals(WorldXViewerFactory.Legacy_PCR_Col)) return wva.getWorldViewLegacyPCR();
+         if (xCol.equals(WorldXViewerFactory.SW_Enhancement_Col)) return wva.getWorldViewSWEnhancement();
          if (xCol.equals(WorldXViewerFactory.Weekly_Benefit_Hrs_Col)) return AtsLib.doubleToStrString(
                wva.getWorldViewWeeklyBenefit(), true);
          if (xCol.equals(WorldXViewerFactory.Estimated_Hours_Col)) return AtsLib.doubleToStrString(wva.getWorldViewEstimatedHours());
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
index 5791139897c..115661dde48 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java
@@ -80,6 +80,9 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
    public static XViewerAtsAttributeColumn Legacy_PCR_Col =
          new XViewerAtsAttributeColumn(COLUMN_NAMESPACE + ".legacyPcrId", ATSAttributes.LEGACY_PCR_ID_ATTRIBUTE, 40,
                SWT.LEFT, false, SortDataType.String, false, null);
+   public static XViewerColumn SW_Enhancement_Col =
+         new XViewerColumn(COLUMN_NAMESPACE + ".swEnhancement", "SW Enhancement", 150, SWT.LEFT, false,
+               SortDataType.String, false, null);
    public static final XViewerColumn Decision_Col =
          new XViewerColumn(COLUMN_NAMESPACE + ".decision", "Decision", 150, SWT.LEFT, false, SortDataType.String,
                false, null);
@@ -217,15 +220,16 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
    public static final XViewerColumn[] WorldViewColumns =
          new XViewerColumn[] {Type_Col, State_Col, Priority_Col, Change_Type_Col, Assignees_Col, Title_Col,
                Actionable_Items_Col, User_Community_Col, ID_Col, Created_Date_Col, Version_Target_Col, Team_Col,
-               Notes_Col, Deadline_Col, Annual_Cost_Avoidance_Col, Description_Col, Legacy_PCR_Col, Decision_Col,
-               Resolution_Col, Estimated_Release_Date_Col, Release_Date_Col, Work_Package_Col, Category_Col,
-               Category2_Col, Category3_Col, Related_To_State_Col, Estimated_Hours_Col, Weekly_Benefit_Hrs_Col,
-               Remaining_Hours_Col, Percent_Complete_State_Col, Percent_Complete_State_Task_Col,
-               Percent_Complete_State_Review_Col, Percent_Complete_Total_Col, Hours_Spent_State_Col,
-               Hours_Spent_State_Task_Col, Hours_Spent_State_Review_Col, Hours_Spent_Total_Col, Total_Hours_Spent_Col,
-               Originator_Col, Implementor_Col, Review_Author_Col, Review_Moderator_Col, Review_Reviewer_Col,
-               Review_Decider_Col, Completed_Date_Col, Cancelled_Date_Col, Man_Days_Needed_Col, Percent_Rework_Col,
-               Branch_Status_Col, Number_of_Tasks_Col, Last_Modified_Col, Last_Statused_Col, Validation_Required_Col};
+               Notes_Col, Deadline_Col, Annual_Cost_Avoidance_Col, Description_Col, Legacy_PCR_Col, SW_Enhancement_Col,
+               Decision_Col, Resolution_Col, Estimated_Release_Date_Col, Release_Date_Col, Work_Package_Col,
+               Category_Col, Category2_Col, Category3_Col, Related_To_State_Col, Estimated_Hours_Col,
+               Weekly_Benefit_Hrs_Col, Remaining_Hours_Col, Percent_Complete_State_Col,
+               Percent_Complete_State_Task_Col, Percent_Complete_State_Review_Col, Percent_Complete_Total_Col,
+               Hours_Spent_State_Col, Hours_Spent_State_Task_Col, Hours_Spent_State_Review_Col, Hours_Spent_Total_Col,
+               Total_Hours_Spent_Col, Originator_Col, Implementor_Col, Review_Author_Col, Review_Moderator_Col,
+               Review_Reviewer_Col, Review_Decider_Col, Completed_Date_Col, Cancelled_Date_Col, Man_Days_Needed_Col,
+               Percent_Rework_Col, Branch_Status_Col, Number_of_Tasks_Col, Last_Modified_Col, Last_Statused_Col,
+               Validation_Required_Col};
    private static String NAMESPACE = "org.eclipse.osee.ats.WorldXViewer";
 
    public WorldXViewerFactory() {