bug: Fix state cancelled from not having text in state section
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 b1dc67d..47fcfa5 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 @@
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 4ba1eb1..cf74da1 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 @@
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());
