bug[ats_ATS366535]: Fix Quick Search results 2 date columns not sorted correctly

Change-Id: I3bc35c02f2ce94227cc9097a6a845b3b56cd883f
Signed-off-by: Dominic Guss <Dominic.Guss@boeing.com>

4 files changed, 19 insertions, 9 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 18ab45d32c2..d99e125ac38 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
@@ -40,6 +40,7 @@ public enum AtsColumnId implements IAtsColumnId {
    PercentCompleteTasks("ats.column.taskPercentComplete"),
    Points("ats.column.points"),
    Priority("ats.column.priority"),
+   ReleaseDate("ats.column.releaseDate"),
    State("ats.column.state"),
    SprintOrder("ats.column.sprintOrder"),
    TaskToRelatedArtifactType("ats.column.taskToRelArtType"),
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 6ebba1d0672..40c2c293bfc 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
@@ -81,9 +81,9 @@ public class AtsColumnToken {
       AtsColumnId.CompletedCancelledBy, "Completed or Cancelled By", 80, ColumnAlign.Left.name(), false,
       ColumnType.String, false, "User transitioning action to completed or cancelled state.", true, false);
    public static AtsColumnIdValueColumn CancelledDateColumn = new AtsColumnIdValueColumn(AtsColumnId.CancelledDate,
-      "Cancelled Date", 80, ColumnAlign.Center.name(), false, ColumnType.Date, false, null, true, false);
+      "Cancelled Date", 80, ColumnAlign.Left.name(), false, ColumnType.Date, false, null, true, false);
    public static AtsColumnIdValueColumn CompletedDateColumn = new AtsColumnIdValueColumn(AtsColumnId.CompletedDate,
-      "Completed Date", 80, ColumnAlign.Center.name(), false, ColumnType.Date, false, null, true, false);
+      "Completed Date", 80, ColumnAlign.Left.name(), false, ColumnType.Date, false, null, true, false);
 
    /**
     * Attribute Value columns. These are backed directly by an attribute with the possible ability to change with edit
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java
index 9f9a1e1118c..c1d91ce5b0b 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/column/ReleaseDateColumn.java
@@ -13,7 +13,7 @@ package org.eclipse.osee.ats.column;
 import java.util.Date;
 import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
 import org.eclipse.osee.ats.api.data.AtsAttributeTypes;
-import org.eclipse.osee.ats.world.WorldXViewerFactory;
+import org.eclipse.osee.ats.core.column.AtsColumnId;
 
 /**
  * @author Donald G. Dunne
@@ -27,7 +27,7 @@ public class ReleaseDateColumn extends AbstractWorkflowVersionDateColumn {
    }
 
    private ReleaseDateColumn() {
-      super(WorldXViewerFactory.COLUMN_NAMESPACE + ".releaseDate", AtsAttributeTypes.ReleaseDate);
+      super(AtsColumnId.ReleaseDate.getId(), AtsAttributeTypes.ReleaseDate);
    }
 
    /**
diff --git a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java
index f9641114bd5..44d4523a0c6 100644
--- a/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java
+++ b/plugins/org.eclipse.osee.ats/src/org/eclipse/osee/ats/util/xviewer/column/XViewerAtsColumn.java
@@ -20,6 +20,8 @@ import org.eclipse.nebula.widgets.xviewer.core.model.SortDataType;
 import org.eclipse.nebula.widgets.xviewer.core.model.XViewerAlign;
 import org.eclipse.nebula.widgets.xviewer.core.model.XViewerColumn;
 import org.eclipse.osee.ats.api.util.ColorColumn;
+import org.eclipse.osee.ats.column.CancelledDateColumnUI;
+import org.eclipse.osee.ats.column.CompletedDateColumnUI;
 import org.eclipse.osee.ats.column.CreatedDateColumnUI;
 import org.eclipse.osee.ats.column.IPersistAltLeftClickProvider;
 import org.eclipse.osee.ats.column.ReleaseDateColumn;
@@ -116,12 +118,19 @@ public abstract class XViewerAtsColumn extends XViewerColumn {
     * Returns the backing data object for operations like sorting
     */
    public Object getBackingData(Object element, XViewerColumn xCol, int columnIndex) throws Exception {
-      if (xCol.getId().equals(AtsColumnId.CreatedDate.getId())) {
-         return CreatedDateColumnUI.getInstance().getBackingData(element, xCol, columnIndex);
-      } else if (xCol.getId().equals(ReleaseDateColumn.getInstance().getId())) {
-         return ReleaseDateColumn.getInstance().getBackingData(element, xCol, columnIndex);
+      XViewerAtsColumn xViewerAtsColumn;
+      if (xCol.equals(AtsColumnId.CreatedDate.getId())) {
+         xViewerAtsColumn = CreatedDateColumnUI.getInstance();
+      } else if (xCol.equals(AtsColumnId.ReleaseDate.getId())) {
+         xViewerAtsColumn = ReleaseDateColumn.getInstance();
+      } else if (xCol.equals(AtsColumnId.CompletedDate.getId())) {
+         xViewerAtsColumn = CompletedDateColumnUI.getInstance();
+      } else if (xCol.equals(AtsColumnId.CancelledDate.getId())) {
+         xViewerAtsColumn = CancelledDateColumnUI.getInstance();
+      } else {
+         return null;
       }
-      return null;
+      return xViewerAtsColumn.getBackingData(element, xCol, columnIndex);
    }
 
    private Color getColor(Object element, boolean background, int columnIndex) {