goal changes

15 files changed, 187 insertions, 46 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewGoal.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewGoal.java
index 4bb9f8a8990..5609b3f0aca 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewGoal.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/actions/NewGoal.java
@@ -10,21 +10,14 @@
  *******************************************************************************/

 package org.eclipse.osee.ats.actions;

 

-import java.util.Collections;

 import org.eclipse.jface.action.Action;

 import org.eclipse.osee.ats.AtsImage;

 import org.eclipse.osee.ats.artifact.GoalArtifact;

-import org.eclipse.osee.ats.artifact.ATSLog.LogType;

-import org.eclipse.osee.ats.artifact.GoalArtifact.GoalState;

 import org.eclipse.osee.ats.config.AtsBulkLoad;

 import org.eclipse.osee.ats.editor.SMAEditor;

 import org.eclipse.osee.ats.internal.AtsPlugin;

-import org.eclipse.osee.ats.util.AtsArtifactTypes;

-import org.eclipse.osee.ats.util.AtsUtil;

 import org.eclipse.osee.framework.logging.OseeLevel;

 import org.eclipse.osee.framework.logging.OseeLog;

-import org.eclipse.osee.framework.skynet.core.UserManager;

-import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;

 import org.eclipse.osee.framework.ui.skynet.widgets.dialog.EntryDialog;

 import org.eclipse.osee.framework.ui.swt.ImageManager;

 

@@ -47,16 +40,7 @@ public class NewGoal extends Action {
          EntryDialog ed = new EntryDialog("New Goal", "Enter Title");

          if (ed.open() == 0) {

             String title = ed.getEntry();

-            GoalArtifact goalArt =

-                  (GoalArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Goal, AtsUtil.getAtsBranch());

-            goalArt.setName(title);

-            goalArt.getLog().addLog(LogType.Originated, "", "");

-

-            // Initialize state machine

-            goalArt.getStateMgr().initializeStateMachine(GoalState.InWork.name(),

-                  Collections.singleton(UserManager.getUser()));

-            goalArt.getLog().addLog(LogType.StateEntered, GoalState.InWork.name(), "");

-

+            GoalArtifact goalArt = GoalArtifact.createGoal(title);

             goalArt.persist();

             SMAEditor.editArtifact(goalArt);

          }

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 8663c193b6f..645520892d5 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
@@ -467,6 +467,17 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact {
       return Artifacts.toString("; ", groups);

    }

 

+   @Override

+   public String getWorldViewGoals() throws OseeCoreException {

+      Set<Artifact> groups = new HashSet<Artifact>();

+      groups.addAll(getRelatedArtifacts(AtsRelationTypes.Goal_Goal));

+      // Roll up if same for all children

+      for (TeamWorkFlowArtifact team : getTeamWorkFlowArtifacts()) {

+         groups.addAll(team.getRelatedArtifacts(AtsRelationTypes.Goal_Goal));

+      }

+      return Artifacts.toString("; ", groups);

+   }

+

    public String getWorldViewNumeric1() throws OseeCoreException {

       Set<String> strs = new HashSet<String>();

       for (TeamWorkFlowArtifact team : getTeamWorkFlowArtifacts()) {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java
index 5df5725d3ca..0a702cfacd7 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/GoalArtifact.java
@@ -10,17 +10,23 @@
  *******************************************************************************/

 package org.eclipse.osee.ats.artifact;

 

+import java.util.Collections;

 import java.util.Date;

 import java.util.List;

 import java.util.Set;

+import org.eclipse.osee.ats.artifact.ATSLog.LogType;

+import org.eclipse.osee.ats.util.AtsArtifactTypes;

 import org.eclipse.osee.ats.util.AtsRelationTypes;

+import org.eclipse.osee.ats.util.AtsUtil;

 import org.eclipse.osee.framework.core.exception.OseeCoreException;

 import org.eclipse.osee.framework.core.exception.OseeDataStoreException;

 import org.eclipse.osee.framework.core.model.ArtifactType;

 import org.eclipse.osee.framework.core.model.Branch;

 import org.eclipse.osee.framework.skynet.core.User;

+import org.eclipse.osee.framework.skynet.core.UserManager;

 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;

 import org.eclipse.osee.framework.skynet.core.artifact.ArtifactFactory;

+import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;

 

 /**

  * @author Donald G. Dunne

@@ -31,14 +37,6 @@ public class GoalArtifact extends StateMachineArtifact {
       InWork, Completed, Cancelled

    };

 

-   /**

-    * @param parentFactory

-    * @param guid

-    * @param humanReadableId

-    * @param branch

-    * @param artifactType

-    * @throws OseeDataStoreException

-    */

    public GoalArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

       registerAtsWorldRelation(AtsRelationTypes.Goal_Member);

@@ -97,4 +95,27 @@ public class GoalArtifact extends StateMachineArtifact {
       return null;

    }

 

+   public static GoalArtifact createGoal(String title) throws OseeCoreException {

+      GoalArtifact goalArt =

+            (GoalArtifact) ArtifactTypeManager.addArtifact(AtsArtifactTypes.Goal, AtsUtil.getAtsBranch());

+      goalArt.setName(title);

+      goalArt.getLog().addLog(LogType.Originated, "", "");

+

+      // Initialize state machine

+      goalArt.getStateMgr().initializeStateMachine(GoalState.InWork.name(),

+            Collections.singleton(UserManager.getUser()));

+      goalArt.getLog().addLog(LogType.StateEntered, GoalState.InWork.name(), "");

+      return goalArt;

+   }

+

+   public List<Artifact> getMembers() throws OseeCoreException {

+      return getRelatedArtifacts(AtsRelationTypes.Goal_Member, false);

+   }

+

+   public void addMember(Artifact artifact) throws OseeCoreException {

+      if (!getMembers().contains(artifact)) {

+         addRelation(AtsRelationTypes.Goal_Member, artifact);

+      }

+   }

+

 }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java
index ca06416d97c..aa7a79c04dd 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ReviewSMArtifact.java
@@ -49,13 +49,6 @@ public abstract class ReviewSMArtifact extends TaskableStateMachineArtifact {
       None, Transition, Commit

    };

 

-   /**

-    * @param parentFactory

-    * @param guid

-    * @param humanReadableId

-    * @param branch

-    * @throws OseeDataStoreException

-    */

    public ReviewSMArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

    }

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 95218ac0348..f749a7c9536 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
@@ -215,6 +215,11 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IGroup
    }

 

    @Override

+   public String getWorldViewGoals() throws OseeCoreException {

+      return Artifacts.toString("; ", getRelatedArtifacts(AtsRelationTypes.Goal_Goal));

+   }

+

+   @Override

    public double getWorldViewWeeklyBenefit() throws OseeCoreException {

       return 0;

    }

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 a601f68956a..ebc661688b9 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
@@ -50,10 +50,6 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
       InWork, Completed, Cancelled

    };

 

-   /**

-    * @throws OseeDataStoreException

-    * @throws

-    */

    public TaskArtifact(ArtifactFactory parentFactory, String guid, String humanReadableId, Branch branch, ArtifactType artifactType) throws OseeDataStoreException {

       super(parentFactory, guid, humanReadableId, branch, artifactType);

    }

@@ -69,8 +65,6 @@ public class TaskArtifact extends StateMachineArtifact implements IWorldViewArti
 

    /**

     * Allow parent SMA's assignees and all privileged users up Team tree

-    * 

-    * @throws OseeCoreException

     */

    @Override

    public Set<User> getPrivilegedUsers() throws OseeCoreException {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
index 4958007586c..90d6ad3a1a7 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/ActionHyperView.java
@@ -171,7 +171,9 @@ public class ActionHyperView extends HyperView implements IPartListener, IAction
                   topAHI.addBottom(teamAHI);

                }

             }

-            topAHI.addBottom(new TasksActionHyperItem(taskArts));

+            if (taskArts.size() > 0) {

+               topAHI.addBottom(new TasksActionHyperItem(taskArts));

+            }

          }

 

          if (activeEditorIsActionEditor()) {

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/TasksActionHyperItem.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/TasksActionHyperItem.java
index 67276da5af3..fa4a67c501b 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/TasksActionHyperItem.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/hyper/TasksActionHyperItem.java
@@ -27,9 +27,6 @@ public class TasksActionHyperItem extends ActionHyperItem {
 

    private final Collection<TaskArtifact> taskArtifacts;

 

-   /**

-    * @param hyperartifact

-    */

    public TasksActionHyperItem(Collection<TaskArtifact> taskArtifacts) {

       super(new TasksHyperViewArtifact(taskArtifacts));

       this.taskArtifacts = taskArtifacts;

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
index 58eb044e6cd..17eea8ce164 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/AtsNavigateViewItems.java
@@ -209,6 +209,7 @@ public class AtsNavigateViewItems extends XNavigateViewItems {
             new SearchNavigateItem(adminItems, new ArtifactTypeWithInheritenceSearchItem("Show all Team Workflows",

                   AtsArtifactTypes.TeamWorkflow));

             new SearchNavigateItem(adminItems, new ArtifactTypeSearchItem("Show all Tasks", "Task"));

+            new CreateGoalTestArtifacts(adminItems);

 

             new DoesNotWorkItemAts(adminItems);

 

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java
new file mode 100644
index 00000000000..6b682813314
--- /dev/null
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/navigate/CreateGoalTestArtifacts.java
@@ -0,0 +1,122 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2007 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.osee.ats.navigate;
+
+import java.util.Arrays;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.osee.ats.AtsImage;
+import org.eclipse.osee.ats.artifact.ActionArtifact;
+import org.eclipse.osee.ats.artifact.ActionableItemArtifact;
+import org.eclipse.osee.ats.artifact.GoalArtifact;
+import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact;
+import org.eclipse.osee.ats.artifact.TaskArtifact;
+import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
+import org.eclipse.osee.ats.util.ActionManager;
+import org.eclipse.osee.ats.util.AtsUtil;
+import org.eclipse.osee.ats.util.AtsPriority.PriorityType;
+import org.eclipse.osee.ats.util.widgets.ReviewManager;
+import org.eclipse.osee.ats.world.WorldEditor;
+import org.eclipse.osee.ats.world.WorldEditorSimpleProvider;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
+import org.eclipse.osee.framework.ui.plugin.util.AWorkbench;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItemAction;
+import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption;
+import org.eclipse.osee.framework.ui.skynet.util.ChangeType;
+import org.eclipse.swt.widgets.Display;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class CreateGoalTestArtifacts extends XNavigateItemAction {
+
+   public CreateGoalTestArtifacts(XNavigateItem parent) {
+      super(parent, "Create Goal Artifacts", AtsImage.GOAL);
+   }
+
+   @Override
+   public void run(TableLoadOption... tableLoadOptions) throws OseeCoreException {
+      if (AtsUtil.isProductionDb()) {
+         AWorkbench.popup("Can't be run on production");
+         return;
+      }
+      if (!MessageDialog.openConfirm(Display.getCurrent().getActiveShell(), getName(), getName())) return;
+      SkynetTransaction transaction = new SkynetTransaction(AtsUtil.getAtsBranch(), getName());
+      GoalArtifact oteGoal = GoalArtifact.createGoal("OTE");
+      GoalArtifact atsGoal = GoalArtifact.createGoal("ATS");
+      GoalArtifact defineGoal = GoalArtifact.createGoal("Define");
+      GoalArtifact msaGoal = GoalArtifact.createGoal("MSA Tools");
+      GoalArtifact cdbGoal = GoalArtifact.createGoal("Integrate CDB signal diff into OSEE");
+      ActionArtifact action =
+            ActionManager.createAction(null, "Fix this model", "Description", ChangeType.Problem,
+                  PriorityType.Priority_2, false, null,
+                  ActionableItemArtifact.getActionableItems(Arrays.asList("OTE_SW")), transaction);
+      action.persist(transaction);
+      oteGoal.addMember(action.getTeamWorkFlowArtifacts().iterator().next());
+      TeamWorkFlowArtifact teamArt = action.getTeamWorkFlowArtifacts().iterator().next();
+      PeerToPeerReviewArtifact peerReviewArt =
+            ReviewManager.createNewPeerToPeerReview(teamArt, "New Review", "Implement", transaction);
+      oteGoal.addMember(peerReviewArt);
+      teamArt.persist(transaction);
+
+      action =
+            ActionManager.createAction(null, "Add CDB Check Signals", "Description", ChangeType.Problem,
+                  PriorityType.Priority_4, false, null, ActionableItemArtifact.getActionableItems(Arrays.asList(
+                        "OTE_SW", "CDB")), transaction);
+      action.persist(transaction);
+      oteGoal.addMember(action.getTeamWorkFlowArtifacts().iterator().next());
+      cdbGoal.addMember(action.getTeamWorkFlowArtifacts().iterator().next());
+      for (TeamWorkFlowArtifact teamArt2 : action.getTeamWorkFlowArtifacts()) {
+         teamArt2.persist(transaction);
+      }
+
+      action =
+            ActionManager.createAction(null, "Remove Workflow button", "Description", ChangeType.Problem,
+                  PriorityType.Priority_4, false, null, ActionableItemArtifact.getActionableItems(Arrays.asList("ATS",
+                        "CDB")), transaction);
+      action.persist(transaction);
+      atsGoal.addMember(action.getTeamWorkFlowArtifacts().iterator().next());
+      cdbGoal.addMember(action.getTeamWorkFlowArtifacts().iterator().next());
+      action.getTeamWorkFlowArtifacts().iterator().next().persist(transaction);
+
+      for (String msaTool : Arrays.asList("TRAX", "REQ", "RCS")) {
+         action =
+               ActionManager.createAction(null, "Fix " + msaTool + " button", "Description", ChangeType.Problem,
+                     PriorityType.Priority_4, false, null,
+                     ActionableItemArtifact.getActionableItems(Arrays.asList(msaTool)), transaction);
+         action.persist(transaction);
+         msaGoal.addMember(action.getTeamWorkFlowArtifacts().iterator().next());
+         teamArt = action.getTeamWorkFlowArtifacts().iterator().next();
+         TaskArtifact taskArt = teamArt.createNewTask("Task 1");
+         oteGoal.addMember(taskArt);
+         taskArt.persist(transaction);
+         taskArt = teamArt.createNewTask("Task 2");
+         msaGoal.addMember(taskArt);
+         taskArt.persist(transaction);
+      }
+
+      action =
+            ActionManager.createAction(null, "Add the Improvement", "Description", ChangeType.Improvement,
+                  PriorityType.Priority_4, false, null,
+                  ActionableItemArtifact.getActionableItems(Arrays.asList("REQ")), transaction);
+      action.persist(transaction);
+      msaGoal.addMember(action);
+      msaGoal.persist(transaction);
+      defineGoal.persist(transaction);
+
+      transaction.execute();
+      WorldEditor.open(new WorldEditorSimpleProvider("Goals", Arrays.asList(oteGoal, atsGoal, defineGoal, msaGoal,
+            cdbGoal)));
+
+   }
+}
diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
index c3169e92bbb..ab16077cc0d 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/AtsUtil.java
@@ -121,6 +121,9 @@ public final class AtsUtil {
     * @return the enableGoal

     */

    public static boolean isGoalEnabled() {

+      if (true) {

+         return false;

+      }

       return false;

    }

 

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 59e5686538a..7137ab051b7 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
@@ -145,6 +145,8 @@ public interface IWorldViewArtifact {
 
    public String getWorldViewGroups() throws OseeCoreException;
 
+   public String getWorldViewGoals() throws OseeCoreException;
+
    public String getWorldViewReviewAuthor() throws OseeCoreException;
 
    public String getWorldViewReviewDecider() throws OseeCoreException;
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 2e5cc92130e..d614855a198 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
@@ -150,6 +150,9 @@ public class WorldLabelProvider extends XViewerLabelProvider {
          if (xCol.equals(WorldXViewerFactory.Groups_Col)) {

             return wva.getWorldViewGroups();

          }

+         if (xCol.equals(WorldXViewerFactory.Goals_Col)) {

+            return wva.getWorldViewGoals();

+         }

          if (xCol.equals(WorldXViewerFactory.Legacy_PCR_Col)) {

             return wva.getWorldViewLegacyPCR();

          }

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 db2545f5563..d298d6d939d 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
@@ -200,6 +200,9 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
    public static final XViewerColumn Groups_Col =

          new XViewerColumn(COLUMN_NAMESPACE + ".groups", "Groups", 100, SWT.LEFT, false, SortDataType.String, true,

                "Groups");

+   public static final XViewerColumn Goals_Col =

+         new XViewerColumn(COLUMN_NAMESPACE + ".goals", "Goals", 100, SWT.LEFT, false, SortDataType.String, true,

+               "Goals");

    public static final XViewerColumn Review_Reviewer_Col =

          new XViewerColumn(COLUMN_NAMESPACE + ".reviewReviewer", "Review Reviewer", 100, SWT.LEFT, false,

                SortDataType.String, false, "Review Reviewer(s)");

@@ -263,9 +266,9 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
          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, Groups_Col, Estimated_Release_Date_Col, Estimated_Completion_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,

+               Resolution_Col, Groups_Col, Goals_Col, Estimated_Release_Date_Col, Estimated_Completion_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,

diff --git a/org.eclipse.osee.ats/support/OseeTypes_ATS.osee b/org.eclipse.osee.ats/support/OseeTypes_ATS.osee
index e8a25246700..a1e204a3ff4 100644
--- a/org.eclipse.osee.ats/support/OseeTypes_ATS.osee
+++ b/org.eclipse.osee.ats/support/OseeTypes_ATS.osee
@@ -105,7 +105,7 @@ abstract artifactType "ats.State Machine" extends "ats.Ats Artifact" {
    attribute "ats.State"

 }

 

-abstract artifactType "Goal" extends "ats.State Machine" {

+artifactType "Goal" extends "ats.State Machine" {

    guid "ABMgU119UjI_Q23Yu+gA"

    attribute "ats.Weekly Benefit"

    attribute "ats.Change Type"