-
Notifications
You must be signed in to change notification settings - Fork 354
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
muilpp
merged 9 commits into
master
from
DHIS2-18012-change-log-sort-data-single-entity
Dec 19, 2024
Merged
feat: Sort data elements and event fields as single unit [DHIS2-18012] #19512
muilpp
merged 9 commits into
master
from
DHIS2-18012-change-log-sort-data-single-entity
Dec 19, 2024
+36
−33
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
enricocolasante
approved these changes
Dec 18, 2024
@@ -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 = |
There was a problem hiding this comment.
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
ameenhere
approved these changes
Dec 18, 2024
Quality Gate passedIssues Measures |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.