3 files changed, 63 insertions, 10 deletions

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
index 42144eb72c3..bfb82e53c01 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowSection.java
@@ -191,6 +191,8 @@ public class SMAWorkFlowSection extends SectionPart {
          }

       }

 

+      SMAWorkFlowTab.createStateReviewsFooter(workComp, toolkit, smaMgr, 2, atsWorkPage.getName());

+

       createCurrentPageTransitionLine(workComp, atsWorkPage, toolkit);

 

       return workComp;

@@ -552,17 +554,17 @@ public class SMAWorkFlowSection extends SectionPart {
 

             if (((WorkPageDefinition) transitionToStateCombo.getSelected()).getPageName().equals(

                   DefaultTeamState.Cancelled.name())) {

-               AWorkbench.popup("ERROR",

+               AWorkbench.popup("Transition Blocked",

                      "Working Branch exists.\n\nPlease delete working branch before transition to cancel.");

                return;

             }

             if (smaMgr.getBranchMgr().isBranchInCommit()) {

-               AWorkbench.popup("ERROR",

+               AWorkbench.popup("Transition Blocked",

                      "Working Branch is being Committed.\n\nPlease wait till commit completes to transition.");

                return;

             }

             if (!atsWorkPage.isAllowTransitionWithWorkingBranch()) {

-               AWorkbench.popup("ERROR",

+               AWorkbench.popup("Transition Blocked",

                      "Working Branch exists.\n\nPlease commit or delete working branch before transition.");

                return;

             }

@@ -599,7 +601,7 @@ public class SMAWorkFlowSection extends SectionPart {
          if (smaMgr.getStateMgr().getAssignees().contains(UserManager.getUser(SystemUser.OseeSystem)) || smaMgr.getStateMgr().getAssignees().contains(

                UserManager.getUser(SystemUser.Guest)) || smaMgr.getStateMgr().getAssignees().contains(

                UserManager.getUser(SystemUser.UnAssigned))) {

-            AWorkbench.popup("ERROR",

+            AWorkbench.popup("Transition Blocked",

                   "Can not transition with \"Guest\", \"UnAssigned\" or \"OseeSystem\" user as assignee.");

             return;

          }

@@ -626,7 +628,7 @@ public class SMAWorkFlowSection extends SectionPart {
                for (TaskArtifact taskArt : smaMgr.getTaskMgr().getTaskArtifactsFromCurrentState()) {

                   if (taskArt.isInWork()) {

                      AWorkbench.popup(

-                           "Error",

+                           "Transition Blocked",

                            "Task Not Complete\n\nTitle: " + taskArt.getDescriptiveName() + "\n\nHRID: " + taskArt.getHumanReadableId());

                      return;

                   }

@@ -637,7 +639,7 @@ public class SMAWorkFlowSection extends SectionPart {
             if (smaMgr.teamDefHasWorkRule(AtsWorkDefinitions.RuleWorkItemId.atsRequireTargetedVersion.name()) || smaMgr.getWorkPageDefinition().hasWorkRule(

                   AtsWorkDefinitions.RuleWorkItemId.atsRequireTargetedVersion.name())) {

                if (smaMgr.getSma().getWorldViewTargetedVersion() == null && !toWorkPageDefinition.isCancelledPage()) {

-                  AWorkbench.popup("Error",

+                  AWorkbench.popup("Transition Blocked",

                         "Actions must be targeted for a Version.\nPlease set \"Target Version\" before transition.");

                   return;

                }

@@ -646,9 +648,7 @@ public class SMAWorkFlowSection extends SectionPart {
             // Loop through this state's blocking reviews to confirm complete

             for (ReviewSMArtifact reviewArt : smaMgr.getReviewManager().getReviewsFromCurrentState()) {

                if (reviewArt.getReviewBlockType() == ReviewBlockType.Transition && !reviewArt.getSmaMgr().isCancelledOrCompleted()) {

-                  AWorkbench.popup(

-                        "Error",

-                        "Blocking Review must be completed before transition.\n\nReview Title: \"" + reviewArt.getDescriptiveName() + "\"\nHRID: " + reviewArt.getHumanReadableId());

+                  AWorkbench.popup("Transition Blocked", "All Blocking Reviews must be completed before transition.");

                   return;

                }

             }

diff --git a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
index 604db3563ce..cb1feb4c62a 100644
--- a/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
+++ b/org.eclipse.osee.ats/src/org/eclipse/osee/ats/editor/SMAWorkFlowTab.java
@@ -23,6 +23,7 @@ import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.osee.ats.AtsPlugin;
 import org.eclipse.osee.ats.artifact.ATSAttributes;
 import org.eclipse.osee.ats.artifact.NoteItem;
+import org.eclipse.osee.ats.artifact.ReviewSMArtifact;
 import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact;
 import org.eclipse.osee.ats.editor.service.ServicesArea;
 import org.eclipse.osee.ats.util.AtsLib;
@@ -34,6 +35,7 @@ import org.eclipse.osee.framework.jdk.core.util.AHTML;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
 import org.eclipse.osee.framework.logging.OseeLevel;
 import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.skynet.core.artifact.annotation.ArtifactAnnotation;
 import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
 import org.eclipse.osee.framework.ui.plugin.util.Displays;
 import org.eclipse.osee.framework.ui.plugin.util.Result;
@@ -508,6 +510,21 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
       }
    }
 
+   public static void createStateReviewsFooter(Composite comp, XFormToolkit toolkit, SMAManager smaMgr, int horizontalSpan, String forStateName) throws OseeCoreException {
+      (new Label(comp, SWT.NONE)).setText("\"" + smaMgr.getStateMgr().getCurrentStateName() + "\" State Reviews: ");
+
+      Composite workComp = toolkit.createContainer(comp, 1);
+      workComp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING));
+      GridData gd = new GridData();
+      gd.horizontalIndent = 20;
+      workComp.setLayoutData(gd);
+
+      // workComp.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_GREEN));
+      for (ReviewSMArtifact revArt : smaMgr.getReviewManager().getReviews(forStateName)) {
+         createReviewHyperlink(workComp, toolkit, horizontalSpan, revArt);
+      }
+   }
+
    private static void createLabelOrHyperlink(Composite comp, XFormToolkit toolkit, final int horizontalSpan, final String str, boolean onlyState) {
       if (str.length() > 150) {
          Hyperlink label = toolkit.createHyperlink(comp, Strings.truncate(str, 150) + "...", SWT.NONE);
@@ -533,6 +550,42 @@ public class SMAWorkFlowTab extends FormPage implements IActionable {
       }
    }
 
+   private static void createReviewHyperlink(Composite comp, XFormToolkit toolkit, final int horizontalSpan, final ReviewSMArtifact revArt) throws OseeCoreException {
+
+      Composite workComp = toolkit.createContainer(comp, 1);
+      workComp.setLayoutData(new GridData(GridData.FILL_BOTH | GridData.VERTICAL_ALIGN_BEGINNING));
+      workComp.setLayout(ALayout.getZeroMarginLayout(3, false));
+
+      Label imageLabel = new Label(workComp, SWT.NONE);
+      Label strLabel = new Label(workComp, SWT.NONE);
+      if (revArt.isBlocking() && !revArt.getSmaMgr().isCancelledOrCompleted()) {
+         imageLabel.setImage(ArtifactAnnotation.Type.Error.getImage());
+         strLabel.setText("Blocking [" + revArt.getArtifactTypeName() + "] must be completed: ");
+         strLabel.setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+      } else if (!revArt.getSmaMgr().isCancelledOrCompleted()) {
+         imageLabel.setImage(ArtifactAnnotation.Type.Warning.getImage());
+         strLabel.setText("Open [" + revArt.getArtifactTypeName() + "] exists: ");
+      } else {
+         strLabel.setText(revArt.getSmaMgr().getStateMgr().getCurrentStateName() + " [" + revArt.getArtifactTypeName() + "] exists: ");
+      }
+
+      String str = "[" + revArt.getDescriptiveName() + "]";
+      Hyperlink hyperLabel =
+            toolkit.createHyperlink(workComp, ((str.length() > 300) ? Strings.truncate(str, 300) + "..." : str),
+                  SWT.NONE);
+      hyperLabel.setToolTipText("select to open review");
+      hyperLabel.addListener(SWT.MouseUp, new Listener() {
+         /*
+          * (non-Javadoc)
+          * 
+          * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
+          */
+         public void handleEvent(Event event) {
+            SMAEditor.editArtifact(revArt);
+         }
+      });
+   }
+
    private void createOriginatorHeader(Composite comp, XFormToolkit toolkit) throws OseeCoreException {
       if (!smaMgr.isCancelled() && !smaMgr.isCompleted()) {
          toolkit.createLabel(comp, "     ");
diff --git a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/annotation/ArtifactAnnotation.java b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/annotation/ArtifactAnnotation.java
index d084f63d5c8..ec259cda3a7 100644
--- a/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/annotation/ArtifactAnnotation.java
+++ b/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/artifact/annotation/ArtifactAnnotation.java
@@ -23,7 +23,7 @@ public class ArtifactAnnotation {
    private Type type;
    private String namespace;
    private String content;
-   public enum Type {
+   public static enum Type {
       None(null, null),
       Info("info2.gif", null),
       Warning("warn.gif", "alert_8_8.gif"),