Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddunne2009-02-19 21:54:06 +0000
committerddunne2009-02-19 21:54:06 +0000
commitbc2ce299849f62ab7b33216e41047228b0cc7949 (patch)
tree7fadf67ac738f4f0d9c10dcf1d328c825d4b6a91
parentb391ed1653129519cd7c08fd52408a6e1bf8165f (diff)
downloadorg.eclipse.osee-bc2ce299849f62ab7b33216e41047228b0cc7949.tar.gz
org.eclipse.osee-bc2ce299849f62ab7b33216e41047228b0cc7949.tar.xz
org.eclipse.osee-bc2ce299849f62ab7b33216e41047228b0cc7949.zip
"Team Workflow" - QQJMK - "Update ATS Workflow types to support multiple programs"
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/ActionArtifact.java18
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/StateMachineArtifact.java4
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/IWorldViewArtifact.java2
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldLabelProvider.java3
-rw-r--r--org.eclipse.osee.ats/src/org/eclipse/osee/ats/world/WorldXViewerFactory.java6
5 files changed, 31 insertions, 2 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 3800b5dbe1b..540a35632a9 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
@@ -11,10 +11,12 @@
package org.eclipse.osee.ats.artifact;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
@@ -1254,4 +1256,20 @@ public class ActionArtifact extends ATSArtifact implements IWorldViewArtifact {
return "";
}
+ @Override
+ public String getWorldViewActionsIntiatingWorkflow() throws OseeCoreException {
+ Date earliestDate = null;
+ for (TeamWorkFlowArtifact team : getTeamWorkFlowArtifacts()) {
+ if (earliestDate == null || team.getSmaMgr().getLog().getCreationDate().before(earliestDate)) {
+ earliestDate = team.getSmaMgr().getLog().getCreationDate();
+ }
+ }
+ List<String> teamNames = new ArrayList<String>();
+ for (TeamWorkFlowArtifact team : getTeamWorkFlowArtifacts()) {
+ if (team.getSmaMgr().getLog().getCreationDate().equals(earliestDate)) {
+ teamNames.add(team.getTeamName());
+ }
+ }
+ return Collections.toString("; ", teamNames);
+ }
}
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 c2d836ceb93..b22ea14a2ea 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
@@ -1353,4 +1353,8 @@ public abstract class StateMachineArtifact extends ATSArtifact implements IWorld
public String getWorldViewNumberOfReviewMinorDefects() throws OseeCoreException {
return "";
}
+
+ public String getWorldViewActionsIntiatingWorkflow() throws OseeCoreException {
+ return getParentActionArtifact().getWorldViewActionsIntiatingWorkflow();
+ }
}
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 132dd3834de..2085f167d06 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
@@ -169,4 +169,6 @@ public interface IWorldViewArtifact {
public String getWorldViewNumberOfReviewMinorDefects() throws OseeCoreException;
+ public String getWorldViewActionsIntiatingWorkflow() 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 cbee3ee0283..da3206150e3 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
@@ -112,7 +112,6 @@ public class WorldLabelProvider extends XViewerLabelProvider {
if (xCol.equals(WorldXViewerFactory.Version_Target_Col)) return wva.getWorldViewTargetedVersionStr();
if (xCol.equals(WorldXViewerFactory.Notes_Col)) return wva.getWorldViewNotes();
- if (xCol.equals(WorldXViewerFactory.Artifact_Type_Col)) return ((Artifact) wva).getArtifactTypeName();
if (xCol.equals(WorldXViewerFactory.Resolution_Col)) return wva.getWorldViewResolution();
if (xCol.equals(WorldXViewerFactory.Groups_Col)) return wva.getWorldViewGroups();
if (xCol.equals(WorldXViewerFactory.Legacy_PCR_Col)) return wva.getWorldViewLegacyPCR();
@@ -165,6 +164,7 @@ public class WorldLabelProvider extends XViewerLabelProvider {
if (xCol.equals(WorldXViewerFactory.Review_Moderator_Col)) return wva.getWorldViewReviewModerator();
if (xCol.equals(WorldXViewerFactory.Review_Reviewer_Col)) return wva.getWorldViewReviewReviewer();
if (xCol.equals(WorldXViewerFactory.Review_Decider_Col)) return wva.getWorldViewReviewDecider();
+ if (xCol.equals(WorldXViewerFactory.Actions_Initiating_Workflow_Col)) return wva.getWorldViewActionsIntiatingWorkflow();
if (xCol.equals(WorldXViewerFactory.Weekly_Benefit_Hrs_Col)) return AtsLib.doubleToStrString(
wva.getWorldViewWeeklyBenefit(), true);
if (xCol.equals(WorldXViewerFactory.Annual_Cost_Avoidance_Col)) {
@@ -177,6 +177,7 @@ public class WorldLabelProvider extends XViewerLabelProvider {
if (result.isFalse()) return result.getText();
return AtsLib.doubleToStrString(wva.getWorldViewManDaysNeeded());
}
+ if (xCol.equals(WorldXViewerFactory.Artifact_Type_Col)) return ((Artifact) wva).getArtifactTypeName();
for (IAtsWorldEditorItem item : AtsWorldEditorItems.getItems()) {
if (item.isXColumnProvider(xCol)) {
String text = item.getColumnText(element, xCol, columnIndex);
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 1d3bd769d73..4d24946b618 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
@@ -239,6 +239,9 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
public static final XViewerColumn Artifact_Type_Col =
new XViewerColumn("ats.column.artType", "Artifact Type", 150, SWT.LEFT, false, SortDataType.String, false,
null);
+ public static final XViewerColumn Actions_Initiating_Workflow_Col =
+ new XViewerColumn("ats.column.initWf", "Action's Initiating Workflow", 150, SWT.LEFT, false,
+ SortDataType.String, false, "This is the first workflow(s) that created the initiation of the Action");
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,
@@ -251,7 +254,8 @@ public class WorldXViewerFactory extends SkynetXViewerFactory {
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, Review_Major_Defects, Review_Minor_Defects, Review_Issues, Artifact_Type_Col};
+ Validation_Required_Col, Review_Major_Defects, Review_Minor_Defects, Review_Issues,
+ Actions_Initiating_Workflow_Col, Artifact_Type_Col};
private static String NAMESPACE = "org.eclipse.osee.ats.WorldXViewer";
public WorldXViewerFactory() {

Back to the top