feat: Sort data elements and event fields as single unit [DHIS2-18012]

dhis2 · Dec 18, 2024 · d4c9da3 · d4c9da3
1 parent 86919cc
commit d4c9da3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...racker/src/main/java/org/hisp/dhis/tracker/export/event/HibernateEventChangeLogStore.java b/...racker/src/main/java/org/hisp/dhis/tracker/export/event/HibernateEventChangeLogStore.java
@@ -57,7 +57,7 @@ public class HibernateEventChangeLogStore {
   private static final String COLUMN_CHANGELOG_USER = "ecl.createdByUsername";
   private static final String COLUMN_CHANGELOG_DATA_ELEMENT = "d.uid";
   private static final String COLUMN_CHANGELOG_FIELD = "ecl.eventField";
-  private static final String ORDER_DATA_ITEM_EXPRESSION =
+  private static final String ORDER_CHANGE_EXPRESSION =
       "CONCAT(COALESCE(d.formname, ''), COALESCE(" + COLUMN_CHANGELOG_FIELD + ", ''))";
   private static final String DEFAULT_ORDER =
       COLUMN_CHANGELOG_CREATED + " " + SortDirection.DESC.getValue();
@@ -71,7 +71,7 @@ public class HibernateEventChangeLogStore {
       Map.ofEntries(
           entry("createdAt", COLUMN_CHANGELOG_CREATED),
           entry("username", COLUMN_CHANGELOG_USER),
-          entry("change", ORDER_DATA_ITEM_EXPRESSION));
+          entry("change", ORDER_CHANGE_EXPRESSION));
 
   private static final Map<Pair<String, Class<?>>, String> FILTERABLE_FIELDS =
       Map.ofEntries(