diff options
author | donald.g.dunne | 2021-11-15 18:19:01 +0000 |
---|---|---|
committer | Donald Dunne | 2021-11-16 20:56:03 +0000 |
commit | 3b6401c5f04ba85b80f48d32d9e8a153928ceada (patch) | |
tree | 3cf7703141a7066da41e9e0c7ad452767090b49e | |
parent | aa81d1b1ec64d5d48ce63a2cb06ff7991f51d112 (diff) | |
download | org.eclipse.osee-3b6401c5f04ba85b80f48d32d9e8a153928ceada.tar.gz org.eclipse.osee-3b6401c5f04ba85b80f48d32d9e8a153928ceada.tar.xz org.eclipse.osee-3b6401c5f04ba85b80f48d32d9e8a153928ceada.zip |
feature[TW19865]: CR - Add column(s) for sibling ATS ids
Change-Id: If63c7d790e5682bb075deb18ef2fd1e67421a75c
5 files changed, 47 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnId.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnId.java index 37dd59df6d9..58f7f1c73a5 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnId.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnId.java @@ -25,6 +25,7 @@ public enum AtsColumnId implements IAtsColumnId { AgileTeamPoints("ats.agileTeam.Points"), Assignees("ats.column.assignees"), AtsId("ats.id"), + SiblingAtsIds("ats.sibling.id"), ChangeType("ats.column.changetype"), CreatedDate("ats.column.createdDate"), CompletedDate("ats.column.completedDate"), diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java index a661c036a87..98ba273594a 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/AtsColumnToken.java @@ -39,6 +39,7 @@ public class AtsColumnToken { public static AtsColumnIdValueColumn AssigneeColumn = new AtsColumnIdValueColumn(AtsColumnId.Assignees, AtsColumnId.Assignees.name(), 100, ColumnAlign.Left.name(), true, ColumnType.String, true, "", true, false); public static AtsColumnIdValueColumn AtsIdColumn = new AtsColumnIdValueColumn(AtsColumnId.AtsId, "ATS Id", 75, ColumnAlign.Left.name(), false, ColumnType.String, false, "ATS ID", false, false); public static AtsColumnIdValueColumn AtsIdColumnShow = new AtsColumnIdValueColumn(AtsColumnId.AtsId, "ATS Id", 75, ColumnAlign.Left.name(), true, ColumnType.String, false, "ATS ID", false, false); + public static AtsColumnIdValueColumn SiblingAtsIdsColumn = new AtsColumnIdValueColumn(AtsColumnId.SiblingAtsIds, "Sibling ATS Ids", 75, ColumnAlign.Left.name(), false, ColumnType.String, false, "ATS ID", false, false); public static AtsColumnIdValueColumn CancelledByColumn = new AtsColumnIdValueColumn(AtsColumnId.CancelledBy, "Cancelled By", 80, ColumnAlign.Left.name(), false, ColumnType.String, false, "User transitioning action to cancelled state.", true, false); public static AtsColumnIdValueColumn CancelledDateColumn = new AtsColumnIdValueColumn(AtsColumnId.CancelledDate, "Cancelled Date", 80, ColumnAlign.Left.name(), false, ColumnType.Date, false, null, true, false); public static AtsColumnIdValueColumn CancelledReason = new AtsColumnIdValueColumn(AtsColumnId.CancelledReason, "Cancelled Reason", 80, ColumnAlign.Left.name(), false, ColumnType.String, false, "Reason for cancelling action.", true, false); diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/SiblingAtsIdColumn.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/SiblingAtsIdColumn.java new file mode 100644 index 00000000000..4e8ef885bed --- /dev/null +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/column/SiblingAtsIdColumn.java @@ -0,0 +1,41 @@ +/********************************************************************* + * Copyright (c) 2021 Boeing + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Boeing - initial API and implementation + **********************************************************************/ + +package org.eclipse.osee.ats.core.column; + +import org.eclipse.osee.ats.api.AtsApi; +import org.eclipse.osee.ats.api.IAtsObject; +import org.eclipse.osee.ats.api.workflow.IAtsTeamWorkflow; + +/** + * @author Donald G. Dunne + */ +public class SiblingAtsIdColumn extends AbstractServicesColumn { + + public SiblingAtsIdColumn(AtsApi atsApi) { + super(atsApi); + } + + @Override + public String getText(IAtsObject atsObject) throws Exception { + String result = ""; + if (atsObject instanceof IAtsTeamWorkflow) { + IAtsTeamWorkflow teamWf = (IAtsTeamWorkflow) atsObject; + for (IAtsTeamWorkflow sibTeamWf : atsApi.getWorkItemService().getSiblings(teamWf)) { + result += sibTeamWf.getAtsId() + ", "; + } + } + return result.replaceFirst(", $", ""); + } + +} diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnService.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnService.java index 4cac54ccde0..d25c7e38302 100644 --- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnService.java +++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/internal/column/ev/AtsColumnService.java @@ -49,6 +49,7 @@ import org.eclipse.osee.ats.core.column.InsertionActivityColumn; import org.eclipse.osee.ats.core.column.InsertionColumn; import org.eclipse.osee.ats.core.column.ParentTitleColumn; import org.eclipse.osee.ats.core.column.PercentCompleteTasksColumn; +import org.eclipse.osee.ats.core.column.SiblingAtsIdColumn; import org.eclipse.osee.ats.core.column.SprintOrderColumn; import org.eclipse.osee.ats.core.column.StateColumn; import org.eclipse.osee.ats.core.column.TargetedVersionColumn; @@ -105,6 +106,8 @@ public class AtsColumnService implements IAtsColumnService { column = new AssigneeColumn(atsApi); } else if (id.equals(AtsColumnId.AtsId.getId())) { column = new AtsIdColumn(atsApi); + } else if (id.equals(AtsColumnId.SiblingAtsIds.getId())) { + column = new SiblingAtsIdColumn(atsApi); } else if (id.equals(AtsColumnId.ActivityId.getId())) { column = new WorkPackageColumn(atsApi.getEarnedValueServiceProvider()); } else if (id.equals(AtsColumnId.Implementers.getId())) { @@ -159,8 +162,6 @@ public class AtsColumnService implements IAtsColumnService { column = new WorkPackageProgramColumn(atsApi.getEarnedValueServiceProvider(), atsApi); } else if (id.equals(AtsColumnId.State.getId())) { column = new StateColumn(atsApi); - } else if (id.equals(AtsColumnId.Id.getId())) { - column = new IdColumn(atsApi); } else if (id.equals(AtsColumnId.Insertion.getId())) { column = new InsertionColumn(atsApi); } else if (id.equals(AtsColumnId.InsertionActivity.getId())) { diff --git a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java index 562cb108013..4ac509cddc1 100644 --- a/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java +++ b/plugins/org.eclipse.osee.ats.ide/src/org/eclipse/osee/ats/ide/world/WorldXViewerFactory.java @@ -177,6 +177,7 @@ public class WorldXViewerFactory extends SkynetXViewerFactory { ParentTopTeamColumnUI.getInstance(), ActionableItemOwner.getInstance(), getColumnServiceColumn(AtsColumnToken.AtsIdColumn), + getColumnServiceColumn(AtsColumnToken.SiblingAtsIdsColumn), AgileFeatureGroupColumn.getInstance(), SprintOrderColumn.getInstance(), RemainingPointsNumericWorkflowColumn.getInstance(), |