Merge pull request #14137 from SORMAS-Foundation/Q2-2026-release-bugfixes

obinna-h-n · web-flow · commit 0477813761a6 · 2026-07-02T13:34:04.000+01:00
Q2 2026 release bugfixes
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/person/PersonDto.java
@@ -290,6 +290,7 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 		Disease.POLIO,
 		Disease.UNSPECIFIED_VHF,
 		Disease.CORONAVIRUS,
+		Disease.PERTUSSIS,
 		Disease.UNDEFINED,
 		Disease.OTHER })
 	private DeathPlaceType deathPlaceType;
@@ -300,6 +301,7 @@ public class PersonDto extends PseudonymizableDto implements IsPerson {
 		Disease.POLIO,
 		Disease.UNSPECIFIED_VHF,
 		Disease.CORONAVIRUS,
+		Disease.PERTUSSIS,
 		Disease.UNDEFINED,
 		Disease.OTHER })
 	@SensitiveData
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java b/sormas-api/src/main/java/de/symeda/sormas/api/symptoms/SymptomsDto.java
@@ -805,7 +805,8 @@ public static SymptomsDto build() {
 	@SymptomGrouping(SymptomGroup.OTHER)
 	private SymptomState eyesBleeding;
 
-	@Diseases({})
+	@Diseases({
+		SALMONELLOSIS })
 	@HideForCountriesExcept(countries = {
 		CountryHelper.COUNTRY_CODE_LUXEMBOURG })
 	@SymptomGrouping(SymptomGroup.OTHER)
@@ -1936,6 +1937,7 @@ public static SymptomsDto build() {
 		GIARDIASIS,
 		CRYPTOSPORIDIOSIS,
 		MALARIA,
+		SALMONELLOSIS,
 		SHIGELLOSIS,
 		UNDEFINED,
 		OTHER })
diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -2972,7 +2972,7 @@ Symptoms.meningealSigns=Meningeal Signs
 Symptoms.meningoencephalitis=Meningoencephalitis
 Symptoms.microcephaly=Microcephaly
 Symptoms.midUpperArmCircumference=Mid-upper arm circumf. (cm)
-Symptoms.musclePain=Muscle pain
+Symptoms.musclePain=Myalgia
 Symptoms.nausea=Nausea
 Symptoms.neckStiffness=Stiff neck
 Symptoms.noseBleeding=Nose bleed (epistaxis)
diff --git a/sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserRole.java b/sormas-backend/src/main/java/de/symeda/sormas/backend/user/UserRole.java
@@ -181,6 +181,7 @@ public void setLinkedDefaultUserRole(DefaultUserRole linkedDefaultUserRole) {
 	}
 
 	@ElementCollection(fetch = FetchType.LAZY)
+	@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 	@Enumerated(EnumType.STRING)
 	@CollectionTable(name = TABLE_NAME_EMAIL_NOTIFICATIONS,
 		joinColumns = @JoinColumn(name = "userrole_id", referencedColumnName = UserRole.ID, nullable = false),
@@ -197,6 +198,7 @@ public void setEmailNotificationTypes(Set<NotificationType> emailNotifications)
 	}
 
 	@ElementCollection(fetch = FetchType.LAZY)
+	@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 	@Enumerated(EnumType.STRING)
 	@CollectionTable(name = TABLE_NAME_SMS_NOTIFICATIONS,
 		joinColumns = @JoinColumn(name = "userrole_id", referencedColumnName = UserRole.ID, nullable = false),
diff --git a/sormas-base/setup/demologinmain.html b/sormas-base/setup/demologinmain.html
@@ -28,7 +28,7 @@ <h2 style="color: #CCC">Click on any default user login button to access the SOR
 	
 	var demoUsers = [
 		{id: "logInAsSurveillanceSupervisor", name: "Surveillance Supervisor", user: "SurvSup", pass: "SurvSup"},
-		{id: "logInAsCaseSupervisor", name: "Clinician", user: "CaseSup", pass: "CaseSup"},
+		{id: "logInAsCaseSupervisor", name: "Case Supervisor", user: "CaseSup", pass: "CaseSup"},
 		{id: "logInAsContactSupervisor", name: "Contact Supervisor", user: "ContSup", pass: "ContSup"},
 		{id: "logInAsPOESupervisor", name: "POE Supervisor", user: "PoeSup", pass: "PoeSup"},
 		{id: "logInAsLabUser", name: "Lab Officer", user: "LabOff", pass: "LabOff"},
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseSymptomsView.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/caze/CaseSymptomsView.java
@@ -17,6 +17,7 @@
  *******************************************************************************/
 package de.symeda.sormas.ui.caze;
 
+import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.ui.ControllerProvider;
@@ -48,13 +49,19 @@ protected void initView(String params) {
 		container.setEnabled(true);
 
 		CaseDataDto caseDataDto = FacadeProvider.getCaseFacade().getByUuid(getCaseRef().getUuid());
-		CaseSymptomSideViewComponent symptomSideViewComponent = new CaseSymptomSideViewComponent(caseDataDto.getDisease());
+
+		// #14029: the Complications side panel is not relevant for Tuberculosis; keep the layout but leave the side empty
+		boolean showComplications = caseDataDto.getDisease() != Disease.TUBERCULOSIS;
+		CaseSymptomSideViewComponent symptomSideViewComponent =
+			showComplications ? new CaseSymptomSideViewComponent(caseDataDto.getDisease()) : null;
 		caseSymptomsComponent =
 			ControllerProvider.getCaseController().getSymptomsEditComponent(getCaseRef().getUuid(), getViewMode(), symptomSideViewComponent);
 		LayoutWithSidePanel layout = new LayoutWithSidePanel(caseSymptomsComponent, COMPLICATIONS_LOC);
 		container.addComponent(layout);
-		layout.addSidePanelComponent(symptomSideViewComponent, COMPLICATIONS_LOC);
-		symptomSideViewComponent.addStyleNames(CssStyles.SIDE_COMPONENT);
+		if (showComplications) {
+			layout.addSidePanelComponent(symptomSideViewComponent, COMPLICATIONS_LOC);
+			symptomSideViewComponent.addStyleNames(CssStyles.SIDE_COMPONENT);
+		}
 
 		setSubComponent(container);
 		setEditPermission(caseSymptomsComponent);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/clinicalcourse/HealthConditionsForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/clinicalcourse/HealthConditionsForm.java
@@ -247,6 +247,7 @@ protected void addFields() {
 
 				// compliance with treatment combobox
 				ComboBox complianceWithTreatmentCB = addField(complianceTreatmentLayout, COMPLIANCE_WITH_TREATMENT, ComboBox.class);
+				complianceWithTreatmentCB.setCaption(null);
 				complianceWithTreatmentCB.setId(COMPLIANCE_WITH_TREATMENT);
 				complianceWithTreatmentCB.addItems(ComplianceWithTreatment.values());
 				complianceTreatmentLayout.addComponent(complianceWithTreatmentCB, COMPLIANCE_WITH_TREATMENT);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/customizablefield/CustomizableFieldsController.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/customizablefield/CustomizableFieldsController.java
@@ -98,7 +98,7 @@ public void cloneField(CustomizableFieldMetadataDto sourceDto) {
 
         TextField nameField =
             new TextField(I18nProperties.getPrefixCaption(CustomizableFieldMetadataDto.I18N_PREFIX, CustomizableFieldMetadataDto.NAME));
-        nameField.setWidth(280, com.vaadin.server.Sizeable.Unit.PIXELS);
+        nameField.setWidth(100, com.vaadin.server.Sizeable.Unit.PERCENTAGE);
         nameField.setRequiredIndicatorVisible(true);
 
         VerticalLayout content = new VerticalLayout();
@@ -111,6 +111,7 @@ public void cloneField(CustomizableFieldMetadataDto sourceDto) {
             content,
             I18nProperties.getCaption(Captions.actionClone),
             I18nProperties.getCaption(Captions.actionCancel),
+            480,
             result -> {
                 if (Boolean.TRUE.equals(result)) {
                     String newName = nameField.getValue();
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/customizablefield/CustomizableFieldsGrid.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/configuration/customizablefield/CustomizableFieldsGrid.java
@@ -77,11 +77,12 @@ public CustomizableFieldsGrid(CustomizableFieldMetadataCriteria criteria) {
             .setSortable(false)
             .setWidth(40);
 
-        addItemClickListener(new ShowDetailsListener<>(CLONE_COLUMN_ID, e -> ControllerProvider.getCustomizableFieldsController().cloneField(e)));
         addItemClickListener(
-            new ShowDetailsListener<>(TOGGLE_ACTIVE_COLUMN_ID, e -> ControllerProvider.getCustomizableFieldsController().toggleActive(e)));
+            new ShowDetailsListener<>(CLONE_COLUMN_ID, false, e -> ControllerProvider.getCustomizableFieldsController().cloneField(e)));
         addItemClickListener(
-            new ShowDetailsListener<>(DELETE_COLUMN_ID, e -> ControllerProvider.getCustomizableFieldsController().deleteField(e.getUuid(), this)));
+            new ShowDetailsListener<>(TOGGLE_ACTIVE_COLUMN_ID, false, e -> ControllerProvider.getCustomizableFieldsController().toggleActive(e)));
+        addItemClickListener(
+            new ShowDetailsListener<>(DELETE_COLUMN_ID, false, e -> ControllerProvider.getCustomizableFieldsController().deleteField(e.getUuid(), this)));
 
         for (Column<?, ?> column : getColumns()) {
             column.setCaption(I18nProperties.getPrefixCaption(CustomizableFieldMetadataDto.I18N_PREFIX, column.getId(), column.getCaption()));
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/contact/ContactCreateForm.java
@@ -51,7 +51,9 @@
 import de.symeda.sormas.api.infrastructure.district.DistrictReferenceDto;
 import de.symeda.sormas.api.infrastructure.region.RegionReferenceDto;
 import de.symeda.sormas.api.person.PersonDto;
+import de.symeda.sormas.api.therapy.Drug;
 import de.symeda.sormas.api.utils.DataHelper;
+import de.symeda.sormas.api.utils.Diseases;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.ui.ControllerProvider;
 import de.symeda.sormas.ui.UiUtil;
@@ -74,6 +76,7 @@ public class ContactCreateForm extends AbstractEditForm<ContactDto> {
 	private static final String CHOOSE_CASE_LOC = "chooseCaseLoc";
 	private static final String REMOVE_CASE_LOC = "removeCaseLoc";
 	private static final String ADOPT_ADDRESS_LOC = "adoptAddressLoc";
+	private static final String PROPHYLAXIS_LOC = "prophylaxisLoc";
 
 	//@formatter:off
 	private static final String HTML_LAYOUT =
@@ -97,7 +100,9 @@ public class ContactCreateForm extends AbstractEditForm<ContactDto> {
 					LayoutUtil.fluidRowLocs(ContactDto.RELATION_TO_CASE) +
 					LayoutUtil.fluidRowLocs(ADOPT_ADDRESS_LOC) +
 					LayoutUtil.fluidRowLocs(ContactDto.RELATION_DESCRIPTION) +
-					LayoutUtil.fluidRowLocs(ContactDto.DESCRIPTION);
+					LayoutUtil.fluidRowLocs(ContactDto.DESCRIPTION) +
+						LayoutUtil.loc(PROPHYLAXIS_LOC) +
+						LayoutUtil.fluidRowLocs(4, ContactDto.PROPHYLAXIS_PRESCRIBED, 4, ContactDto.PRESCRIBED_DRUG, 4, ContactDto.PRESCRIBED_DRUG_TEXT);
 	//@formatter:on
 
 	private OptionGroup contactProximities;
@@ -109,6 +114,7 @@ public class ContactCreateForm extends AbstractEditForm<ContactDto> {
 	private TextField contactProximityDetails;
 
 	private PersonCreateForm personCreateForm;
+	private Label prophylaxisLabel;
 
 	DateField reportDate;
 	CheckBox multiDayContact;
@@ -234,6 +240,17 @@ protected void addFields() {
 		addField(ContactDto.CASE_ID_EXTERNAL_SYSTEM, TextField.class);
 		addField(ContactDto.CASE_OR_EVENT_INFORMATION, TextArea.class).setRows(4);
 
+		// Prophylaxis details for IMI (Luxembourg only) - mirrors ContactDataForm
+		prophylaxisLabel = new Label(I18nProperties.getString(Strings.headingProphylaxisLoc));
+		prophylaxisLabel.addStyleName(CssStyles.H3);
+		getContent().addComponent(prophylaxisLabel, PROPHYLAXIS_LOC);
+		prophylaxisLabel.setVisible(Disease.INVASIVE_MENINGOCOCCAL_INFECTION == disease);
+
+		CheckBox prophylaxisPrescribed = addField(ContactDto.PROPHYLAXIS_PRESCRIBED, CheckBox.class);
+		prophylaxisPrescribed.setCaption(I18nProperties.getCaption(Captions.Contact_prophylaxisPrescribed));
+		addField(ContactDto.PRESCRIBED_DRUG, ComboBox.class);
+		addField(ContactDto.PRESCRIBED_DRUG_TEXT, TextField.class);
+
 		initializeVisibilitiesAndAllowedVisibilities();
 
 		region.addValueChangeListener(e -> {
@@ -259,14 +276,35 @@ protected void addFields() {
 		FieldHelper.setVisibleWhen(getFieldGroup(), ContactDto.DISEASE_DETAILS, ContactDto.DISEASE, Arrays.asList(Disease.OTHER), true);
 		FieldHelper.setRequiredWhen(getFieldGroup(), ContactDto.DISEASE, Arrays.asList(ContactDto.DISEASE_DETAILS), Arrays.asList(Disease.OTHER));
 
+		FieldHelper.setVisibleWhen(
+			getFieldGroup(),
+			ContactDto.PRESCRIBED_DRUG,
+			ContactDto.PROPHYLAXIS_PRESCRIBED,
+			Collections.singletonList(Boolean.TRUE),
+			true);
+		FieldHelper.setRequiredWhenNotNull(getFieldGroup(), ContactDto.PROPHYLAXIS_PRESCRIBED, ContactDto.PRESCRIBED_DRUG);
+		FieldHelper.setVisibleWhen(
+			getFieldGroup(),
+			ContactDto.PRESCRIBED_DRUG_TEXT,
+			ContactDto.PRESCRIBED_DRUG,
+			Collections.singletonList(Drug.OTHER),
+			true);
+		FieldHelper.setRequiredWhen(
+			getFieldGroup(),
+			ContactDto.PRESCRIBED_DRUG,
+			Arrays.asList(ContactDto.PRESCRIBED_DRUG_TEXT),
+			Arrays.asList(Drug.OTHER));
+
 		cbDisease.addValueChangeListener(e -> {
 			disease = (Disease) e.getProperty().getValue();
 			setVisible(disease != null, ContactDto.CONTACT_PROXIMITIES);
 			if (isConfiguredServer(CountryHelper.COUNTRY_CODE_GERMANY)) {
 				setVisible(disease == Disease.CORONAVIRUS, ContactDto.CONTACT_CATEGORY, ContactDto.CONTACT_PROXIMITY_DETAILS);
 			}
 			updateContactProximity();
+			updateProphylaxisSectionVisibility();
 		});
+		updateProphylaxisSectionVisibility();
 
 		if (!hasCaseRelation) {
 			Label caseInfoLabel = new Label(I18nProperties.getString(Strings.infoNoSourceCaseSelected), ContentMode.HTML);
@@ -379,6 +417,44 @@ private void updateContactProximity() {
 		contactProximities.setValue(value);
 	}
 
+	private void updateProphylaxisSectionVisibility() {
+
+		boolean imiVisible = Disease.INVASIVE_MENINGOCOCCAL_INFECTION == disease;
+
+		// Re-check @Diseases(IMI) against the current disease AND @HideForCountriesExcept("lu") against the deployment country.
+		FieldVisibilityCheckers checkers =
+			FieldVisibilityCheckers.withDisease(disease).andWithCountry(FacadeProvider.getConfigFacade().getCountryLocale());
+
+		for (String propertyId : new String[] {
+			ContactDto.PROPHYLAXIS_PRESCRIBED,
+			ContactDto.PRESCRIBED_DRUG,
+			ContactDto.PRESCRIBED_DRUG_TEXT }) {
+			if (checkers.isVisible(ContactDto.class, propertyId)) {
+				// Re-enable fields that were hidden and disallowed at init (e.g. directory flow, disease = null).
+				addToVisibleAllowedFields(getField(propertyId));
+			}
+		}
+
+		if (imiVisible) {
+			// Re-filter the drug options for the selected disease; the field factory populated them at construction time
+			// (disease may have been null then, e.g. directory flow), so the list would otherwise show non-IMI drugs.
+			FieldHelper.updateEnumData(
+				(ComboBox) getField(ContactDto.PRESCRIBED_DRUG),
+				Diseases.DiseasesConfiguration.getVisibleValues(Drug.class, disease));
+		}
+
+		// Only the checkbox is toggled directly; the two dependent fields are driven by the setVisibleWhen rules.
+		setVisible(imiVisible, ContactDto.PROPHYLAXIS_PRESCRIBED);
+		if (!imiVisible) {
+			getField(ContactDto.PROPHYLAXIS_PRESCRIBED).clear();
+			getField(ContactDto.PRESCRIBED_DRUG).clear();
+			getField(ContactDto.PRESCRIBED_DRUG_TEXT).clear();
+			setVisible(false, ContactDto.PRESCRIBED_DRUG, ContactDto.PRESCRIBED_DRUG_TEXT);
+		}
+
+		prophylaxisLabel.setVisible(imiVisible && checkers.isVisible(ContactDto.class, ContactDto.PROPHYLAXIS_PRESCRIBED));
+	}
+
 	private void hideAndFillJurisdictionFields() {
 
 		region.setVisible(false);
diff --git a/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java b/sormas-ui/src/main/java/de/symeda/sormas/ui/symptoms/SymptomsForm.java
@@ -1135,6 +1135,9 @@ public String getFormattedHtmlMessage() {
 			clinicalPresentationStatusField
 				.setItemCaption(ClinicalPresentationStatus.COMPATIBLE, ClinicalPresentationStatus.COMPATIBLE.buildCaption(disease.toShortString()));
 			getFieldGroup().getField(OTHER_CLINICAL_PRESENTATION_TEXT).setVisible(true);
+
+			// #14029: Complications is not relevant for TB
+			complicationsHeading.setVisible(false);
 		}
 
 		parentTimeOffWorkField.addValueChangeListener(e -> {
@@ -1154,9 +1157,10 @@ public String getFormattedHtmlMessage() {
 			getField(OTHER_COMPLICATIONS_TEXT).setCaption(I18nProperties.getCaption(Captions.Symptoms_otherComplicationsText_CryptoGiardia));
 		}
 
-		// temparature and its source should hide for LUX's Dengue
-		temperature.setVisible(!isLuxDengue);
-		getField(TEMPERATURE_SOURCE).setVisible(!isLuxDengue);
+		// temperature and its source hide for LUX's Dengue and for Tuberculosis (#14029)
+		boolean hideTemperature = isLuxDengue || disease == Disease.TUBERCULOSIS;
+		temperature.setVisible(!hideTemperature);
+		getField(TEMPERATURE_SOURCE).setVisible(!hideTemperature);
 
 		DateComparisonValidator.addStartEndValidators(onsetDateField, getField(OFFSET_DATE));
 
@@ -1180,8 +1184,17 @@ public String getFormattedHtmlMessage() {
 	}
 
 	private void symptomGroupVisibility() {
+		// #14029: The TB custom layout renders its @SymptomGrouping(OTHER) fields elsewhere
+		// (glasgowComaScale under Clinical Measurements, otherClinicalPresentationText under Clinical
+		// Presentation), so the OTHER section is always empty for TB - keep its heading hidden.
+		boolean isLuxTuberculosis =
+			FacadeProvider.getConfigFacade().isConfiguredCountry(CountryHelper.COUNTRY_CODE_LUXEMBOURG) && disease == Disease.TUBERCULOSIS;
 		symptomGroupMap.forEach((location, strings) -> {
 			final Component groupLabel = getContent().getComponent(location);
+			if (isLuxTuberculosis && OTHER_SIGNS_AND_SYMPTOMS_HEADING_LOC.equals(location)) {
+				groupLabel.setVisible(false);
+				return;
+			}
 			final Optional<String> groupHasVisibleSymptom =
 				strings.stream().filter(s -> getFieldGroup().getField(s) != null && getFieldGroup().getField(s).isVisible()).findAny();
 			if (!groupHasVisibleSymptom.isPresent()) {

Original file line number	Diff line number	Diff line change
`@@ -181,6 +181,7 @@ public void setLinkedDefaultUserRole(DefaultUserRole linkedDefaultUserRole) {`
`181`	`181`	`}`
`182`	`182`
`183`	`183`	`@ElementCollection(fetch = FetchType.LAZY)`
	`184`	`+ @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)`
`184`	`185`	`@Enumerated(EnumType.STRING)`
`185`	`186`	`@CollectionTable(name = TABLE_NAME_EMAIL_NOTIFICATIONS,`
`186`	`187`	`joinColumns = @JoinColumn(name = "userrole_id", referencedColumnName = UserRole.ID, nullable = false),`
`@@ -197,6 +198,7 @@ public void setEmailNotificationTypes(Set<NotificationType> emailNotifications)`
`197`	`198`	`}`
`198`	`199`
`199`	`200`	`@ElementCollection(fetch = FetchType.LAZY)`
	`201`	`+ @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)`
`200`	`202`	`@Enumerated(EnumType.STRING)`
`201`	`203`	`@CollectionTable(name = TABLE_NAME_SMS_NOTIFICATIONS,`
`202`	`204`	`joinColumns = @JoinColumn(name = "userrole_id", referencedColumnName = UserRole.ID, nullable = false),`