Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 9 commits into from
Dec 19, 2024

Conversation

muilpp
Copy link
Contributor

@muilpp muilpp commented Dec 17, 2024

When it comes to sorting event change logs, we need to treat data elements and event fields as a single entity, filtering stays the same.
Sort data elements by form name instead of UID, as that's how the UI shows them.
Still need to take care of translations, I'll do that in a separate ticket.

@muilpp muilpp marked this pull request as ready for review December 18, 2024 15:59
@muilpp muilpp requested a review from a team as a code owner December 18, 2024 15:59
@muilpp muilpp enabled auto-merge (squash) December 18, 2024 15:59
@@ -57,23 +57,21 @@ 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 =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove dataItem word from the code and use change instead

@enricocolasante enricocolasante requested a review from a team December 18, 2024 19:01
@muilpp muilpp requested review from ameenhere and zubaira December 18, 2024 20:33
@muilpp muilpp merged commit 11ce320 into master Dec 19, 2024
16 checks passed
@muilpp muilpp deleted the DHIS2-18012-change-log-sort-data-single-entity branch December 19, 2024 10:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants