Skip to content

Further fixes for system configuration UI and reverted IPI follow-up … #13650

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
raulbob merged 1 commit into from
Nov 10, 2025
Merged

Further fixes for system configuration UI and reverted IPI follow-up … #13650

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sormas-api/src/main/java/de/symeda/sormas/api/Disease.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public enum Disease
POST_IMMUNIZATION_ADVERSE_EVENTS_MILD(true, false, false, true, false, 0, true, false, false),
POST_IMMUNIZATION_ADVERSE_EVENTS_SEVERE(true, false, false, true, false, 0, true, false, false),
FHA(true, false, false, true, false, 0, true, false, false),
INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false),
INVASIVE_PNEUMOCOCCAL_INFECTION(true, true, true, false, false, 0, false, false, false),
INVASIVE_MENINGOCOCCAL_INFECTION(true, true, true, false, true, 7, false, false, false),
GIARDIASIS(true, true, true, false, true, 14, false, false, false),
CRYPTOSPORIDIOSIS(true, true, true, false, true, 14, false, false, false),
Expand Down
14 changes: 7 additions & 7 deletions .../main/java/de/symeda/sormas/api/systemconfiguration/SystemConfigurationValueIndexDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ public class SystemConfigurationValueIndexDto extends EntityDto {
public static final String VALUE_PROPERTY_NAME = "value";
public static final String DESCRIPTION_PROPERTY_NAME = "description";
public static final String ENCRYPTED_PROPERTY_NAME = "encrypted";
public static final String CATEGORY_NAME_PROPERTY_NAME = "categoryName";
public static final String CATEGORY_NAME_PROPERTY_NAME = "category";
public static final String CATEGORY_CAPTION_PROPERTY_NAME = "categoryCaption";
public static final String CATEGORY_DESCRIPTION_PROPERTY_NAME = "categoryDescription";

private String value;
private String key;
private String description;
private boolean encrypted;
private String categoryName;
private String category;
private String categoryCaption;
private String categoryDescription;

Expand Down Expand Up @@ -123,18 +123,18 @@ public void setDescription(String description) {
*
* @return the category name
*/
public String getCategoryName() {
return categoryName;
public String getCategory() {
return category;
}

/**
* Sets the category name of the configuration.
*
* @param categoryName
* @param category
* the category name to set
*/
public void setCategoryName(String categoryName) {
this.categoryName = categoryName;
public void setCategory(String category) {
this.category = category;
}

/**
Expand Down
5 changes: 4 additions & 1 deletion ...c/main/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueEjb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,9 @@ public List<SystemConfigurationValueIndexDto> getIndexList(
final List<Order> order = sortProperties.stream().map(sortProperty -> {
final Expression<?> expression;
switch (sortProperty.propertyName) {
case SystemConfigurationValue.CATEGORY_FIELD_NAME:
expression = root.get(sortProperty.propertyName);
break;
case SystemConfigurationValue.KEY_FIELD_NAME:
expression = cb.lower(root.get(sortProperty.propertyName));
break;
Expand Down Expand Up @@ -524,7 +527,7 @@ private SystemConfigurationValueIndexDto toIndexDto(final SystemConfigurationVal
dto.setKey(entity.getKey());
dto.setDescription(entity.getDescription());
dto.setEncrypted(entity.getEncrypt()); // encrypt needed for list view
dto.setCategoryName(entity.getCategory() != null ? entity.getCategory().getName() : null);
dto.setCategory(entity.getCategory() != null ? entity.getCategory().getName() : null);
dto.setCategoryCaption(entity.getCategory() != null ? entity.getCategory().getCaption() : null);
dto.setCategoryDescription(entity.getCategory() != null ? entity.getCategory().getDescription() : null);

Expand Down
Loading