diff options
2 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java index b1dc67dd863..47fcfa51af9 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/artifact/AbstractWorkflowArtifact.java @@ -696,6 +696,10 @@ public abstract class AbstractWorkflowArtifact extends AbstractAtsArtifact imple return getLog().getStateEvent(LogType.StateComplete, state.getPageName()); } + public LogItem getStateCancelledData(IWorkPage state) throws OseeCoreException { + return getLog().getStateEvent(LogType.StateCancelled, state.getPageName()); + } + public LogItem getStateStartedData(IWorkPage state) throws OseeCoreException { return getLog().getStateEvent(LogType.StateEntered, state.getPageName()); } diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java index 4ba1eb1c068..cf74da144fa 100644 --- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java +++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java @@ -355,9 +355,15 @@ public class SMAWorkFlowSection extends SectionPart { sb.append(sma.getStateMgr().getAssigneesStr(80)); } } else { - LogItem item = sma.getStateCompletedData(statePage); - if (item != null) { + LogItem item = null; + if (sma.isCancelled() && sma.getCancelledFromState().equals(statePage.getPageName())) { + item = sma.getStateCancelledData(statePage); + sb.append(" - State Cancelled "); + } else { + item = sma.getStateCompletedData(statePage); sb.append(" - State Completed "); + } + if (item != null) { sb.append(item.getDate(DateUtil.MMDDYYHHMM)); sb.append(" by "); sb.append(item.getUser().getName()); |