Skip to content

sorting issue fix in survey token page #13355

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.

Sign up for GitHub

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

Merged
KarnaiahPesula merged 1 commit into from
May 5, 2025
Merged

sorting issue fix in survey token page #13355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions sormas-backend/src/main/java/de/symeda/sormas/backend/survey/SurveyTokenFacadeEjb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public List<SurveyTokenIndexDto> getIndexList(SurveyTokenCriteria criteria, Inte
joins.getGeneratedDocument().get(Document.MIME_TYPE),
root.get(SurveyToken.RESPONSE_RECEIVED_DATE)),
// add sort properties to select
sortBy(sortProperties, root, cb, cq).stream())
sortBy(sortProperties, root, cb, cq, joins).stream())
.collect(Collectors.toList()));

Predicate filter = CriteriaBuilderHelper.and(cb, surveyTokenService.buildCriteriaFilter(criteria, cb, root, joins));
Expand Down Expand Up @@ -222,7 +222,7 @@ private String getImportTemplateFileName(String baseFilename) {
return instanceName + "_" + baseFilename;
}

private List<Selection<?>> sortBy(List<SortProperty> sortProperties, Root<SurveyToken> root, CriteriaBuilder cb, CriteriaQuery<?> cq) {
private List<Selection<?>> sortBy(List<SortProperty> sortProperties, Root<SurveyToken> root, CriteriaBuilder cb, CriteriaQuery<?> cq, SurveyTokenJoins joins) {

List<Selection<?>> selections = new ArrayList<>();

Expand All @@ -234,8 +234,15 @@ private List<Selection<?>> sortBy(List<SortProperty> sortProperties, Root<Survey
switch (sortProperty.propertyName) {
case Survey.UUID:
case Survey.DISEASE:
case SurveyToken.TOKEN:
case SurveyToken.ASSIGNMENT_DATE:
case SurveyToken.RESPONSE_RECEIVED:
case SurveyToken.RESPONSE_RECEIVED_DATE:
orderList = orderBuilder.build(root.get(sortProperty.propertyName));
break;
case SurveyTokenIndexDto.ASSIGNED_CASE_UUID:
orderList = orderBuilder.build(joins.getCaseAssignedTo().get(Case.UUID));
break;
case Survey.NAME:
orderList = orderBuilder.build(cb.lower(root.get(sortProperty.propertyName)));
break;
Expand Down